This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[commited] x86_64: Fix build with RTLD_PRIVATE_ERRNO defined to 1
- From: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- To: libc-alpha at sourceware dot org
- Cc: Samuel Thibault <samuel dot thibault at ens-lyon dot org>
- Date: Sun, 18 Mar 2018 02:12:54 +0100
- Subject: [commited] 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.
---
ChangeLog | 3 +++
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; \
--
2.16.2