Revert "Allow glibc to be compiled without EXEC_PAGESIZE"

This reverts commit 49aa652db810ebdca3a662ebd5b0468bd08ec688.

This is still being discussed.

diff --git a/elf/dl-support.c b/elf/dl-support.c
index cb0bbd213ff4b8439abb2cada6775398027cf1b0..451932dd03e971b8afecd46a2b54074c5844a794 100644 (file)
--- 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 d116a436f5f0de38bd5f97370f8dfb099b161cc5..e9525ea987f335ccf63814900f80a9d01bfbf2fd 100644 (file)
--- 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 1a7f547e0cb822dddfabab9ec3e8c6ed63d65633..1af287b19f30fa2a1b0ba883edea5369c6a8ad44 100644 (file)
--- 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