From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 876C63858435; Mon, 22 Apr 2024 21:00:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 876C63858435 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1713819639; bh=bDH52kXDZUNK9zIHVeZ9glK8N/oM+L5fnQzhgMtbgJU=; h=From:To:Subject:Date:From; b=OAjRs1nN58WGtGilKfOKBBsEk/F+lR4n3Vp4ETiALDe3fjO07Qlzmhe0kXHXxyoc4 KijsjnfKnMUHc2jVbGmFbgtkAv1mmMG2Au5UhPuyG7k5qNJbbErNdy3nt1USFlVjP/ yElOlfYylGbkjqwkCO77gUdCvOEO1fqWS5on45lw= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] Revert "Allow glibc to be compiled without EXEC_PAGESIZE" X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 684fbab755e727a8c15f8b621648d66694cd1f53 X-Git-Newrev: 16c8dfba14ff7596ad3aea941a240f8abcdc50e6 Message-Id: <20240422210039.876C63858435@sourceware.org> Date: Mon, 22 Apr 2024 21:00:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=16c8dfba14ff7596ad3aea941a240f8abcdc50e6 commit 16c8dfba14ff7596ad3aea941a240f8abcdc50e6 Author: Samuel Thibault Date: Mon Apr 22 23:00:18 2024 +0200 Revert "Allow glibc to be compiled without EXEC_PAGESIZE" This reverts commit 49aa652db810ebdca3a662ebd5b0468bd08ec688. This is still being discussed. Diff: --- elf/dl-support.c | 6 +----- elf/rtld.c | 2 -- 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 #include -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