summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2024-05-07 08:18:49 -0400
committerRich Felker <dalias@aerifal.cx>2024-05-07 08:32:11 -0400
commit6f666231bf51703fadbef10460d462fb573548a1 (patch)
tree0a9cae678b4901d3f88bfd4b37b7e1df588e7f9b
parentfced99e93daeefb0192fd16304f978d4401d1d77 (diff)
downloadmusl-6f666231bf51703fadbef10460d462fb573548a1.tar.gz
ldso: fix non-functional fix to early dynamic PAGE_SIZE access
commit f47a8cdd250d9163fcfb39bf4e9d813957c0b187 introduced an alternate mechanism for access to runtime page size for compatibility with early stages of dynamic linking, but because pthread_impl.h indirectly includes libc.h, the condition #ifndef PAGE_SIZE was never satisfied. rather than depend on order of inclusion, use the (baseline POSIX) macro PAGESIZE, not the (XSI) macro PAGE_SIZE, to determine whether page size is dynamic. our internal libc.h only provides a dynamic definition for PAGE_SIZE, not for PAGESIZE.
-rw-r--r--ldso/dynlink.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index 324aa859..42687da2 100644
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -21,15 +21,17 @@
#include <sys/membarrier.h>
#include "pthread_impl.h"
#include "fork_impl.h"
+#include "libc.h"
#include "dynlink.h"
static size_t ldso_page_size;
-#ifndef PAGE_SIZE
+/* libc.h may have defined a macro for dynamic PAGE_SIZE already, but
+ * PAGESIZE is only defined if it's constant for the arch. */
+#ifndef PAGESIZE
+#undef PAGE_SIZE
#define PAGE_SIZE ldso_page_size
#endif
-#include "libc.h"
-
#define malloc __libc_malloc
#define calloc __libc_calloc
#define realloc __libc_realloc