lib1funcs.S (HAVE_ARM_CLZ): Define for ARMv6* or later and ARMv5t* rather than for...

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

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 5f44923beac28f3eedc06d47d715a775d6b5faa7..9ed6385bba481eae1f8a2a65239fe6a109e1a87c 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/libgcc/config/arm/lib1funcs.S b/libgcc/config/arm/lib1funcs.S
index 951dcda1c3bf7f323423a3e2813bdf0501653016..c4f061f8196d243159903cac4eb0291d1bf0b1ad 100644 (file)
--- 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