diff options
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/config/arm/lib1funcs.S | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 5f44923beac2..9ed6385bba48 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 951dcda1c3bf..c4f061f8196d 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 |