diff options
| author | Thomas Preud'homme <thomas.preudhomme@foss.arm.com> | 2016-01-28 11:26:09 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-01-28 11:26:37 +0100 |
| commit | 69f4c4029183fb26d2fcae00790881620c1978a3 (patch) | |
| tree | 87f94f7e721f1f8b83117a9ffb1e007fc969f729 /newlib/libc/machine/arm/memcpy-stub.c | |
| parent | 0b42ea79606c46f730e4f2427cc8244f85bdac98 (diff) | |
| download | cygnal-69f4c4029183fb26d2fcae00790881620c1978a3.tar.gz cygnal-69f4c4029183fb26d2fcae00790881620c1978a3.tar.bz2 cygnal-69f4c4029183fb26d2fcae00790881620c1978a3.zip | |
Make macro checks ARMv8-M baseline proof
libgloss:
* arm/Makefile.in: Add newlib/libc/machine/arm to the include path if
newlib is present.
* arm/arm.h: Include acle-compat.h.
(THUMB_V7_V6M): Rename to ...
(PREFER_THUMB): This. Use ACLE macros __ARM_ARCH_ISA_ARM instead of
__ARM_ARCH_6M__ to decide whether to define it.
(THUMB1_ONLY): Define for Thumb-1 only targets.
(THUMB_V7M_V6M): Rename to ...
(THUMB_VXM): This. Defined based on __ARM_ARCH_ISA_ARM, excluding
ARMv7.
* arm/crt0.S: Use THUMB1_ONLY rather than __ARM_ARCH_6M__,
!__ARM_ARCH_ISA_ARM rather than THUMB_V7M_V6M for fp enabling, and
PREFER_THUMB rather than THUMB_V7_V6M. Rename other occurences of
THUMB_V7M_V6M to THUMB_VXM.
* arm/linux-crt0.c: Likewise.
* arm/redboot-crt0.S: Likewise.
* arm/swi.h: Likewise.
* arm/trap.S: Likewise.
newlib:
* libc/machine/arm/memcpy-stub.c: Use ACLE macros __ARM_ARCH_ISA_THUMB
and __ARM_ARCH_ISA_ARM to check for Thumb-2 only targets rather than
__ARM_ARCH and __ARM_ARCH_PROFILE.
* libc/machine/arm/memcpy.S: Likewise.
* libc/machine/arm/setjmp.S: Likewise for Thumb-1 only target and
include acle-compat.h.
* libc/machine/arm/strcmp.S: Likewise for Thumb-1 and Thumb-2 only
target and include acle-compat.h.
* libc/sys/arm/arm.h: Include acle-compat.h.
(THUMB_V7_V6M): Rename to ...
(PREFER_THUMB): This. Use ACLE macro __ARM_ARCH_ISA_ARM instead of
__ARM_ARCH_6M__ to decide whether to define it.
(THUMB1_ONLY): Define for Thumb-1 only targets.
(THUMB_V7M_V6M): Rename to ...
(THUMB_VXM): This. Defined based on __ARM_ARCH_ISA_ARM, excluding
ARMv7.
* libc/sys/arm/crt0.S: Use PREFER_THUMB rather than THUMB_V7_V6M and
rename THUMB_V7M_V6M into THUMB_VXM.
* libc/sys/arm/swi.h: Likewise.
Diffstat (limited to 'newlib/libc/machine/arm/memcpy-stub.c')
| -rw-r--r-- | newlib/libc/machine/arm/memcpy-stub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/newlib/libc/machine/arm/memcpy-stub.c b/newlib/libc/machine/arm/memcpy-stub.c index 52a0f91bd..6cd0e3b1d 100644 --- a/newlib/libc/machine/arm/memcpy-stub.c +++ b/newlib/libc/machine/arm/memcpy-stub.c @@ -34,7 +34,7 @@ #elif (__ARM_ARCH >= 7 && __ARM_ARCH_PROFILE == 'A' \ && defined (__ARM_FEATURE_UNALIGNED)) /* Defined in memcpy.S. */ -#elif __ARM_ARCH >= 7 && __ARM_ARCH_PROFILE == 'M' +#elif __ARM_ARCH_ISA_THUMB == 2 && !__ARM_ARCH_ISA_ARM /* Defined in memcpy.S. */ #else # include "../../string/memcpy.c" |