diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-12-01 20:52:39 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-12-01 21:05:56 +0000 |
| commit | dd67928700bc9b5954c93b29a6e0b0c4b279d454 (patch) | |
| tree | 7557514a0d014468c56c9f0d000f9c0387337dee /sysdeps | |
| parent | db25266c9202a1235ce2e2f8a4f84cfb86254196 (diff) | |
| download | glibc-dd67928700bc9b5954c93b29a6e0b0c4b279d454.tar.gz glibc-dd67928700bc9b5954c93b29a6e0b0c4b279d454.tar.xz glibc-dd67928700bc9b5954c93b29a6e0b0c4b279d454.zip | |
hurd: Fix ld.so __access override from libc
ld.so symbols to be overriden by libc need to be extern to really get overriden. __access happens to have never been exposed, putting it to GLIBC_PRIVATE.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/hurd/Versions | 8 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/access.c | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/localplt.data | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/access.c | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions index dc199bfd66..9dee71efa3 100644 --- a/sysdeps/mach/hurd/Versions +++ b/sysdeps/mach/hurd/Versions @@ -1,7 +1,7 @@ libc { GLIBC_2.0 { # functions with a weak definition in the dynamic linker - __access; __mmap; + __mmap; } GLIBC_2.2.6 { # functions with a weak definition in the dynamic linker @@ -9,7 +9,7 @@ libc { } GLIBC_PRIVATE { # Functions shared with the dynamic linker - __access_noerrno; __libc_read; __libc_write; __libc_lseek64; + __access; __access_noerrno; __libc_read; __libc_write; __libc_lseek64; __libc_lock_self0; __sigprocmask; __getcwd; _dl_init_first; @@ -22,7 +22,7 @@ ld { __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset; # functions that must be shared with libc - __access; __close; __getpid; + __close; __getpid; __mmap; __open; __read; __sbrk; __strtoul_internal; __write; __writev; __xstat64; __fxstat64; _exit; _hurd_intr_rpc_mach_msg; @@ -40,7 +40,7 @@ ld { _dl_init_first; # functions that must be shared with libc - __access_noerrno; __libc_read; __libc_write; __libc_lseek64; + __access; __access_noerrno; __libc_read; __libc_write; __libc_lseek64; __libc_lock_self0; __sigprocmask; __getcwd; } } diff --git a/sysdeps/mach/hurd/access.c b/sysdeps/mach/hurd/access.c index 2b5de8ea03..5072742352 100644 --- a/sysdeps/mach/hurd/access.c +++ b/sysdeps/mach/hurd/access.c @@ -35,4 +35,5 @@ __access (const char *file, int type) { return __faccessat (AT_FDCWD, file, type, 0); } +libc_hidden_def (__access) weak_alias (__access, access) diff --git a/sysdeps/mach/hurd/i386/localplt.data b/sysdeps/mach/hurd/i386/localplt.data index 0c1cf0ffa9..b89e04b24a 100644 --- a/sysdeps/mach/hurd/i386/localplt.data +++ b/sysdeps/mach/hurd/i386/localplt.data @@ -32,7 +32,7 @@ ld.so: __libc_lseek64 ld.so: __mmap ld.so: __fxstat64 ld.so: __xstat64 -#ld.so: __access +ld.so: __access ld.so: __access_noerrno ld.so: __getpid ld.so: __getcwd diff --git a/sysdeps/unix/sysv/linux/access.c b/sysdeps/unix/sysv/linux/access.c index 690c99a856..f9fd6e64cf 100644 --- a/sysdeps/unix/sysv/linux/access.c +++ b/sysdeps/unix/sysv/linux/access.c @@ -29,4 +29,5 @@ __access (const char *file, int type) return INLINE_SYSCALL_CALL (faccessat, AT_FDCWD, file, type); #endif } +libc_hidden_def (__access) weak_alias (__access, access) |