From 3d16d9ec3c6023b53ef30b0072541ab136309a27 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Thu, 7 Jul 2016 08:54:28 +0000 Subject: [PATCH] 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 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 --- libgcc/ChangeLog | 5 +++++ libgcc/config/arm/lib1funcs.S | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 5f44923beac..9ed6385bba4 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2016-07-07 Thomas Preud'homme + + * 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 * 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 951dcda1c3b..c4f061f8196 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 -- 2.30.2