[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20171130060109.GI1627@brightrain.aerifal.cx>
Date: Thu, 30 Nov 2017 01:01:09 -0500
From: Rich Felker <dalias@...c.org>
To: musl@...ts.openwall.com
Subject: Re: [PATCH] arm: respect both __ARM_ARCH_6KZ__ and
__ARM_ARCH_6ZK__ macros
On Wed, Nov 29, 2017 at 09:57:55PM -0800, Andre McCurdy wrote:
> 6KZ is the correct form, 6ZK is a gcc specific historical typo.
> Respect both for the widest compatibility with clang and older
> versions of gcc.
Probably ok, but is it needed? Ideally we would just use
__ARM_ARCH>=N, but old gcc lacked __ARM_ARCH, thus necessitating all
the awful cases.
Rich
> Signed-off-by: Andre McCurdy <armccurdy@...il.com>
> ---
> arch/arm/atomic_arch.h | 2 +-
> arch/arm/pthread_arch.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/atomic_arch.h b/arch/arm/atomic_arch.h
> index c5c56f8..d1d09d8 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()
> --
> 1.9.1
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
