diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-18 02:11:56 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-03-18 02:11:56 +0100 |
| commit | dd28d4ba978abd9f6da0a223614d7f0d33b305a7 (patch) | |
| tree | 41bc0fd3a5d46a6785c3f8b4ceca727e6e8728a4 | |
| parent | 6dbe9dcae593cb5c1562fee34703938583618fd4 (diff) | |
| download | glibc-dd28d4ba978abd9f6da0a223614d7f0d33b305a7.tar.gz glibc-dd28d4ba978abd9f6da0a223614d7f0d33b305a7.tar.xz glibc-dd28d4ba978abd9f6da0a223614d7f0d33b305a7.zip | |
x86_64: Fix build with RTLD_PRIVATE_ERRNO defined to 1
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Always include <dl-sysdep.h>. Test for value of RTLD_PRIVATE_ERRNO instead of testing whether it is defined.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/sysdep.h | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 2fe1850e21..b9f90147f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,9 @@ cthread_setspecific. * sysdeps/mach/libc-lock.h (__libc_key_create, __libc_setspecific): Likewise. + * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Always include + <dl-sysdep.h>. Test for value of RTLD_PRIVATE_ERRNO instead of + testing whether it is defined. 2018-03-16 Samuel Thibault <samuel.thibault@ens-lyon.org> diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h index b9b9bf9cd3..1ef0f742ae 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h @@ -23,9 +23,8 @@ #include <sysdeps/unix/x86_64/sysdep.h> #include <tls.h> -#if IS_IN (rtld) -# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */ -#endif +/* Defines RTLD_PRIVATE_ERRNO. */ +#include <dl-sysdep.h> /* For Linux we can use the system call table in the header file /usr/include/asm/unistd.h @@ -110,7 +109,7 @@ # define ret_ERRVAL ret -# if defined PIC && defined RTLD_PRIVATE_ERRNO +# if defined PIC && RTLD_PRIVATE_ERRNO # define SYSCALL_SET_ERRNO \ lea rtld_errno(%rip), %RCX_LP; \ neg %eax; \ |