summaryrefslogtreecommitdiff
path: root/libatomic
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2012-12-05 15:16:34 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2012-12-05 15:16:34 +0000
commit637f388d4b5f26804e4687ba130d83a853b9259e (patch)
tree96f0dba342fa3f8241e3f3155795e2e0dd60785e /libatomic
parent0f32be614d97e72c5e7e80b5ed0283f3b4645219 (diff)
downloadgcc-637f388d4b5f26804e4687ba130d83a853b9259e.tar.gz
2012-12-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 194222 using svnmerge.py git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@194223 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libatomic')
-rw-r--r--libatomic/ChangeLog4
-rw-r--r--libatomic/config/arm/arm-config.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 449fed2eaf7..d451f9ca0cb 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-04 Marcus Shawcroft <marcus.shawcroft@arm.com>
+
+ * config/arm/arm-config.h (__ARM_ARCH_8A__): New.
+
2012-11-21 Matthias Klose <doko@ubuntu.com>
* configure.tgt (i[3456]86): Handle -mx32 like -m64.
diff --git a/libatomic/config/arm/arm-config.h b/libatomic/config/arm/arm-config.h
index b94a372c1d8..b99c82eb94b 100644
--- a/libatomic/config/arm/arm-config.h
+++ b/libatomic/config/arm/arm-config.h
@@ -57,6 +57,10 @@
# define __ARM_ARCH__ 7
#endif
+#if defined(__ARM_ARCH_8A__)
+# define __ARM_ARCH__ 8
+#endif
+
#ifndef __ARM_ARCH__
#error Unable to determine architecture.
#endif