aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-04-18 18:51:43 -0700
committerRich Felker <dalias@aerifal.cx>2018-04-19 12:35:49 -0400
commit749a06b4c55d823d8a74b4e3f607c65006db271b (patch)
treeb20bac2ed9b2f7c9579e684af456e7be3238d56f /arch
parentea489b8b0d89e391455689b7cc397d0c261677c9 (diff)
downloadmusl-749a06b4c55d823d8a74b4e3f607c65006db271b.zip
musl-749a06b4c55d823d8a74b4e3f607c65006db271b.tar.gz
musl-749a06b4c55d823d8a74b4e3f607c65006db271b.tar.bz2
arm: respect both __ARM_ARCH_6KZ__ and __ARM_ARCH_6ZK__ macros
__ARM_ARCH_6ZK__ is a gcc specific historical typo which may not be defined by other compilers. https://gcc.gnu.org/ml/gcc-patches/2015-07/msg02237.html To avoid unexpected results when building for ARMv6KZ with clang, the correct form of the macro (ie 6KZ) needs to be tested. The incorrect form of the macro (ie 6ZK) still needs to be tested for compatibility with pre-2015 versions of gcc.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/atomic_arch.h2
-rw-r--r--arch/arm/pthread_arch.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/atomic_arch.h b/arch/arm/atomic_arch.h
index 72fcddb..5ff1be1 100644
--- a/arch/arm/atomic_arch.h
+++ b/arch/arm/atomic_arch.h
@@ -7,7 +7,7 @@
extern uintptr_t __attribute__((__visibility__("hidden")))
__a_cas_ptr, __a_barrier_ptr;
-#if ((__ARM_ARCH_6__ || __ARM_ARCH_6K__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+#if ((__ARM_ARCH_6__ || __ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
|| __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
#define a_ll a_ll
diff --git a/arch/arm/pthread_arch.h b/arch/arm/pthread_arch.h
index 197752e..6657e19 100644
--- a/arch/arm/pthread_arch.h
+++ b/arch/arm/pthread_arch.h
@@ -1,4 +1,4 @@
-#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6ZK__) && !__thumb__) \
+#if ((__ARM_ARCH_6K__ || __ARM_ARCH_6KZ__ || __ARM_ARCH_6ZK__) && !__thumb__) \
|| __ARM_ARCH_7A__ || __ARM_ARCH_7R__ || __ARM_ARCH >= 7
static inline pthread_t __pthread_self()