diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-04-22 23:00:18 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-04-22 23:00:18 +0200 |
| commit | 16c8dfba14ff7596ad3aea941a240f8abcdc50e6 (patch) | |
| tree | 9ac6b0741a92e73b3d45445187af5203fdc06a9f | |
| parent | 684fbab755e727a8c15f8b621648d66694cd1f53 (diff) | |
| download | glibc-16c8dfba14ff7596ad3aea941a240f8abcdc50e6.tar.gz glibc-16c8dfba14ff7596ad3aea941a240f8abcdc50e6.tar.xz glibc-16c8dfba14ff7596ad3aea941a240f8abcdc50e6.zip | |
Revert "Allow glibc to be compiled without EXEC_PAGESIZE"
This reverts commit 49aa652db810ebdca3a662ebd5b0468bd08ec688. This is still being discussed.
| -rw-r--r-- | elf/dl-support.c | 6 | ||||
| -rw-r--r-- | elf/rtld.c | 2 | ||||
| -rw-r--r-- | libio/libioP.h | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/elf/dl-support.c b/elf/dl-support.c index cb0bbd213f..451932dd03 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -135,11 +135,7 @@ void *_dl_random; #include <dl-procruntime.c> #include <dl-procinfo.c> -size_t _dl_pagesize -#ifdef EXEC_PAGESIZE - = EXEC_PAGESIZE -#endif -; +size_t _dl_pagesize = EXEC_PAGESIZE; size_t _dl_minsigstacksize = CONSTANT_MINSIGSTKSZ; diff --git a/elf/rtld.c b/elf/rtld.c index d116a436f5..e9525ea987 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -358,9 +358,7 @@ struct rtld_global_ro _rtld_global_ro attribute_relro = ._dl_debug_fd = STDERR_FILENO, ._dl_lazy = 1, ._dl_fpu_control = _FPU_DEFAULT, -#ifdef EXEC_PAGESIZE ._dl_pagesize = EXEC_PAGESIZE, -#endif ._dl_inhibit_cache = 0, ._dl_profile_output = "/var/tmp", diff --git a/libio/libioP.h b/libio/libioP.h index 1a7f547e0c..1af287b19f 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -852,7 +852,7 @@ extern off64_t _IO_seekpos_unlocked (FILE *, off64_t, int) # define MAP_ANONYMOUS MAP_ANON # endif -# if !defined(MAP_ANONYMOUS) +# if !defined(MAP_ANONYMOUS) || !defined(EXEC_PAGESIZE) # undef _G_HAVE_MMAP # define _G_HAVE_MMAP 0 # endif |