From patchwork Sun Mar 18 01:12:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 26359 Received: (qmail 85516 invoked by alias); 18 Mar 2018 01:13:03 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 85487 invoked by uid 89); 18 Mar 2018 01:13:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=Hx-languages-length:1540, H*r:sk:static-, Hx-spam-relays-external:sk:static-, H*RU:sk:static- X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [commited] x86_64: Fix build with RTLD_PRIVATE_ERRNO defined to 1 Date: Sun, 18 Mar 2018 02:12:54 +0100 Message-Id: <20180318011254.1126-1-samuel.thibault@ens-lyon.org> * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Always include . 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 + . Test for value of RTLD_PRIVATE_ERRNO instead of + testing whether it is defined. 2018-03-16 Samuel Thibault 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 #include -#if IS_IN (rtld) -# include /* Defines RTLD_PRIVATE_ERRNO. */ -#endif +/* Defines RTLD_PRIVATE_ERRNO. */ +#include /* 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; \