From b1c374f7ede81a98f2d02def2c7ca17f1001f7cb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 May 2020 17:05:45 -0700 Subject: [PATCH] wordsize.h: Unify the header between arm and aarch64 This helps OE multilibs to not sythesize this header which causes all kind of recursions and other issues since wordsize is fundamental header and ends up including itself in many case e.g. clang tidy, bpf etc. Upstream-Status: Inappropriate [ OE-Specific ] Signed-off-by: Khem Raj --- sysdeps/aarch64/bits/wordsize.h | 8 ++++++-- sysdeps/arm/bits/wordsize.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) create mode 120000 sysdeps/arm/bits/wordsize.h diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h index 118e59172d..b4b0692eb5 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h @@ -17,12 +17,16 @@ License along with the GNU C Library; if not, see . */ -#ifdef __LP64__ +#if defined (__aarch64__) && defined (__LP64__) # define __WORDSIZE 64 -#else +#elif defined (__aarch64__) # define __WORDSIZE 32 # define __WORDSIZE32_SIZE_ULONG 1 # define __WORDSIZE32_PTRDIFF_LONG 1 +#else +# define __WORDSIZE 32 +# define __WORDSIZE32_SIZE_ULONG 0 +# define __WORDSIZE32_PTRDIFF_LONG 0 #endif #define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h new file mode 120000 index 0000000000..4c4a788ec2 --- /dev/null +++ b/sysdeps/arm/bits/wordsize.h @@ -0,0 +1 @@ +../../aarch64/bits/wordsize.h \ No newline at end of file