mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-01-23 06:32:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

ldso: fix non-functional fix to early dynamic PAGE_SIZE access

Browse Source 
commit f47a8cdd25 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.
This commit is contained in:
Rich Felker 2024-05-07 08:18:49 -04:00
parent fced99e93d
commit 6f666231bf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ldso/dynlink.c
View File

@ -21,15 +21,17 @@
#include <sys/membarrier.h> #include <sys/membarrier.h>
#include "pthread_impl.h" #include "pthread_impl.h"
#include "fork_impl.h" #include "fork_impl.h"
#include "libc.h"
#include "dynlink.h" #include "dynlink.h"
static size_t ldso_page_size; 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 #define PAGE_SIZE ldso_page_size
#endif #endif
#include "libc.h"
#define malloc __libc_malloc #define malloc __libc_malloc
#define calloc __libc_calloc #define calloc __libc_calloc
#define realloc __libc_realloc #define realloc __libc_realloc