From eb72478a286e0104f5636d21d86407b4c0e89fa1 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 21 Aug 2014 10:26:46 +0530 Subject: Remove unnecessary uses of NOT_IN_libc If a IS_IN_* macro is defined, then NOT_IN_libc is always defined, except obviously for IS_IN_libc. There's no need to check for both. Verified on x86_64 and i686 that the source is unchanged. * include/libc-symbols.h: Remove unnecessary check for NOT_IN_libc. * nptl/pthreadP.h: Likewise. * sysdeps/aarch64/setjmp.S: Likewise. * sysdeps/alpha/setjmp.S: Likewise. * sysdeps/arm/sysdep.h: Likewise. * sysdeps/i386/setjmp.S: Likewise. * sysdeps/m68k/setjmp.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise. * sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise. * sysdeps/s390/s390-32/setjmp.S: Likewise. * sysdeps/s390/s390-64/setjmp.S: Likewise. * sysdeps/sh/sh3/setjmp.S: Likewise. * sysdeps/sh/sh4/setjmp.S: Likewise. * sysdeps/unix/alpha/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise. * sysdeps/x86_64/setjmp.S: Likewise. --- ChangeLog | 33 ++++++++++++++++++++++ include/libc-symbols.h | 18 ++++++------ nptl/pthreadP.h | 10 +++---- sysdeps/aarch64/setjmp.S | 2 +- sysdeps/alpha/setjmp.S | 2 +- sysdeps/arm/sysdep.h | 4 +-- sysdeps/i386/setjmp.S | 2 +- sysdeps/m68k/setjmp.c | 2 +- sysdeps/posix/getcwd.c | 2 +- sysdeps/powerpc/powerpc32/setjmp-common.S | 2 +- sysdeps/powerpc/powerpc64/setjmp-common.S | 2 +- sysdeps/s390/s390-32/setjmp.S | 2 +- sysdeps/s390/s390-64/setjmp.S | 2 +- sysdeps/sh/sh3/setjmp.S | 2 +- sysdeps/sh/sh4/setjmp.S | 2 +- sysdeps/unix/alpha/sysdep.h | 7 +++-- sysdeps/unix/sysv/linux/aarch64/sysdep.h | 5 ++-- sysdeps/unix/sysv/linux/i386/sysdep.h | 2 +- sysdeps/unix/sysv/linux/ia64/setjmp.S | 2 +- sysdeps/unix/sysv/linux/ia64/sysdep.h | 2 +- sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h | 2 +- sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h | 2 +- sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 2 +- sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 2 +- sysdeps/unix/sysv/linux/sh/sysdep.h | 2 +- sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h | 2 +- sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h | 2 +- sysdeps/unix/sysv/linux/tile/sysdep.h | 2 +- sysdeps/unix/sysv/linux/x86_64/sysdep.h | 2 +- sysdeps/x86_64/setjmp.S | 2 +- 30 files changed, 80 insertions(+), 45 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c01369395..75cfd5c541 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2014-08-21 Siddhesh Poyarekar + + * include/libc-symbols.h: Remove unnecessary check for + NOT_IN_libc. + * nptl/pthreadP.h: Likewise. + * sysdeps/aarch64/setjmp.S: Likewise. + * sysdeps/alpha/setjmp.S: Likewise. + * sysdeps/arm/sysdep.h: Likewise. + * sysdeps/i386/setjmp.S: Likewise. + * sysdeps/m68k/setjmp.c: Likewise. + * sysdeps/posix/getcwd.c: Likewise. + * sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise. + * sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise. + * sysdeps/s390/s390-32/setjmp.S: Likewise. + * sysdeps/s390/s390-64/setjmp.S: Likewise. + * sysdeps/sh/sh3/setjmp.S: Likewise. + * sysdeps/sh/sh4/setjmp.S: Likewise. + * sysdeps/unix/alpha/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise. + * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise. + * sysdeps/x86_64/setjmp.S: Likewise. + 2014-08-13 Joseph Myers [BZ #17263] diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 48edadcfe0..d4ab1f33de 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -584,7 +584,7 @@ for linking") # define libc_hidden_data_ver(local, name) #endif -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld # define rtld_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define rtld_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs) # define rtld_hidden_def(name) hidden_def (name) @@ -604,7 +604,7 @@ for linking") # define rtld_hidden_data_ver(local, name) #endif -#if defined NOT_IN_libc && defined IS_IN_libm +#ifdef IS_IN_libm # define libm_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libm_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs) # define libm_hidden_def(name) hidden_def (name) @@ -624,7 +624,7 @@ for linking") # define libm_hidden_data_ver(local, name) #endif -#if defined NOT_IN_libc && defined IS_IN_libresolv +#ifdef IS_IN_libresolv # define libresolv_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libresolv_hidden_tls_proto(name, attrs...) \ hidden_tls_proto (name, ##attrs) @@ -645,7 +645,7 @@ for linking") # define libresolv_hidden_data_ver(local, name) #endif -#if defined NOT_IN_libc && defined IS_IN_librt +#ifdef IS_IN_librt # define librt_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define librt_hidden_tls_proto(name, attrs...) \ hidden_tls_proto (name, ##attrs) @@ -666,7 +666,7 @@ for linking") # define librt_hidden_data_ver(local, name) #endif -#if defined NOT_IN_libc && defined IS_IN_libdl +#ifdef IS_IN_libdl # define libdl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libdl_hidden_tls_proto(name, attrs...) \ hidden_tls_proto (name, ##attrs) @@ -687,7 +687,7 @@ for linking") # define libdl_hidden_data_ver(local, name) #endif -#if defined NOT_IN_libc && defined IS_IN_libnss_files +#ifdef IS_IN_libnss_files # define libnss_files_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libnss_files_hidden_tls_proto(name, attrs...) \ hidden_tls_proto (name, ##attrs) @@ -708,7 +708,7 @@ for linking") # define libnss_files_hidden_data_ver(local, name) #endif -#if defined NOT_IN_libc && defined IS_IN_libnsl +#ifdef IS_IN_libnsl # define libnsl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libnsl_hidden_tls_proto(name, attrs...) \ hidden_tls_proto (name, ##attrs) @@ -729,7 +729,7 @@ for linking") # define libnsl_hidden_data_ver(local, name) #endif -#if defined NOT_IN_libc && defined IS_IN_libnss_nisplus +#ifdef IS_IN_libnss_nisplus # define libnss_nisplus_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libnss_nisplus_hidden_tls_proto(name, attrs...) \ hidden_tls_proto (name, ##attrs) @@ -758,7 +758,7 @@ for linking") # define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name) #endif -#if defined NOT_IN_libc && defined IS_IN_libutil +#ifdef IS_IN_libutil # define libutil_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libutil_hidden_tls_proto(name, attrs...) \ hidden_tls_proto (name, ##attrs) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 4226473d59..d4415ba933 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -252,7 +252,7 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf) __cleanup_fct_attribute; extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf) __cleanup_fct_attribute; -#if defined NOT_IN_libc && defined IS_IN_libpthread +#ifdef IS_IN_libpthread hidden_proto (__pthread_unwind) hidden_proto (__pthread_unwind_next) hidden_proto (__pthread_register_cancel) @@ -296,13 +296,13 @@ __do_cancel (void) # define LIBC_CANCEL_HANDLED() \ __asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \ __asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel") -#elif defined NOT_IN_libc && defined IS_IN_libpthread +#elif defined IS_IN_libpthread # define LIBC_CANCEL_ASYNC() CANCEL_ASYNC () # define LIBC_CANCEL_RESET(val) CANCEL_RESET (val) # define LIBC_CANCEL_HANDLED() \ __asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \ __asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel") -#elif defined NOT_IN_libc && defined IS_IN_librt +#elif defined IS_IN_librt # define LIBC_CANCEL_ASYNC() \ __librt_enable_asynccancel () # define LIBC_CANCEL_RESET(val) \ @@ -341,7 +341,7 @@ extern int __make_stacks_executable (void **stack_endp) /* longjmp handling. */ extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe); -#if defined NOT_IN_libc && defined IS_IN_libpthread +#ifdef IS_IN_libpthread hidden_proto (__pthread_cleanup_upto) #endif @@ -486,7 +486,7 @@ extern int __pthread_enable_asynccancel (void) attribute_hidden; extern void __pthread_disable_asynccancel (int oldtype) internal_function attribute_hidden; -#if defined NOT_IN_libc && defined IS_IN_libpthread +#ifdef IS_IN_libpthread hidden_proto (__pthread_mutex_init) hidden_proto (__pthread_mutex_destroy) hidden_proto (__pthread_mutex_lock) diff --git a/sysdeps/aarch64/setjmp.S b/sysdeps/aarch64/setjmp.S index fd39319920..d548dd5018 100644 --- a/sysdeps/aarch64/setjmp.S +++ b/sysdeps/aarch64/setjmp.S @@ -63,7 +63,7 @@ ENTRY (__sigsetjmp) mov x2, sp str x2, [x0, #JB_SP<<3] #endif -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask */ mov w0, #0 RET diff --git a/sysdeps/alpha/setjmp.S b/sysdeps/alpha/setjmp.S index f79837c86b..840b56068d 100644 --- a/sysdeps/alpha/setjmp.S +++ b/sysdeps/alpha/setjmp.S @@ -86,7 +86,7 @@ $sigsetjmp_local: ldq ra, 0(sp) addq sp, 16, sp ret -#elif defined NOT_IN_libc && defined IS_IN_rtld +#elif defined IS_IN_rtld /* In ld.so we never save the signal mask. */ mov 0, v0 ret diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h index 84b07e1476..4c41213c37 100644 --- a/sysdeps/arm/sysdep.h +++ b/sysdeps/arm/sysdep.h @@ -292,8 +292,8 @@ #endif /* Pointer mangling support. */ -#if (defined NOT_IN_libc && defined IS_IN_rtld) || \ - (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread)) +#if (defined IS_IN_rtld || \ + (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread))) # ifdef __ASSEMBLER__ # define PTR_MANGLE_LOAD(guard, tmp) \ LDST_PCREL(ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); diff --git a/sysdeps/i386/setjmp.S b/sysdeps/i386/setjmp.S index b7637debee..7204ce0eb5 100644 --- a/sysdeps/i386/setjmp.S +++ b/sysdeps/i386/setjmp.S @@ -46,7 +46,7 @@ ENTRY (__sigsetjmp) movl %ecx, (JB_PC*4)(%eax) movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask. */ xorl %eax, %eax ret diff --git a/sysdeps/m68k/setjmp.c b/sysdeps/m68k/setjmp.c index cf742eecd0..4ba50a139d 100644 --- a/sysdeps/m68k/setjmp.c +++ b/sysdeps/m68k/setjmp.c @@ -57,7 +57,7 @@ __sigsetjmp (jmp_buf env, int savemask) : : "m" (env[0].__jmpbuf[0].__fpregs[0])); #endif -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask. */ return 0; #else diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c index 61924d5748..6201916712 100644 --- a/sysdeps/posix/getcwd.c +++ b/sysdeps/posix/getcwd.c @@ -206,7 +206,7 @@ extern char *alloca (); #ifdef __ASSUME_ATFCTS # define __have_atfcts 1 -#elif defined NOT_IN_libc && defined IS_IN_rtld +#elif defined IS_IN_rtld static int __rtld_have_atfcts; # define __have_atfcts __rtld_have_atfcts #endif diff --git a/sysdeps/powerpc/powerpc32/setjmp-common.S b/sysdeps/powerpc/powerpc32/setjmp-common.S index dcdd336fc2..681b540e8f 100644 --- a/sysdeps/powerpc/powerpc32/setjmp-common.S +++ b/sysdeps/powerpc/powerpc32/setjmp-common.S @@ -69,7 +69,7 @@ ENTRY (__sigsetjmp_symbol) SAVE_GP (29) SAVE_GP (30) SAVE_GP (31) -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld li r3,0 blr #else diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S index c0c77136a1..704ee97dc1 100644 --- a/sysdeps/powerpc/powerpc64/setjmp-common.S +++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -213,7 +213,7 @@ L(no_vmx): #else li r6,0 #endif -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld li r3,0 blr #elif defined SHARED diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S index e940d71a9e..3ebc813e78 100644 --- a/sysdeps/s390/s390-32/setjmp.S +++ b/sysdeps/s390/s390-32/setjmp.S @@ -65,7 +65,7 @@ ENTRY(__sigsetjmp) #endif std %f4,40(%r2) std %f6,48(%r2) -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask. */ lhi %r2,0 br %r14 diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S index 7cbb9e8ccc..faa2784d17 100644 --- a/sysdeps/s390/s390-64/setjmp.S +++ b/sysdeps/s390/s390-64/setjmp.S @@ -71,7 +71,7 @@ ENTRY(__sigsetjmp) std %f13,120(%r2) std %f14,128(%r2) std %f15,136(%r2) -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask. */ lghi %r2,0 br %r14 diff --git a/sysdeps/sh/sh3/setjmp.S b/sysdeps/sh/sh3/setjmp.S index e123e4288b..f3a8e6abbb 100644 --- a/sysdeps/sh/sh3/setjmp.S +++ b/sysdeps/sh/sh3/setjmp.S @@ -46,7 +46,7 @@ ENTRY (__sigsetjmp) mov.l r9, @-r4 mov.l r8, @-r4 -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask. */ rts mov #0, r0 diff --git a/sysdeps/sh/sh4/setjmp.S b/sysdeps/sh/sh4/setjmp.S index d5ac02e3bd..4bbd6661a9 100644 --- a/sysdeps/sh/sh4/setjmp.S +++ b/sysdeps/sh/sh4/setjmp.S @@ -55,7 +55,7 @@ ENTRY (__sigsetjmp) mov.l r9, @-r4 mov.l r8, @-r4 -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask. */ rts mov #0, r0 diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h index 0c40ca64bc..17dad91819 100644 --- a/sysdeps/unix/alpha/sysdep.h +++ b/sysdeps/unix/alpha/sysdep.h @@ -349,7 +349,7 @@ __LABEL(name) \ we don't deoptimize things by placing the pointer check value there. */ #ifdef __ASSEMBLER__ -# if defined NOT_IN_libc && defined IS_IN_rtld +# ifdef IS_IN_rtld # define PTR_MANGLE(dst, src, tmp) \ ldah tmp, __pointer_chk_guard_local($29) !gprelhigh; \ ldq tmp, __pointer_chk_guard_local(tmp) !gprellow; \ @@ -371,8 +371,9 @@ __LABEL(name) \ # define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp) #else # include -# if (defined NOT_IN_libc && defined IS_IN_rtld) \ - || (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread)) +# if (defined IS_IN_rtld \ + || (!defined SHARED && (!defined NOT_IN_libc \ + || defined IS_IN_libpthread))) extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden; # define PTR_MANGLE(var) \ (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local) diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index 3f3c709683..84999f115a 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -309,8 +309,9 @@ #endif /* __ASSEMBLER__ */ /* Pointer mangling is supported for AArch64. */ -#if (defined NOT_IN_libc && defined IS_IN_rtld) || \ - (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread)) +#if (defined IS_IN_rtld || \ + (!defined SHARED && (!defined NOT_IN_libc \ + || defined IS_IN_libpthread))) # ifdef __ASSEMBLER__ # define PTR_MANGLE(dst, src, guard, tmp) \ LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index 54f87c9f71..57d5ea081e 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -519,7 +519,7 @@ asm (".L__X'%ebx = 1\n\t" /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. Using a global variable is too complicated here since we have no PC-relative addressing mode. */ diff --git a/sysdeps/unix/sysv/linux/ia64/setjmp.S b/sysdeps/unix/sysv/linux/ia64/setjmp.S index c93fba5d57..f919a49f51 100644 --- a/sysdeps/unix/sysv/linux/ia64/setjmp.S +++ b/sysdeps/unix/sysv/linux/ia64/setjmp.S @@ -178,7 +178,7 @@ ENTRY(__sigsetjmp) ;; st8.nta [r2]=r25 // ar.unat st8.nta [r3]=in0 // &__jmp_buf -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask. */ ;; #else diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h index 4b732632d6..e0ec861dab 100644 --- a/sysdeps/unix/sysv/linux/ia64/sysdep.h +++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h @@ -364,7 +364,7 @@ #endif /* not __ASSEMBLER__ */ /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ #else diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h index 8feafb8082..1a5e37a1d9 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h @@ -272,7 +272,7 @@ /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ #else diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h index 9c456101ab..93e454e902 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h @@ -282,7 +282,7 @@ /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ #else diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h index 1c6191b261..00919e362e 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h @@ -366,7 +366,7 @@ _ret; }) /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ #else diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h index 91fc275585..d3bafcae19 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h @@ -372,7 +372,7 @@ _ret; }) /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ #else diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.h b/sysdeps/unix/sysv/linux/sh/sysdep.h index 41b2eea7a2..3f68938335 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep.h +++ b/sysdeps/unix/sysv/linux/sh/sysdep.h @@ -338,7 +338,7 @@ #endif /* __ASSEMBLER__ */ /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. Using a global variable is too complicated here since we have no PC-relative addressing mode. */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h index 8b0d0807f4..09ef2c9ec3 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h @@ -125,7 +125,7 @@ ENTRY(name); \ #endif /* __ASSEMBLER__ */ /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ #else diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h index 53df66e21b..a0f230540a 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h @@ -140,7 +140,7 @@ ENTRY(name); \ #define STACK_BIAS 2047 /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ #else diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h index f2214f6cff..a09f8a4adf 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep.h @@ -205,7 +205,7 @@ #endif /* not __ASSEMBLER__ */ /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ #else diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h index f52690feeb..4a619dafeb 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h @@ -393,7 +393,7 @@ /* Pointer mangling support. */ -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* We cannot use the thread descriptor because in ld.so we use setjmp earlier than the descriptor is initialized. */ # ifdef __ASSEMBLER__ diff --git a/sysdeps/x86_64/setjmp.S b/sysdeps/x86_64/setjmp.S index 78a7e81202..4459212a8b 100644 --- a/sysdeps/x86_64/setjmp.S +++ b/sysdeps/x86_64/setjmp.S @@ -54,7 +54,7 @@ ENTRY (__sigsetjmp) #endif movq %rax, (JB_PC*8)(%rdi) -#if defined NOT_IN_libc && defined IS_IN_rtld +#ifdef IS_IN_rtld /* In ld.so we never save the signal mask. */ xorl %eax, %eax retq -- cgit 1.4.1