Skip to content

Commit

Permalink
Remove IS_IN_rtld
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
Siddhesh Poyarekar committed Nov 24, 2014
1 parent a109996 commit a384848
Show file tree
Hide file tree
Showing 68 changed files with 169 additions and 98 deletions.
71 changes: 71 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,76 @@
2014-11-24 Siddhesh Poyarekar <siddhesh@redhat.com>

* 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.

* include/math.h: Use IS_IN instead of IS_IN_libm.
* sysdeps/alpha/fpu/s_copysign.c: Likewise.
* sysdeps/ieee754/ldbl-128ibm/s_copysignl.c: Likewise.
Expand Down
2 changes: 1 addition & 1 deletion elf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
CFLAGS-rtld.c = $(SYSCONF-FLAGS)

CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
-DNOT_IN_libc=1 -DIS_IN_rtld=1)
-DNOT_IN_libc=1)

cpp-srcs-left := $(all-rtld-routines:=.os)
lib := rtld
Expand Down
2 changes: 1 addition & 1 deletion elf/dl-open.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ _dl_show_scope (struct link_map *l, int from)
_dl_debug_printf ("\n");
}

#ifdef IS_IN_rtld
#if IS_IN (rtld)
/* Return non-zero if ADDR lies within one of L's segments. */
int
internal_function
Expand Down
2 changes: 1 addition & 1 deletion elf/rtld-Rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,6 @@ lib := rtld
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))

# This here is the whole point of all the shenanigans.
rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1
rtld-CPPFLAGS := -DNOT_IN_libc=1

endif
2 changes: 1 addition & 1 deletion elf/setup-vdso.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)),
/* Add the vDSO to the object list. */
_dl_add_to_namespace_list (l, LM_ID_BASE);

# ifdef IS_IN_rtld
# if IS_IN (rtld)
/* Rearrange the list so this DSO appears after rtld_map. */
assert (l->l_next == NULL);
assert (l->l_prev == main_map);
Expand Down
2 changes: 1 addition & 1 deletion include/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern void __assert_fail_base (const char *fmt, const char *assertion,
const char *function)
__THROW __attribute__ ((__noreturn__));

# if !defined NOT_IN_libc || defined IS_IN_rtld
# if !defined NOT_IN_libc || IS_IN (rtld)
hidden_proto (__assert_fail)
hidden_proto (__assert_perror_fail)
# endif
Expand Down
2 changes: 1 addition & 1 deletion include/bits/stdlib-float.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* No floating-point inline functions in rtld. */
#ifndef IS_IN_rtld
#if !IS_IN (rtld)
# include <stdlib/bits/stdlib-float.h>
#endif
2 changes: 1 addition & 1 deletion include/errno.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#if defined _ERRNO_H && !defined _ISOMAC && !defined __cplusplus

# ifdef IS_IN_rtld
# if IS_IN (rtld)
# include <dl-sysdep.h>
# ifndef RTLD_PRIVATE_ERRNO
# error "dl-sysdep.h must define RTLD_PRIVATE_ERRNO!"
Expand Down
2 changes: 1 addition & 1 deletion include/sys/stat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern __mode_t __umask (__mode_t __mask);
extern int __mkdir (const char *__path, __mode_t __mode);
extern int __mknod (const char *__path,
__mode_t __mode, __dev_t __dev);
#if !defined NOT_IN_libc || defined IS_IN_rtld
#if !defined NOT_IN_libc || IS_IN (rtld)
hidden_proto (__fxstat)
hidden_proto (__fxstat64)
hidden_proto (__lxstat)
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/aarch64/setjmp.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ENTRY (__sigsetjmp)
mov x2, sp
str x2, [x0, #JB_SP<<3]
#endif
#ifdef IS_IN_rtld
#if IS_IN (rtld)
/* In ld.so we never save the signal mask */
mov w0, #0
RET
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/alpha/setjmp.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ $sigsetjmp_local:
ldq ra, 0(sp)
addq sp, 16, sp
ret
#elif defined IS_IN_rtld
#elif IS_IN (rtld)
/* In ld.so we never save the signal mask. */
mov 0, v0
ret
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/arm/__longjmp.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ENTRY (__longjmp)
#endif

#ifdef NEED_HWCAP
# ifdef IS_IN_rtld
# if IS_IN (rtld)
LDST_PCREL (ldr, a4, a3, \
C_SYMBOL_NAME(_rtld_local_ro) \
+ RTLD_GLOBAL_RO_DL_HWCAP_OFFSET)
Expand Down
6 changes: 3 additions & 3 deletions sysdeps/arm/aeabi_unwind_cpp_pr1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr0 (void)
{
#ifndef IS_IN_rtld
#if !IS_IN (rtld)
abort ();
#endif
}
Expand All @@ -36,7 +36,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr1 (void)
{
#ifndef IS_IN_rtld
#if !IS_IN (rtld)
abort ();
#endif
}
Expand All @@ -45,7 +45,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr2 (void)
{
#ifndef IS_IN_rtld
#if !IS_IN (rtld)
abort ();
#endif
}
2 changes: 1 addition & 1 deletion sysdeps/arm/setjmp.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ENTRY (__sigsetjmp)

#ifdef NEED_HWCAP
/* Check if we have a VFP unit. */
# ifdef IS_IN_rtld
# if IS_IN (rtld)
LDST_PCREL (ldr, a3, a4, \
C_SYMBOL_NAME(_rtld_local_ro) \
+ RTLD_GLOBAL_RO_DL_HWCAP_OFFSET)
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/arm/sysdep.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@
#endif

/* Pointer mangling support. */
#if (defined IS_IN_rtld || \
#if (IS_IN (rtld) || \
(!defined SHARED && (!defined NOT_IN_libc || IS_IN (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE_LOAD(guard, tmp) \
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/generic/_itoa.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ extern char *_itoa (unsigned long long int value, char *buflim,

extern const char _itoa_upper_digits[];
extern const char _itoa_lower_digits[];
#if !defined NOT_IN_libc || defined IS_IN_rtld
#if !defined NOT_IN_libc || IS_IN (rtld)
hidden_proto (_itoa_upper_digits)
hidden_proto (_itoa_lower_digits)
#endif
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/generic/dl-sysdep.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
all the libc functions that ld.so uses are called without PLT and always
get the versions linked into ld.so rather than the libc ones. */

#ifdef IS_IN_rtld
#if IS_IN (rtld)
# define RTLD_PRIVATE_ERRNO 1
#else
# define RTLD_PRIVATE_ERRNO 0
Expand Down
12 changes: 6 additions & 6 deletions sysdeps/generic/ldsodefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ typedef void (*receiver_fct) (int, const char *, const char *);
# define GL(name) _##name
#else
# define EXTERN
# ifdef IS_IN_rtld
# if IS_IN (rtld)
# define GL(name) _rtld_local._##name
# else
# define GL(name) _rtld_global._##name
Expand Down Expand Up @@ -409,7 +409,7 @@ struct rtld_global
#ifdef SHARED
};
# define __rtld_global_attribute__
# ifdef IS_IN_rtld
# if IS_IN (rtld)
# ifdef HAVE_SDATA_SECTION
# define __rtld_local_attribute__ \
__attribute__ ((visibility ("hidden"), section (".sdata")))
Expand All @@ -428,7 +428,7 @@ extern struct rtld_global _rtld_global __rtld_global_attribute__;
#ifndef SHARED
# define GLRO(name) _##name
#else
# ifdef IS_IN_rtld
# if IS_IN (rtld)
# define GLRO(name) _rtld_local_ro._##name
# else
# define GLRO(name) _rtld_global_ro._##name
Expand Down Expand Up @@ -587,7 +587,7 @@ struct rtld_global_ro
EXTERN int _dl_pointer_guard;
};
# define __rtld_global_attribute__
# ifdef IS_IN_rtld
# if IS_IN (rtld)
# define __rtld_local_attribute__ __attribute__ ((visibility ("hidden")))
extern struct rtld_global_ro _rtld_local_ro
attribute_relro __rtld_local_attribute__;
Expand All @@ -610,7 +610,7 @@ extern const ElfW(Phdr) *_dl_phdr;
extern size_t _dl_phnum;
#endif

#ifdef IS_IN_rtld
#if IS_IN (rtld)
/* This is the initial value of GL(dl_error_catch_tsd).
A non-TLS libpthread will change it. */
extern void **_dl_initial_error_catch_tsd (void) __attribute__ ((const))
Expand Down Expand Up @@ -642,7 +642,7 @@ extern char **_dl_argv
#endif
;
rtld_hidden_proto (_dl_argv)
#ifdef IS_IN_rtld
#if IS_IN (rtld)
extern unsigned int _dl_skip_args attribute_hidden
# ifndef DL_ARGV_NOT_RELRO
attribute_relro
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/i386/dl-tls.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ extern void *___tls_get_addr (tls_index *ti)
extern void *___tls_get_addr_internal (tls_index *ti)
__attribute__ ((__regparm__ (1))) attribute_hidden;

# ifdef IS_IN_rtld
# if IS_IN (rtld)
/* The special thing about the x86 TLS ABI is that we have two
variants of the __tls_get_addr function with different calling
conventions. The GNU version, which we are mostly concerned here,
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/i386/setjmp.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
movl %ecx, (JB_PC*4)(%eax)
movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */

#ifdef IS_IN_rtld
#if IS_IN (rtld)
/* In ld.so we never save the signal mask. */
xorl %eax, %eax
ret
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/m68k/setjmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ __sigsetjmp (jmp_buf env, int savemask)
: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
#endif

#ifdef IS_IN_rtld
#if IS_IN (rtld)
/* In ld.so we never save the signal mask. */
return 0;
#else
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/mach/hurd/dl-execstack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ _dl_make_stack_executable (void **stack_endp)
return EPERM;
*stack_endp = NULL;

#ifdef IS_IN_rtld
#if IS_IN (rtld)
if (__mprotect ((void *)_dl_hurd_data->stack_base, _dl_hurd_data->stack_size,
PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
return errno;
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/mach/hurd/opendir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ __opendirat (int dfd, const char *name)

int flags = O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC;
int fd;
#ifdef IS_IN_rtld
#if IS_IN (rtld)
assert (dfd == AT_FDCWD);
fd = open_not_cancel_2 (name, flags);
#else
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/posix/getcwd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ extern char *alloca ();

#ifdef __ASSUME_ATFCTS
# define __have_atfcts 1
#elif defined IS_IN_rtld
#elif IS_IN (rtld)
static int __rtld_have_atfcts;
# define __have_atfcts __rtld_have_atfcts
#endif
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/posix/opendir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ __opendirat (int dfd, const char *name)
flags |= O_CLOEXEC;
#endif
int fd;
#ifdef IS_IN_rtld
#if IS_IN (rtld)
assert (dfd == AT_FDCWD);
fd = open_not_cancel_2 (name, flags);
#else
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/posix/profil.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
{
struct sigaction act;
struct itimerval timer;
#ifndef IS_IN_rtld
#if !IS_IN (rtld)
static struct sigaction oact;
static struct itimerval otimer;
# define oact_ptr &oact
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/powerpc/dl-procinfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
Loading

0 comments on commit a384848

Please sign in to comment.