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.
This commit is contained in:
Samuel Thibault 2018-03-18 02:11:56 +01:00
parent 6dbe9dcae5
commit dd28d4ba97
2 changed files with 6 additions and 4 deletions

View File

@ -100,6 +100,9 @@
cthread_setspecific. cthread_setspecific.
* sysdeps/mach/libc-lock.h (__libc_key_create, __libc_setspecific): * sysdeps/mach/libc-lock.h (__libc_key_create, __libc_setspecific):
Likewise. 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> 2018-03-16 Samuel Thibault <samuel.thibault@ens-lyon.org>

View File

@ -23,9 +23,8 @@
#include <sysdeps/unix/x86_64/sysdep.h> #include <sysdeps/unix/x86_64/sysdep.h>
#include <tls.h> #include <tls.h>
#if IS_IN (rtld) /* Defines RTLD_PRIVATE_ERRNO. */
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */ #include <dl-sysdep.h>
#endif
/* For Linux we can use the system call table in the header file /* For Linux we can use the system call table in the header file
/usr/include/asm/unistd.h /usr/include/asm/unistd.h
@ -110,7 +109,7 @@
# define ret_ERRVAL ret # define ret_ERRVAL ret
# if defined PIC && defined RTLD_PRIVATE_ERRNO # if defined PIC && RTLD_PRIVATE_ERRNO
# define SYSCALL_SET_ERRNO \ # define SYSCALL_SET_ERRNO \
lea rtld_errno(%rip), %RCX_LP; \ lea rtld_errno(%rip), %RCX_LP; \
neg %eax; \ neg %eax; \