Index: libgcc/config/arm/lib1funcs.S =================================================================== --- libgcc/config/arm/lib1funcs.S (revision 231736) +++ libgcc/config/arm/lib1funcs.S (revision 231737) @@ -124,7 +124,7 @@ && !defined(__thumb2__) \ && (!defined(__THUMB_INTERWORK__) \ || defined (__OPTIMIZE_SIZE__) \ - || defined(__ARM_ARCH_6M__))) + || !__ARM_ARCH_ISA_ARM)) # define __prefer_thumb__ #endif @@ -305,7 +305,7 @@ #ifdef __ARM_EABI__ .macro THUMB_LDIV0 name signed -#if defined(__ARM_ARCH_6M__) +#if !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 push {r0, lr} mov r0, #0 @@ -456,7 +456,7 @@ #else /* !(__INTERWORKING_STUBS__ || __thumb2__) */ -#ifdef __ARM_ARCH_6M__ +#if !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 #define EQUIV .thumb_set #else .macro ARM_FUNC_START name sp_section= @@ -488,7 +488,7 @@ #endif .endm -#ifndef __ARM_ARCH_6M__ +#if __ARM_ARCH_ISA_ARM || __ARM_ARCH_ISA_THUMB != 1 .macro ARM_FUNC_ALIAS new old .globl SYM (__\new) EQUIV SYM (__\new), SYM (__\old) @@ -1213,7 +1213,7 @@ /* ------------------------------------------------------------------------ */ #ifdef L_umodsi3 -#ifdef __ARM_ARCH_EXT_IDIV__ +#if defined(__ARM_ARCH_EXT_IDIV__) && __ARM_ARCH_ISA_THUMB != 1 ARM_FUNC_START umodsi3 @@ -1424,7 +1424,7 @@ /* ------------------------------------------------------------------------ */ #ifdef L_modsi3 -#if defined(__ARM_ARCH_EXT_IDIV__) +#if defined(__ARM_ARCH_EXT_IDIV__) && __ARM_ARCH_ISA_THUMB != 1 ARM_FUNC_START modsi3 @@ -1685,7 +1685,7 @@ #endif /* __symbian__ */ -#if ((__ARM_ARCH__ > 5) && !defined(__ARM_ARCH_6M__)) \ +#if ((__ARM_ARCH__ > 5) && (__ARM_ARCH_ISA_ARM || __ARM_ARCH_ISA_THUMB != 1)) \ || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) \ || defined(__ARM_ARCH_5TEJ__) #define HAVE_ARM_CLZ 1 @@ -1692,7 +1692,7 @@ #endif #ifdef L_clzsi2 -#if defined(__ARM_ARCH_6M__) +#if !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 FUNC_START clzsi2 mov r1, #28 mov r3, #1 @@ -1753,7 +1753,7 @@ #ifdef L_clzdi2 #if !defined(HAVE_ARM_CLZ) -# if defined(__ARM_ARCH_6M__) +# if !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 FUNC_START clzdi2 push {r4, lr} # else @@ -1778,7 +1778,7 @@ bl __clzsi2 # endif 2: -# if defined(__ARM_ARCH_6M__) +# if !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 pop {r4, pc} # else RETLDM r4 @@ -1800,7 +1800,7 @@ #endif /* L_clzdi2 */ #ifdef L_ctzsi2 -#if defined(__ARM_ARCH_6M__) +#if !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 FUNC_START ctzsi2 neg r1, r0 and r0, r0, r1 @@ -1915,7 +1915,7 @@ /* Don't bother with the old interworking routines for Thumb-2. */ /* ??? Maybe only omit these on "m" variants. */ -#if !defined(__thumb2__) && !defined(__ARM_ARCH_6M__) +#if __ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 #if defined L_interwork_call_via_rX @@ -2150,11 +2150,12 @@ #endif /* Arch supports thumb. */ #ifndef __symbian__ -#ifndef __ARM_ARCH_6M__ +/* The condition here must match the one in gcc/config/arm/elf.h. */ +#if __ARM_ARCH_ISA_ARM || __ARM_ARCH_ISA_THUMB != 1 #include "ieee754-df.S" #include "ieee754-sf.S" #include "bpabi.S" -#else /* __ARM_ARCH_6M__ */ +#else /* !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 */ #include "bpabi-v6m.S" -#endif /* __ARM_ARCH_6M__ */ +#endif /* !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 */ #endif /* !__symbian__ */ Index: libgcc/config/arm/t-softfp =================================================================== --- libgcc/config/arm/t-softfp (revision 231736) +++ libgcc/config/arm/t-softfp (revision 231737) @@ -1,2 +1,2 @@ -softfp_wrap_start := '\#ifdef __ARM_ARCH_6M__' +softfp_wrap_start := '\#if !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1' softfp_wrap_end := '\#endif' Index: libgcc/config/arm/bpabi-v6m.S =================================================================== --- libgcc/config/arm/bpabi-v6m.S (revision 231736) +++ libgcc/config/arm/bpabi-v6m.S (revision 231737) @@ -1,4 +1,4 @@ -/* Miscellaneous BPABI functions. ARMv6M implementation +/* Miscellaneous BPABI functions. Thumb-1 only implementation Copyright (C) 2006-2015 Free Software Foundation, Inc. Contributed by CodeSourcery. Index: libgcc/config/arm/libunwind.S =================================================================== --- libgcc/config/arm/libunwind.S (revision 231736) +++ libgcc/config/arm/libunwind.S (revision 231737) @@ -58,7 +58,7 @@ #endif #endif -#ifdef __ARM_ARCH_6M__ +#if !__ARM_ARCH_ISA_ARM && __ARM_ARCH_ISA_THUMB == 1 /* r0 points to a 16-word block. Upload these values to the actual core state. */ @@ -169,7 +169,7 @@ UNPREFIX \name .endm -#else /* !__ARM_ARCH_6M__ */ +#else /* __ARM_ARCH_ISA_ARM || __ARM_ARCH_ISA_THUMB != 1 */ /* r0 points to a 16-word block. Upload these values to the actual core state. */ @@ -351,7 +351,7 @@ UNPREFIX \name .endm -#endif /* !__ARM_ARCH_6M__ */ +#endif /* __ARM_ARCH_ISA_ARM || __ARM_ARCH_ISA_THUMB != 1 */ UNWIND_WRAPPER _Unwind_RaiseException 1 UNWIND_WRAPPER _Unwind_Resume 1 Index: libgcc/ChangeLog.arm =================================================================== --- libgcc/ChangeLog.arm (revision 231736) +++ libgcc/ChangeLog.arm (revision 231737) @@ -1,3 +1,28 @@ +2015-12-17 Thomas Preud'homme + + * config/arm/bpabi-v6m.S: Fix header comment to mention Thumb-1 rather + than ARMv6-M. + * config/arm/lib1funcs.S (__prefer_thumb__): Define among other cases + for all Thumb-1 only targets. + (__only_thumb1__): Define for all Thumb-1 only targets. + (THUMB_LDIV0): Test for __only_thumb1__ rather than __ARM_ARCH_6M__. + (EQUIV): Likewise. + (ARM_FUNC_ALIAS): Likewise. + (umodsi3): Add check to __only_thumb1__ to guard the idiv version. + (modsi3): Likewise. + (HAVE_ARM_CLZ): Test for __only_thumb1__ rather than __ARM_ARCH_6M__. + (clzsi2): Likewise. + (clzdi2): Likewise. + (ctzsi2): Likewise. + (L_interwork_call_via_rX): Test for __ARM_ARCH_ISA_ARM rather than + __ARM_ARCH_6M__ in guard for checking whether it is defined. + (final includes): Test for __only_thumb1__ rather than + __ARM_ARCH_6M__ and add comment to indicate the connection between + this condition and the one in gcc/config/arm/elf.h. + * config/arm/libunwind.S: Test for __ARM_ARCH_ISA_THUMB and + __ARM_ARCH_ISA_ARM rather than __ARM_ARCH_6M__. + * config/arm/t-softfp: Likewise. + 2015-12-08 Hale Wang Andre Vieira Index: gcc/testsuite/ChangeLog.arm =================================================================== --- gcc/testsuite/ChangeLog.arm (revision 231736) +++ gcc/testsuite/ChangeLog.arm (revision 231737) @@ -1,3 +1,8 @@ +2015-12-17 Thomas Preud'homme + + * lib/target-supports.exp (check_effective_target_arm_cortex_m): Use + __ARM_ARCH_ISA_ARM to test for Cortex-M devices. + 2015-12-10 Tejas Belagod Backport from Mainline Index: gcc/testsuite/lib/target-supports.exp =================================================================== --- gcc/testsuite/lib/target-supports.exp (revision 231736) +++ gcc/testsuite/lib/target-supports.exp (revision 231737) @@ -2973,10 +2973,8 @@ return 0 } return [check_no_compiler_messages arm_cortex_m assembly { - #if !defined(__ARM_ARCH_7M__) \ - && !defined (__ARM_ARCH_7EM__) \ - && !defined (__ARM_ARCH_6M__) - #error !__ARM_ARCH_7M__ && !__ARM_ARCH_7EM__ && !__ARM_ARCH_6M__ + #if defined(__ARM_ARCH_ISA_ARM) + #error __ARM_ARCH_ISA_ARM is defined #endif int i; } "-mthumb"] Index: gcc/ChangeLog.arm =================================================================== --- gcc/ChangeLog.arm (revision 231736) +++ gcc/ChangeLog.arm (revision 231737) @@ -1,3 +1,13 @@ +2015-12-17 Thomas Preud'homme + + * config/arm/elf.h: Use __ARM_ARCH_ISA_THUMB and __ARM_ARCH_ISA_ARM to + decide whether to prevent some libgcc routines being included for some + multilibs rather than __ARM_ARCH_6M__ and add comment to indicate the + link between this condition and the one in + libgcc/config/arm/lib1func.S. + * config/arm/arm.h (TARGET_ARM_V6M): Add check to TARGET_ARM_ARCH. + (TARGET_ARM_V7M): Likewise. + 2015-12-16 Tejas Belagod Backport from Mainline Index: gcc/config/arm/elf.h =================================================================== --- gcc/config/arm/elf.h (revision 231736) +++ gcc/config/arm/elf.h (revision 231737) @@ -149,8 +149,9 @@ while (0) /* Horrible hack: We want to prevent some libgcc routines being included - for some multilibs. */ -#ifndef __ARM_ARCH_6M__ + for some multilibs. The condition should match the one in + libgcc/config/arm/lib1funcs.S. */ +#if __ARM_ARCH_ISA_ARM || __ARM_ARCH_ISA_THUMB != 1 #undef L_fixdfsi #undef L_fixunsdfsi #undef L_truncdfsf2 Index: gcc/config/arm/arm.h =================================================================== --- gcc/config/arm/arm.h (revision 231736) +++ gcc/config/arm/arm.h (revision 231737) @@ -2336,8 +2336,10 @@ #define TARGET_ARM_ARCH \ (arm_base_arch) \ -#define TARGET_ARM_V6M (!arm_arch_notm && !arm_arch_thumb2) -#define TARGET_ARM_V7M (!arm_arch_notm && arm_arch_thumb2) +#define TARGET_ARM_V6M (TARGET_ARM_ARCH == BASE_ARCH_6M && !arm_arch_notm \ + && !arm_arch_thumb2) +#define TARGET_ARM_V7M (TARGET_ARM_ARCH == BASE_ARCH_7M && !arm_arch_notm \ + && arm_arch_thumb2) /* The highest Thumb instruction set version supported by the chip. */ #define TARGET_ARM_ARCH_ISA_THUMB \