From 14a3c302c1394781b19ff7fdb5c6f3c06aca5d51 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 | 14 ++++++++++++-- sysdeps/arm/bits/wordsize.h | 22 +--------------------- 2 files changed, 13 insertions(+), 23 deletions(-) mode change 100644 => 120000 sysdeps/arm/bits/wordsize.h diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h index 33d0e20566..57bbda568e 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h @@ -17,5 +17,15 @@ License along with the GNU C Library; if not, see . */ -#define __WORDSIZE 64 -#define __WORDSIZE_TIME64_COMPAT32 0 +#if defined (__aarch64__) && defined (__LP64__) +# define __WORDSIZE 64 +#else +# define __WORDSIZE 32 +# define __WORDSIZE_TIME64_COMPAT32 1 +# define __WORDSIZE32_SIZE_ULONG 0 +# define __WORDSIZE32_PTRDIFF_LONG 0 +#endif + +#ifdef __aarch64__ +# define __WORDSIZE_TIME64_COMPAT32 0 +#endif diff --git a/sysdeps/arm/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h deleted file mode 100644 index be457d84d3..0000000000 --- a/sysdeps/arm/bits/wordsize.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (C) 1999-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#define __WORDSIZE 32 -#define __WORDSIZE_TIME64_COMPAT32 1 -#define __WORDSIZE32_SIZE_ULONG 0 -#define __WORDSIZE32_PTRDIFF_LONG 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