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. --- 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 +- 13 files changed, 15 insertions(+), 14 deletions(-) (limited to 'sysdeps/unix/sysv') 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__ -- cgit 1.4.1