aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Preud'homme <thomas.preudhomme@arm.com>2016-07-07 08:54:28 +0000
committerThomas Preud'homme <thopre01@gcc.gnu.org>2016-07-07 08:54:28 +0000
commit3d16d9ec3c6023b53ef30b0072541ab136309a27 (patch)
treef9c099983de6e3e752fbfeb02b1852da8f070b6c
parent6f493951779ddf08e695592ea4385bd992857e25 (diff)
downloadgcc-3d16d9ec3c6023b53ef30b0072541ab136309a27.zip
gcc-3d16d9ec3c6023b53ef30b0072541ab136309a27.tar.gz
gcc-3d16d9ec3c6023b53ef30b0072541ab136309a27.tar.bz2
lib1funcs.S (HAVE_ARM_CLZ): Define for ARMv6* or later and ARMv5t* rather than for a fixed list of...
2016-07-07 Thomas Preud'homme <thomas.preudhomme@arm.com> libgcc/ * config/arm/lib1funcs.S (HAVE_ARM_CLZ): Define for ARMv6* or later and ARMv5t* rather than for a fixed list of architectures. From-SVN: r238080
-rw-r--r--libgcc/ChangeLog5
-rw-r--r--libgcc/config/arm/lib1funcs.S7
2 files changed, 9 insertions, 3 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 5f44923..9ed6385 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,5 +1,10 @@
2016-07-07 Thomas Preud'homme <thomas.preudhomme@arm.com>
+ * config/arm/lib1funcs.S (HAVE_ARM_CLZ): Define for ARMv6* or later
+ and ARMv5t* rather than for a fixed list of architectures.
+
+2016-07-07 Thomas Preud'homme <thomas.preudhomme@arm.com>
+
* config/arm/bpabi-v6m.S: Clarify what architectures is the
implementation suitable for.
* config/arm/lib1funcs.S (__prefer_thumb__): Define among other cases
diff --git a/libgcc/config/arm/lib1funcs.S b/libgcc/config/arm/lib1funcs.S
index 951dcda..c4f061f 100644
--- a/libgcc/config/arm/lib1funcs.S
+++ b/libgcc/config/arm/lib1funcs.S
@@ -1512,9 +1512,10 @@ LSYM(Lover12):
#endif /* __symbian__ */
-#if ((__ARM_ARCH__ > 5) && !defined(__ARM_ARCH_6M__)) \
- || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \
- || defined(__ARM_ARCH_5TEJ__)
+#if (__ARM_ARCH_ISA_THUMB == 2 \
+ || (__ARM_ARCH_ISA_ARM \
+ && (__ARM_ARCH__ > 5 \
+ || (__ARM_ARCH__ == 5 && __ARM_ARCH_ISA_THUMB))))
#define HAVE_ARM_CLZ 1
#endif