diff options
| author | Wilco Dijkstra <wilco.dijkstra@arm.com> | 2025-01-02 19:46:39 +0000 |
|---|---|---|
| committer | Wilco Dijkstra <wilco.dijkstra@arm.com> | 2025-02-24 14:20:29 +0000 |
| commit | 935563754bb5e1f16b9edb392d6c80c6827ddfca (patch) | |
| tree | 35d02788b37890f8a92fe7538dbbfc88a1d12d90 /sysdeps/aarch64 | |
| parent | 4c1137910683c12cf1edb31e511e11289cd1a9db (diff) | |
| download | glibc-935563754bb5e1f16b9edb392d6c80c6827ddfca.tar.xz glibc-935563754bb5e1f16b9edb392d6c80c6827ddfca.zip | |
AArch64: Remove LP64 and ILP32 ifdefs
Remove LP64 and ILP32 ifdefs.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/aarch64')
| -rw-r--r-- | sysdeps/aarch64/bits/wordsize.h | 9 | ||||
| -rw-r--r-- | sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h | 24 | ||||
| -rw-r--r-- | sysdeps/aarch64/nptl/bits/semaphore.h | 8 |
3 files changed, 9 insertions, 32 deletions
diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h index f56260c2de..33d0e20566 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/aarch64/bits/wordsize.h @@ -17,12 +17,5 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ -#ifdef __LP64__ -# define __WORDSIZE 64 -#else -# define __WORDSIZE 32 -# define __WORDSIZE32_SIZE_ULONG 1 -# define __WORDSIZE32_PTRDIFF_LONG 1 -#endif - +#define __WORDSIZE 64 #define __WORDSIZE_TIME64_COMPAT32 0 diff --git a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h index 7f11e82ff5..c282560335 100644 --- a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h @@ -21,23 +21,13 @@ #include <bits/endian.h> -#ifdef __ILP32__ -# define __SIZEOF_PTHREAD_ATTR_T 32 -# define __SIZEOF_PTHREAD_MUTEX_T 32 -# define __SIZEOF_PTHREAD_MUTEXATTR_T 4 -# define __SIZEOF_PTHREAD_CONDATTR_T 4 -# define __SIZEOF_PTHREAD_RWLOCK_T 48 -# define __SIZEOF_PTHREAD_BARRIER_T 20 -# define __SIZEOF_PTHREAD_BARRIERATTR_T 4 -#else -# define __SIZEOF_PTHREAD_ATTR_T 64 -# define __SIZEOF_PTHREAD_MUTEX_T 48 -# define __SIZEOF_PTHREAD_MUTEXATTR_T 8 -# define __SIZEOF_PTHREAD_CONDATTR_T 8 -# define __SIZEOF_PTHREAD_RWLOCK_T 56 -# define __SIZEOF_PTHREAD_BARRIER_T 32 -# define __SIZEOF_PTHREAD_BARRIERATTR_T 8 -#endif +#define __SIZEOF_PTHREAD_ATTR_T 64 +#define __SIZEOF_PTHREAD_MUTEX_T 48 +#define __SIZEOF_PTHREAD_MUTEXATTR_T 8 +#define __SIZEOF_PTHREAD_CONDATTR_T 8 +#define __SIZEOF_PTHREAD_RWLOCK_T 56 +#define __SIZEOF_PTHREAD_BARRIER_T 32 +#define __SIZEOF_PTHREAD_BARRIERATTR_T 8 #define __SIZEOF_PTHREAD_COND_T 48 #define __SIZEOF_PTHREAD_RWLOCKATTR_T 8 diff --git a/sysdeps/aarch64/nptl/bits/semaphore.h b/sysdeps/aarch64/nptl/bits/semaphore.h index 45aabcb64b..ade6de4fbf 100644 --- a/sysdeps/aarch64/nptl/bits/semaphore.h +++ b/sysdeps/aarch64/nptl/bits/semaphore.h @@ -20,13 +20,7 @@ # error "Never use <bits/semaphore.h> directly; include <semaphore.h> instead." #endif - -#ifdef __ILP32__ -# define __SIZEOF_SEM_T 16 -#else -# define __SIZEOF_SEM_T 32 -#endif - +#define __SIZEOF_SEM_T 32 /* Value returned if `sem_open' failed. */ #define SEM_FAILED ((sem_t *) 0) |