From a38484851aa244e1d5c48405f0e26fe93fa8d3b5 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 20 Nov 2014 21:09:43 +0530 Subject: Remove IS_IN_rtld Replace with IS_IN (rtld). Generated code is unchanged on x86_64. * elf/Makefile (CPPFLAGS-.os): Remove IS_IN_rtld. * elf/dl-open.c: Use IS_IN (rtld) instead if IS_IN_rtld. * elf/rtld-Rules: Likewise. * elf/setup-vdso.h: Likewise. * include/assert.h: Likewise. * include/bits/stdlib-float.h: Likewise. * include/errno.h: Likewise. * include/sys/stat.h: Likewise. * include/unistd.h: Likewise. * sysdeps/aarch64/setjmp.S: Likewise. * sysdeps/alpha/setjmp.S: Likewise. * sysdeps/arm/__longjmp.S: Likewise. * sysdeps/arm/aeabi_unwind_cpp_pr1.c: Likewise. * sysdeps/arm/setjmp.S: Likewise. * sysdeps/arm/sysdep.h: Likewise. * sysdeps/generic/_itoa.h: Likewise. * sysdeps/generic/dl-sysdep.h: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-tls.h: Likewise. * sysdeps/i386/setjmp.S: Likewise. * sysdeps/m68k/setjmp.c: Likewise. * sysdeps/mach/hurd/dl-execstack.c: Likewise. * sysdeps/mach/hurd/opendir.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/opendir.c: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/powerpc/dl-procinfo.h: Likewise. * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: Likewise. * sysdeps/powerpc/powerpc32/fpu/setjmp-common.S: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h: Likewise. * sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise. * sysdeps/powerpc/powerpc64/__longjmp-common.S: Likewise. * sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise. * sysdeps/s390/dl-tls.h: 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/arm/sysdep.S: Likewise. * sysdeps/unix/i386/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Likewise. * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise. * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/lowlevellock-futex.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Likewise. * sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Likewise. * sysdeps/unix/sysv/linux/microblaze/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.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/lowlevellock.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/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sparc/lowlevellock.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/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise. * sysdeps/unix/x86_64/sysdep.S: Likewise. * sysdeps/x86_64/setjmp.S: Likewise. --- sysdeps/powerpc/dl-procinfo.h | 2 +- sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S | 2 +- sysdeps/powerpc/powerpc32/fpu/setjmp-common.S | 2 +- sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h | 2 +- sysdeps/powerpc/powerpc32/setjmp-common.S | 2 +- sysdeps/powerpc/powerpc64/__longjmp-common.S | 4 ++-- sysdeps/powerpc/powerpc64/setjmp-common.S | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sysdeps/powerpc') diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h index 0333831664..5f8d9ab92a 100644 --- a/sysdeps/powerpc/dl-procinfo.h +++ b/sysdeps/powerpc/dl-procinfo.h @@ -166,7 +166,7 @@ _dl_string_platform (const char *str) return -1; } -#ifdef IS_IN_rtld +#if IS_IN (rtld) static inline int __attribute__ ((unused)) _dl_procinfo (unsigned int type, unsigned long int word) diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S index 088e389b0e..d8e46823f5 100644 --- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S @@ -35,7 +35,7 @@ ENTRY (__longjmp_symbol) addis r5,r5,_GLOBAL_OFFSET_TABLE_-got_label@ha addi r5,r5,_GLOBAL_OFFSET_TABLE_-got_label@l # ifdef SHARED -# ifdef IS_IN_rtld +# if IS_IN (rtld) /* Inside ld.so we use the local alias to avoid runtime GOT relocations. */ lwz r5,_rtld_local_ro@got(r5) diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S index 926a1b1215..720da09017 100644 --- a/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S +++ b/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S @@ -91,7 +91,7 @@ ENTRY (__sigsetjmp_symbol) mtlr r6 cfi_same_value (lr) # ifdef SHARED -# ifdef IS_IN_rtld +# if IS_IN (rtld) /* Inside ld.so we use the local alias to avoid runtime GOT relocations. */ lwz r5,_rtld_local_ro@got(r5) diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h b/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h index 72d720d55a..ca479d81ef 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h @@ -21,7 +21,7 @@ the dl_hwcap field. The assembly is to make the compiler not optimize the test (&_rtld_global_ro != NULL), which is always true in ISO C (but not in that case since _rtld_global_ro might not been realocated yet). */ -#if defined(SHARED) && !defined(IS_IN_rtld) +#if defined(SHARED) && !IS_IN (rtld) # define __GLRO(value) \ ({ volatile void **__p = (volatile void**)(&_rtld_global_ro); \ unsigned long int __ret; \ diff --git a/sysdeps/powerpc/powerpc32/setjmp-common.S b/sysdeps/powerpc/powerpc32/setjmp-common.S index 681b540e8f..50ff436804 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) -#ifdef IS_IN_rtld +#if IS_IN (rtld) li r3,0 blr #else diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S index 9452a3cb5b..e48922408b 100644 --- a/sysdeps/powerpc/powerpc64/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S @@ -30,7 +30,7 @@ .section ".toc","aw" .LC__dl_hwcap: # ifdef SHARED -# ifdef IS_IN_rtld +# if IS_IN (rtld) /* Inside ld.so we use the local alias to avoid runtime GOT relocations. */ .tc _rtld_local_ro[TC],_rtld_local_ro @@ -130,7 +130,7 @@ L(no_vmx): ld r0,(JB_LR*8)(r3) ld r14,((JB_GPRS+0)*8)(r3) lfd fp14,((JB_FPRS+0)*8)(r3) -#if defined SHARED && !defined IS_IN_rtld +#if defined SHARED && !IS_IN (rtld) std r2,FRAME_TOC_SAVE(r1) /* Restore the callers TOC save area. */ #endif ld r15,((JB_GPRS+1)*8)(r3) diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S index 704ee97dc1..5979cde798 100644 --- a/sysdeps/powerpc/powerpc64/setjmp-common.S +++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -29,7 +29,7 @@ .section ".toc","aw" .LC__dl_hwcap: # ifdef SHARED -# ifdef IS_IN_rtld +# if IS_IN (rtld) /* Inside ld.so we use the local alias to avoid runtime GOT relocations. */ .tc _rtld_local_ro[TC],_rtld_local_ro @@ -49,7 +49,7 @@ ENTRY (setjmp_symbol) b JUMPTARGET (GLUE(__sigsetjmp_symbol,_ent)) END (setjmp_symbol) -#if defined SHARED && !defined IS_IN_rtld && !defined __NO_VMX__ +#if defined SHARED && !IS_IN (rtld) && !defined __NO_VMX__ /* When called from within libc we need a special version of _setjmp that saves r2 since the call won't go via a plt call stub. See bugz #269. __GI__setjmp is used in csu/libc-start.c when @@ -80,7 +80,7 @@ JUMPTARGET(GLUE(__sigsetjmp_symbol,_ent)): std r1,(JB_GPR1*8)(3) #endif mflr r0 -#if defined SHARED && !defined IS_IN_rtld +#if defined SHARED && !IS_IN (rtld) ld r5,FRAME_TOC_SAVE(r1) /* Retrieve the callers TOC. */ std r5,(JB_GPR2*8)(3) #else @@ -213,7 +213,7 @@ L(no_vmx): #else li r6,0 #endif -#ifdef IS_IN_rtld +#if IS_IN (rtld) li r3,0 blr #elif defined SHARED -- cgit 1.4.1