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/unix/sysv/linux | |
| parent | 4c1137910683c12cf1edb31e511e11289cd1a9db (diff) | |
| download | glibc-935563754bb5e1f16b9edb392d6c80c6827ddfca.zip glibc-935563754bb5e1f16b9edb392d6c80c6827ddfca.tar.gz glibc-935563754bb5e1f16b9edb392d6c80c6827ddfca.tar.bz2 | |
AArch64: Remove LP64 and ILP32 ifdefs
Remove LP64 and ILP32 ifdefs.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/dl-cache.h | 13 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/aarch64/sysdep.h | 9 |
3 files changed, 7 insertions, 29 deletions
diff --git a/sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h b/sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h index d6dd811..6579126 100644 --- a/sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/aarch64/bits/fcntl.h @@ -25,17 +25,11 @@ #define __O_NOFOLLOW 0100000 #define __O_DIRECT 0200000 -#ifdef __ILP32__ -# define __O_LARGEFILE 0400000 -#else -# define __O_LARGEFILE 0 -#endif +#define __O_LARGEFILE 0 -#ifdef __LP64__ -# define F_GETLK64 5 -# define F_SETLK64 6 -# define F_SETLKW64 7 -#endif +#define F_GETLK64 5 +#define F_SETLK64 6 +#define F_SETLKW64 7 struct flock { diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-cache.h b/sysdeps/unix/sysv/linux/aarch64/dl-cache.h index 975d15e..35e1b91 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-cache.h +++ b/sysdeps/unix/sysv/linux/aarch64/dl-cache.h @@ -18,11 +18,7 @@ #include <ldconfig.h> -#ifdef __LP64__ -# define _DL_CACHE_DEFAULT_ID (FLAG_AARCH64_LIB64 | FLAG_ELF_LIBC6) -#else -# define _DL_CACHE_DEFAULT_ID (FLAG_AARCH64_LIB32 | FLAG_ELF_LIBC6) -#endif +#define _DL_CACHE_DEFAULT_ID (FLAG_AARCH64_LIB64 | FLAG_ELF_LIBC6) #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -38,18 +34,11 @@ len -= 2; \ path[len] = '\0'; \ } \ - if (len >= 9 && ! memcmp (path + len - 9, "/libilp32", 9))\ - { \ - len -= 5; \ - path[len] = '\0'; \ - } \ add_dir (path); \ if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \ { \ memcpy (path + len, "64", 3); \ add_dir (path); \ - memcpy (path + len, "ilp32", 6); \ - add_dir (path); \ } \ } while (0) diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index b813805..f0e8d64 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -152,13 +152,8 @@ #else /* not __ASSEMBLER__ */ -# ifdef __LP64__ -# define VDSO_NAME "LINUX_2.6.39" -# define VDSO_HASH 123718537 -# else -# define VDSO_NAME "LINUX_4.9" -# define VDSO_HASH 61765625 -# endif +# define VDSO_NAME "LINUX_2.6.39" +# define VDSO_HASH 123718537 /* List of system calls which are supported as vsyscalls. */ # define HAVE_CLOCK_GETRES64_VSYSCALL "__kernel_clock_getres" |