|
 |
147e83 |
commit a38484851aa244e1d5c48405f0e26fe93fa8d3b5
|
|
|
147e83 |
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
|
|
|
147e83 |
Date: Thu Nov 20 21:09:43 2014 +0530
|
|
|
147e83 |
|
|
|
147e83 |
Remove IS_IN_rtld
|
|
|
147e83 |
|
|
|
147e83 |
Replace with IS_IN (rtld). Generated code is unchanged on
|
|
|
147e83 |
x86_64.
|
|
|
147e83 |
|
|
|
147e83 |
* elf/Makefile (CPPFLAGS-.os): Remove IS_IN_rtld.
|
|
|
147e83 |
* elf/dl-open.c: Use IS_IN (rtld) instead if IS_IN_rtld.
|
|
|
147e83 |
* elf/rtld-Rules: Likewise.
|
|
|
147e83 |
* elf/setup-vdso.h: Likewise.
|
|
|
147e83 |
* include/assert.h: Likewise.
|
|
|
147e83 |
* include/bits/stdlib-float.h: Likewise.
|
|
|
147e83 |
* include/errno.h: Likewise.
|
|
|
147e83 |
* include/sys/stat.h: Likewise.
|
|
|
147e83 |
* include/unistd.h: Likewise.
|
|
|
147e83 |
* sysdeps/aarch64/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/alpha/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/arm/__longjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/arm/aeabi_unwind_cpp_pr1.c: Likewise.
|
|
|
147e83 |
* sysdeps/arm/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/arm/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/generic/_itoa.h: Likewise.
|
|
|
147e83 |
* sysdeps/generic/dl-sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/generic/ldsodefs.h: Likewise.
|
|
|
147e83 |
* sysdeps/i386/dl-tls.h: Likewise.
|
|
|
147e83 |
* sysdeps/i386/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/m68k/setjmp.c: Likewise.
|
|
|
147e83 |
* sysdeps/mach/hurd/dl-execstack.c: Likewise.
|
|
|
147e83 |
* sysdeps/mach/hurd/opendir.c: Likewise.
|
|
|
147e83 |
* sysdeps/posix/getcwd.c: Likewise.
|
|
|
147e83 |
* sysdeps/posix/opendir.c: Likewise.
|
|
|
147e83 |
* sysdeps/posix/profil.c: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/dl-procinfo.h: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/powerpc32/fpu/setjmp-common.S: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/powerpc64/__longjmp-common.S: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.
|
|
|
147e83 |
* sysdeps/s390/dl-tls.h: Likewise.
|
|
|
147e83 |
* sysdeps/s390/s390-32/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/s390/s390-64/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/sh/sh3/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/sh/sh4/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/unix/alpha/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/arm/sysdep.S: Likewise.
|
|
|
147e83 |
* sysdeps/unix/i386/sysdep.S: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/getcwd.c: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/i386/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/lowlevellock-futex.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/microblaze/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/sh/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/tile/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/x86_64/sysdep.S: Likewise.
|
|
|
147e83 |
* sysdeps/x86_64/setjmp.S: Likewise.
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/elf/Makefile
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/elf/Makefile
|
|
|
147e83 |
+++ glibc-2.17-c758a686/elf/Makefile
|
|
|
147e83 |
@@ -444,7 +444,7 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
|
|
|
147e83 |
CFLAGS-rtld.c = $(SYSCONF-FLAGS)
|
|
|
147e83 |
|
|
|
147e83 |
CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
|
|
|
147e83 |
- -DNOT_IN_libc=1 -DIS_IN_rtld=1)
|
|
|
147e83 |
+ -DNOT_IN_libc=1)
|
|
|
147e83 |
|
|
|
147e83 |
# Disable any optimization which might result in function calls during early
|
|
|
147e83 |
# dynamic loader startup. We disable -ftree-loop-distribute-patterns which
|
|
|
147e83 |
Index: glibc-2.17-c758a686/elf/dl-open.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/elf/dl-open.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/elf/dl-open.c
|
|
|
147e83 |
@@ -741,7 +741,7 @@ _dl_show_scope (struct link_map *l, int
|
|
|
147e83 |
_dl_debug_printf ("\n");
|
|
|
147e83 |
}
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* Return non-zero if ADDR lies within one of L's segments. */
|
|
|
147e83 |
int
|
|
|
147e83 |
internal_function
|
|
|
147e83 |
Index: glibc-2.17-c758a686/elf/rtld-Rules
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/elf/rtld-Rules
|
|
|
147e83 |
+++ glibc-2.17-c758a686/elf/rtld-Rules
|
|
|
147e83 |
@@ -134,6 +134,6 @@ lib := rtld
|
|
|
147e83 |
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
|
|
|
147e83 |
|
|
|
147e83 |
# This here is the whole point of all the shenanigans.
|
|
|
147e83 |
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1
|
|
|
147e83 |
+rtld-CPPFLAGS := -DNOT_IN_libc=1
|
|
|
147e83 |
|
|
|
147e83 |
endif
|
|
|
147e83 |
Index: glibc-2.17-c758a686/elf/setup-vdso.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/elf/setup-vdso.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/elf/setup-vdso.h
|
|
|
147e83 |
@@ -101,7 +101,7 @@ setup_vdso (struct link_map *main_map __
|
|
|
147e83 |
/* Add the vDSO to the object list. */
|
|
|
147e83 |
_dl_add_to_namespace_list (l, LM_ID_BASE);
|
|
|
147e83 |
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
/* Rearrange the list so this DSO appears after rtld_map. */
|
|
|
147e83 |
assert (l->l_next == NULL);
|
|
|
147e83 |
assert (l->l_prev == main_map);
|
|
|
147e83 |
Index: glibc-2.17-c758a686/include/assert.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/include/assert.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/include/assert.h
|
|
|
147e83 |
@@ -20,7 +20,7 @@ extern void __assert_fail_base (const ch
|
|
|
147e83 |
const char *function)
|
|
|
147e83 |
__THROW __attribute__ ((__noreturn__));
|
|
|
147e83 |
|
|
|
147e83 |
-# if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+# if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
hidden_proto (__assert_fail)
|
|
|
147e83 |
hidden_proto (__assert_perror_fail)
|
|
|
147e83 |
# endif
|
|
|
147e83 |
Index: glibc-2.17-c758a686/include/bits/stdlib-float.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/include/bits/stdlib-float.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/include/bits/stdlib-float.h
|
|
|
147e83 |
@@ -1,4 +1,4 @@
|
|
|
147e83 |
/* No floating-point inline functions in rtld. */
|
|
|
147e83 |
-#ifndef IS_IN_rtld
|
|
|
147e83 |
+#if !IS_IN (rtld)
|
|
|
147e83 |
# include <stdlib/bits/stdlib-float.h>
|
|
|
147e83 |
#endif
|
|
|
147e83 |
Index: glibc-2.17-c758a686/include/errno.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/include/errno.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/include/errno.h
|
|
|
147e83 |
@@ -4,7 +4,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#if defined _ERRNO_H && !defined _ISOMAC && !defined __cplusplus
|
|
|
147e83 |
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h>
|
|
|
147e83 |
# endif
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/include/sys/stat.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/include/sys/stat.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/include/sys/stat.h
|
|
|
147e83 |
@@ -12,7 +12,7 @@ extern __mode_t __umask (__mode_t __mask
|
|
|
147e83 |
extern int __mkdir (const char *__path, __mode_t __mode);
|
|
|
147e83 |
extern int __mknod (const char *__path,
|
|
|
147e83 |
__mode_t __mode, __dev_t __dev);
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
hidden_proto (__fxstat)
|
|
|
147e83 |
hidden_proto (__fxstat64)
|
|
|
147e83 |
hidden_proto (__lxstat)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/aarch64/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/aarch64/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/aarch64/setjmp.S
|
|
|
147e83 |
@@ -58,7 +58,7 @@ ENTRY (__sigsetjmp)
|
|
|
147e83 |
mov x2, sp
|
|
|
147e83 |
str x2, [x0, #JB_SP<<3]
|
|
|
147e83 |
#endif
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask */
|
|
|
147e83 |
mov w0, #0
|
|
|
147e83 |
RET
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/alpha/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/alpha/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/alpha/setjmp.S
|
|
|
147e83 |
@@ -86,7 +86,7 @@ $sigsetjmp_local:
|
|
|
147e83 |
ldq ra, 0(sp)
|
|
|
147e83 |
addq sp, 16, sp
|
|
|
147e83 |
ret
|
|
|
147e83 |
-#elif defined IS_IN_rtld
|
|
|
147e83 |
+#elif IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
mov 0, v0
|
|
|
147e83 |
ret
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/arm/__longjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/arm/__longjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/arm/__longjmp.S
|
|
|
147e83 |
@@ -52,7 +52,7 @@ ENTRY (__longjmp)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef NEED_HWCAP
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
ldr a2, 1f
|
|
|
147e83 |
ldr a3, .Lrtld_local_ro
|
|
|
147e83 |
0: add a2, pc, a2
|
|
|
147e83 |
@@ -104,7 +104,7 @@ ENTRY (__longjmp)
|
|
|
147e83 |
DO_RET(lr)
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef NEED_HWCAP
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
1: .long _GLOBAL_OFFSET_TABLE_ - 0b - 8
|
|
|
147e83 |
.Lrtld_local_ro:
|
|
|
147e83 |
.long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/arm/aeabi_unwind_cpp_pr1.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/arm/aeabi_unwind_cpp_pr1.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/arm/aeabi_unwind_cpp_pr1.c
|
|
|
147e83 |
@@ -27,7 +27,7 @@ attribute_hidden
|
|
|
147e83 |
void
|
|
|
147e83 |
__aeabi_unwind_cpp_pr0 (void)
|
|
|
147e83 |
{
|
|
|
147e83 |
-#ifndef IS_IN_rtld
|
|
|
147e83 |
+#if !IS_IN (rtld)
|
|
|
147e83 |
abort ();
|
|
|
147e83 |
#endif
|
|
|
147e83 |
}
|
|
|
147e83 |
@@ -36,7 +36,7 @@ attribute_hidden
|
|
|
147e83 |
void
|
|
|
147e83 |
__aeabi_unwind_cpp_pr1 (void)
|
|
|
147e83 |
{
|
|
|
147e83 |
-#ifndef IS_IN_rtld
|
|
|
147e83 |
+#if !IS_IN (rtld)
|
|
|
147e83 |
abort ();
|
|
|
147e83 |
#endif
|
|
|
147e83 |
}
|
|
|
147e83 |
@@ -45,7 +45,7 @@ attribute_hidden
|
|
|
147e83 |
void
|
|
|
147e83 |
__aeabi_unwind_cpp_pr2 (void)
|
|
|
147e83 |
{
|
|
|
147e83 |
-#ifndef IS_IN_rtld
|
|
|
147e83 |
+#if !IS_IN (rtld)
|
|
|
147e83 |
abort ();
|
|
|
147e83 |
#endif
|
|
|
147e83 |
}
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/arm/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/arm/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/arm/setjmp.S
|
|
|
147e83 |
@@ -35,7 +35,7 @@ ENTRY (__sigsetjmp)
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef NEED_HWCAP
|
|
|
147e83 |
/* Check if we have a VFP unit. */
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
ldr a3, 1f
|
|
|
147e83 |
ldr a4, .Lrtld_local_ro
|
|
|
147e83 |
0: add a3, pc, a3
|
|
|
147e83 |
@@ -90,7 +90,7 @@ ENTRY (__sigsetjmp)
|
|
|
147e83 |
B PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef NEED_HWCAP
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
1: .long _GLOBAL_OFFSET_TABLE_ - 0b - 8
|
|
|
147e83 |
.Lrtld_local_ro:
|
|
|
147e83 |
.long C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/generic/_itoa.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/generic/_itoa.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/generic/_itoa.h
|
|
|
147e83 |
@@ -46,7 +46,7 @@ extern char *_itoa (unsigned long long i
|
|
|
147e83 |
|
|
|
147e83 |
extern const char _itoa_upper_digits[];
|
|
|
147e83 |
extern const char _itoa_lower_digits[];
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
hidden_proto (_itoa_upper_digits)
|
|
|
147e83 |
hidden_proto (_itoa_lower_digits)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/generic/dl-sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/generic/dl-sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/generic/dl-sysdep.h
|
|
|
147e83 |
@@ -27,7 +27,7 @@
|
|
|
147e83 |
all the libc functions that ld.so uses are called without PLT and always
|
|
|
147e83 |
get the versions linked into ld.so rather than the libc ones. */
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# define RTLD_PRIVATE_ERRNO 1
|
|
|
147e83 |
#else
|
|
|
147e83 |
# define RTLD_PRIVATE_ERRNO 0
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/generic/ldsodefs.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/generic/ldsodefs.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/generic/ldsodefs.h
|
|
|
147e83 |
@@ -246,7 +246,7 @@ typedef void (*receiver_fct) (int, const
|
|
|
147e83 |
# define GL(name) _##name
|
|
|
147e83 |
#else
|
|
|
147e83 |
# define EXTERN
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
# define GL(name) _rtld_local._##name
|
|
|
147e83 |
# else
|
|
|
147e83 |
# define GL(name) _rtld_global._##name
|
|
|
147e83 |
@@ -415,7 +415,7 @@ struct rtld_global
|
|
|
147e83 |
#ifdef SHARED
|
|
|
147e83 |
};
|
|
|
147e83 |
# define __rtld_global_attribute__
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
# ifdef HAVE_SDATA_SECTION
|
|
|
147e83 |
# define __rtld_local_attribute__ \
|
|
|
147e83 |
__attribute__ ((visibility ("hidden"), section (".sdata")))
|
|
|
147e83 |
@@ -434,7 +434,7 @@ extern struct rtld_global _rtld_global _
|
|
|
147e83 |
#ifndef SHARED
|
|
|
147e83 |
# define GLRO(name) _##name
|
|
|
147e83 |
#else
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
# define GLRO(name) _rtld_local_ro._##name
|
|
|
147e83 |
# else
|
|
|
147e83 |
# define GLRO(name) _rtld_global_ro._##name
|
|
|
147e83 |
@@ -593,7 +593,7 @@ struct rtld_global_ro
|
|
|
147e83 |
EXTERN int _dl_pointer_guard;
|
|
|
147e83 |
};
|
|
|
147e83 |
# define __rtld_global_attribute__
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
# define __rtld_local_attribute__ __attribute__ ((visibility ("hidden")))
|
|
|
147e83 |
extern struct rtld_global_ro _rtld_local_ro
|
|
|
147e83 |
attribute_relro __rtld_local_attribute__;
|
|
|
147e83 |
@@ -610,7 +610,7 @@ extern const struct rtld_global_ro _rtld
|
|
|
147e83 |
#endif
|
|
|
147e83 |
#undef EXTERN
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* This is the initial value of GL(dl_error_catch_tsd).
|
|
|
147e83 |
A non-TLS libpthread will change it. */
|
|
|
147e83 |
extern void **_dl_initial_error_catch_tsd (void) __attribute__ ((const))
|
|
|
147e83 |
@@ -641,7 +641,7 @@ extern char **_dl_argv
|
|
|
147e83 |
attribute_relro
|
|
|
147e83 |
#endif
|
|
|
147e83 |
;
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
extern char **_dl_argv_internal attribute_hidden
|
|
|
147e83 |
# ifndef DL_ARGV_NOT_RELRO
|
|
|
147e83 |
attribute_relro
|
|
|
147e83 |
@@ -655,7 +655,7 @@ extern char **_dl_argv_internal attribut
|
|
|
147e83 |
/* Flag set at startup and cleared when the last initializer has run. */
|
|
|
147e83 |
extern int _dl_starting_up;
|
|
|
147e83 |
weak_extern (_dl_starting_up)
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
extern int _dl_starting_up_internal attribute_hidden;
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/i386/dl-tls.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/i386/dl-tls.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/i386/dl-tls.h
|
|
|
147e83 |
@@ -32,7 +32,7 @@ extern void *___tls_get_addr (tls_index
|
|
|
147e83 |
extern void *___tls_get_addr_internal (tls_index *ti)
|
|
|
147e83 |
__attribute__ ((__regparm__ (1))) attribute_hidden;
|
|
|
147e83 |
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
/* The special thing about the x86 TLS ABI is that we have two
|
|
|
147e83 |
variants of the __tls_get_addr function with different calling
|
|
|
147e83 |
conventions. The GNU version, which we are mostly concerned here,
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/i386/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/i386/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/i386/setjmp.S
|
|
|
147e83 |
@@ -51,7 +51,7 @@ ENTRY (BP_SYM (__sigsetjmp))
|
|
|
147e83 |
LEAVE /* pop frame pointer to prepare for tail-call. */
|
|
|
147e83 |
movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
xorl %eax, %eax
|
|
|
147e83 |
ret
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/m68k/setjmp.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/m68k/setjmp.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/m68k/setjmp.c
|
|
|
147e83 |
@@ -57,7 +57,7 @@ __sigsetjmp (jmp_buf env, int savemask)
|
|
|
147e83 |
: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
return 0;
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/mach/hurd/dl-execstack.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/mach/hurd/dl-execstack.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/mach/hurd/dl-execstack.c
|
|
|
147e83 |
@@ -34,7 +34,7 @@ _dl_make_stack_executable (void **stack_
|
|
|
147e83 |
return EPERM;
|
|
|
147e83 |
*stack_endp = NULL;
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
if (__mprotect ((void *)_dl_hurd_data->stack_base, _dl_hurd_data->stack_size,
|
|
|
147e83 |
PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
|
|
|
147e83 |
return errno;
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/mach/hurd/opendir.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/mach/hurd/opendir.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/mach/hurd/opendir.c
|
|
|
147e83 |
@@ -82,7 +82,7 @@ __opendirat (int dfd, const char *name)
|
|
|
147e83 |
|
|
|
147e83 |
int flags = O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC;
|
|
|
147e83 |
int fd;
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
assert (dfd == AT_FDCWD);
|
|
|
147e83 |
fd = open_not_cancel_2 (name, flags);
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/posix/getcwd.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/posix/getcwd.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/posix/getcwd.c
|
|
|
147e83 |
@@ -206,7 +206,7 @@ extern char *alloca ();
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef __ASSUME_ATFCTS
|
|
|
147e83 |
# define __have_atfcts 1
|
|
|
147e83 |
-#elif defined IS_IN_rtld
|
|
|
147e83 |
+#elif IS_IN (rtld)
|
|
|
147e83 |
static int __rtld_have_atfcts;
|
|
|
147e83 |
# define __have_atfcts __rtld_have_atfcts
|
|
|
147e83 |
#endif
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/posix/opendir.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/posix/opendir.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/posix/opendir.c
|
|
|
147e83 |
@@ -121,7 +121,7 @@ __opendirat (int dfd, const char *name)
|
|
|
147e83 |
flags |= O_CLOEXEC;
|
|
|
147e83 |
#endif
|
|
|
147e83 |
int fd;
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
assert (dfd == AT_FDCWD);
|
|
|
147e83 |
fd = open_not_cancel_2 (name, flags);
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/posix/profil.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/posix/profil.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/posix/profil.c
|
|
|
147e83 |
@@ -65,7 +65,7 @@ __profil (u_short *sample_buffer, size_t
|
|
|
147e83 |
{
|
|
|
147e83 |
struct sigaction act;
|
|
|
147e83 |
struct itimerval timer;
|
|
|
147e83 |
-#ifndef IS_IN_rtld
|
|
|
147e83 |
+#if !IS_IN (rtld)
|
|
|
147e83 |
static struct sigaction oact;
|
|
|
147e83 |
static struct itimerval otimer;
|
|
|
147e83 |
# define oact_ptr &oact
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/dl-procinfo.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/dl-procinfo.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/dl-procinfo.h
|
|
|
147e83 |
@@ -166,7 +166,7 @@ _dl_string_platform (const char *str)
|
|
|
147e83 |
return -1;
|
|
|
147e83 |
}
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
static inline int
|
|
|
147e83 |
__attribute__ ((unused))
|
|
|
147e83 |
_dl_procinfo (unsigned int type, unsigned long int word)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
|
|
|
147e83 |
@@ -37,7 +37,7 @@ ENTRY (BP_SYM (__longjmp))
|
|
|
147e83 |
addis r5,r5,_GLOBAL_OFFSET_TABLE_-got_label@ha
|
|
|
147e83 |
addi r5,r5,_GLOBAL_OFFSET_TABLE_-got_label@l
|
|
|
147e83 |
# ifdef SHARED
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
/* Inside ld.so we use the local alias to avoid runtime GOT
|
|
|
147e83 |
relocations. */
|
|
|
147e83 |
lwz r5,_rtld_local_ro@got(r5)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
|
|
|
147e83 |
@@ -90,7 +90,7 @@ ENTRY (BP_SYM (__sigsetjmp))
|
|
|
147e83 |
mtlr r6
|
|
|
147e83 |
cfi_same_value (lr)
|
|
|
147e83 |
# ifdef SHARED
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
/* Inside ld.so we use the local alias to avoid runtime GOT
|
|
|
147e83 |
relocations. */
|
|
|
147e83 |
lwz r5,_rtld_local_ro@got(r5)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
|
|
|
147e83 |
@@ -21,7 +21,7 @@
|
|
|
147e83 |
the dl_hwcap field. The assembly is to make the compiler not optimize the
|
|
|
147e83 |
test (&_rtld_global_ro != NULL), which is always true in ISO C (but not
|
|
|
147e83 |
in that case since _rtld_global_ro might not been realocated yet). */
|
|
|
147e83 |
-#if defined(SHARED) && !defined(IS_IN_rtld)
|
|
|
147e83 |
+#if defined(SHARED) && !IS_IN (rtld)
|
|
|
147e83 |
# define __GLRO(value) \
|
|
|
147e83 |
({ volatile void **__p = (volatile void**)(&_rtld_global_ro); \
|
|
|
147e83 |
unsigned long int __ret; \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp-common.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/setjmp-common.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp-common.S
|
|
|
147e83 |
@@ -64,7 +64,7 @@ ENTRY (BP_SYM (__sigsetjmp))
|
|
|
147e83 |
stw r29,((JB_GPRS+15)*4)(3)
|
|
|
147e83 |
stw r30,((JB_GPRS+16)*4)(3)
|
|
|
147e83 |
stw r31,((JB_GPRS+17)*4)(3)
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
li r3,0
|
|
|
147e83 |
blr
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc64/__longjmp-common.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S
|
|
|
147e83 |
@@ -31,7 +31,7 @@
|
|
|
147e83 |
.section ".toc","aw"
|
|
|
147e83 |
.LC__dl_hwcap:
|
|
|
147e83 |
# ifdef SHARED
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
/* Inside ld.so we use the local alias to avoid runtime GOT
|
|
|
147e83 |
relocations. */
|
|
|
147e83 |
.tc _rtld_local_ro[TC],_rtld_local_ro
|
|
|
147e83 |
@@ -132,7 +132,7 @@ L(no_vmx):
|
|
|
147e83 |
ld r0,(JB_LR*8)(r3)
|
|
|
147e83 |
ld r14,((JB_GPRS+0)*8)(r3)
|
|
|
147e83 |
lfd fp14,((JB_FPRS+0)*8)(r3)
|
|
|
147e83 |
-#if defined SHARED && !defined IS_IN_rtld
|
|
|
147e83 |
+#if defined SHARED && !IS_IN (rtld)
|
|
|
147e83 |
std r2,FRAME_TOC_SAVE(r1) /* Restore the callers TOC save area. */
|
|
|
147e83 |
#endif
|
|
|
147e83 |
ld r15,((JB_GPRS+1)*8)(r3)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc64/setjmp-common.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S
|
|
|
147e83 |
@@ -30,7 +30,7 @@
|
|
|
147e83 |
.section ".toc","aw"
|
|
|
147e83 |
.LC__dl_hwcap:
|
|
|
147e83 |
# ifdef SHARED
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
/* Inside ld.so we use the local alias to avoid runtime GOT
|
|
|
147e83 |
relocations. */
|
|
|
147e83 |
.tc _rtld_local_ro[TC],_rtld_local_ro
|
|
|
147e83 |
@@ -50,7 +50,7 @@ ENTRY (setjmp)
|
|
|
147e83 |
b JUMPTARGET (GLUE(__sigsetjmp,_ent))
|
|
|
147e83 |
END (setjmp)
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined SHARED && !defined IS_IN_rtld && !defined __NO_VMX__
|
|
|
147e83 |
+#if defined SHARED && !IS_IN (rtld) && !defined __NO_VMX__
|
|
|
147e83 |
/* When called from within libc we need a special version of _setjmp
|
|
|
147e83 |
that saves r2 since the call won't go via a plt call stub. See
|
|
|
147e83 |
bugz #269. __GI__setjmp is used in csu/libc-start.c when
|
|
|
147e83 |
@@ -82,7 +82,7 @@ JUMPTARGET(GLUE(__sigsetjmp,_ent)):
|
|
|
147e83 |
std r1,(JB_GPR1*8)(3)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
mflr r0
|
|
|
147e83 |
-#if defined SHARED && !defined IS_IN_rtld
|
|
|
147e83 |
+#if defined SHARED && !IS_IN (rtld)
|
|
|
147e83 |
ld r5,FRAME_TOC_SAVE(r1) /* Retrieve the callers TOC. */
|
|
|
147e83 |
std r5,(JB_GPR2*8)(3)
|
|
|
147e83 |
#else
|
|
|
147e83 |
@@ -212,7 +212,7 @@ L(no_vmx):
|
|
|
147e83 |
#else
|
|
|
147e83 |
li r6,0
|
|
|
147e83 |
#endif
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
li r3,0
|
|
|
147e83 |
blr
|
|
|
147e83 |
#elif defined SHARED
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/s390/dl-tls.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/s390/dl-tls.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/s390/dl-tls.h
|
|
|
147e83 |
@@ -29,7 +29,7 @@ typedef struct
|
|
|
147e83 |
|
|
|
147e83 |
extern unsigned long __tls_get_offset (unsigned long got_offset);
|
|
|
147e83 |
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
|
|
|
147e83 |
# include <shlib-compat.h>
|
|
|
147e83 |
|
|
|
147e83 |
@@ -78,9 +78,9 @@ __tls_get_offset:\n\
|
|
|
147e83 |
1: .long __tls_get_addr - 0b\n\
|
|
|
147e83 |
");
|
|
|
147e83 |
# endif
|
|
|
147e83 |
-# else /* IS_IN_rtld */
|
|
|
147e83 |
+# else /* IS_IN (rtld) */
|
|
|
147e83 |
extern void *__tls_get_addr_internal (tls_index *ti);
|
|
|
147e83 |
-# endif /* !IS_IN_rtld */
|
|
|
147e83 |
+# endif /* !IS_IN (rtld) */
|
|
|
147e83 |
|
|
|
147e83 |
# define GET_ADDR_OFFSET \
|
|
|
147e83 |
(ti->ti_offset - (unsigned long) __builtin_thread_pointer ())
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/s390/s390-32/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/s390/s390-32/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/s390/s390-32/setjmp.S
|
|
|
147e83 |
@@ -57,7 +57,7 @@ ENTRY(__sigsetjmp)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
std %f4,40(%r2)
|
|
|
147e83 |
std %f6,48(%r2)
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
lhi %r2,0
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/s390/s390-64/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/s390/s390-64/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/s390/s390-64/setjmp.S
|
|
|
147e83 |
@@ -63,7 +63,7 @@ ENTRY(__sigsetjmp)
|
|
|
147e83 |
std %f13,120(%r2)
|
|
|
147e83 |
std %f14,128(%r2)
|
|
|
147e83 |
std %f15,136(%r2)
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
lghi %r2,0
|
|
|
147e83 |
br %r14
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/sh/sh3/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/sh/sh3/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/sh/sh3/setjmp.S
|
|
|
147e83 |
@@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
|
|
|
147e83 |
mov.l r9, @-r4
|
|
|
147e83 |
mov.l r8, @-r4
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
rts
|
|
|
147e83 |
mov #0, r0
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/sh/sh4/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/sh/sh4/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/sh/sh4/setjmp.S
|
|
|
147e83 |
@@ -55,7 +55,7 @@ ENTRY (__sigsetjmp)
|
|
|
147e83 |
mov.l r9, @-r4
|
|
|
147e83 |
mov.l r8, @-r4
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
rts
|
|
|
147e83 |
mov #0, r0
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/alpha/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/alpha/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/alpha/sysdep.h
|
|
|
147e83 |
@@ -26,7 +26,7 @@
|
|
|
147e83 |
# include <regdef.h>
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -346,7 +346,7 @@ __LABEL(name) \
|
|
|
147e83 |
|
|
|
147e83 |
#include <stdint.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# ifdef __ASSEMBLER__
|
|
|
147e83 |
# define PTR_MANGLE(dst, src, tmp) \
|
|
|
147e83 |
ldah tmp, __pointer_chk_guard_local($29) !gprelhigh; \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/arm/sysdep.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/arm/sysdep.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/arm/sysdep.S
|
|
|
147e83 |
@@ -21,7 +21,7 @@
|
|
|
147e83 |
#define _ERRNO_H
|
|
|
147e83 |
#include <bits/errno.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/i386/sysdep.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/i386/sysdep.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/i386/sysdep.S
|
|
|
147e83 |
@@ -22,7 +22,7 @@
|
|
|
147e83 |
#include <bp-asm.h>
|
|
|
147e83 |
#include <bp-sym.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
|
|
|
147e83 |
@@ -324,7 +324,7 @@
|
|
|
147e83 |
#endif /* __ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling is supported for AArch64. */
|
|
|
147e83 |
-#if (defined IS_IN_rtld) || \
|
|
|
147e83 |
+#if (IS_IN (rtld)) || \
|
|
|
147e83 |
(!defined SHARED && (!defined NOT_IN_libc \
|
|
|
147e83 |
|| IS_IN (libpthread)))
|
|
|
147e83 |
# ifdef __ASSEMBLER__
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/getcwd.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/getcwd.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/getcwd.c
|
|
|
147e83 |
@@ -33,7 +33,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
/* If we compile the file for use in ld.so we don't need the feature
|
|
|
147e83 |
that getcwd() allocates the buffers itself. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# define NO_ALLOCATION 1
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
|
|
|
147e83 |
@@ -56,7 +56,7 @@
|
|
|
147e83 |
/* Initialize locks to zero. */
|
|
|
147e83 |
#define LLL_MUTEX_LOCK_INITIALIZER (0)
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
|
|
|
147e83 |
@@ -71,7 +71,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/i386/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/i386/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/i386/sysdep.h
|
|
|
147e83 |
@@ -521,7 +521,7 @@ asm (".L__X'%ebx = 1\n\t"
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. Using a global variable
|
|
|
147e83 |
is too complicated here since we have no PC-relative addressing mode. */
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
|
|
|
147e83 |
@@ -50,7 +50,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
|
|
|
147e83 |
@@ -179,7 +179,7 @@ ENTRY(__sigsetjmp)
|
|
|
147e83 |
;;
|
|
|
147e83 |
st8.nta [r2]=r25 // ar.unat
|
|
|
147e83 |
st8.nta [r3]=in0 // &__jmp_buf
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
;;
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/sysdep.h
|
|
|
147e83 |
@@ -361,7 +361,7 @@
|
|
|
147e83 |
#endif /* not __ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
|
|
|
147e83 |
@@ -23,7 +23,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef SHARED
|
|
|
147e83 |
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
# define M68K_VDSO_SYMBOL(name) __rtld_##name
|
|
|
147e83 |
# define STR_M68K_VDSO_SYMBOL(name) "__rtld_" #name
|
|
|
147e83 |
# else
|
|
|
147e83 |
@@ -35,7 +35,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
/* We define __rtld_* copies for rtld.
|
|
|
147e83 |
We need them visible in libc to initialize. */
|
|
|
147e83 |
-# if defined IS_IN_rtld || !defined NOT_IN_libc
|
|
|
147e83 |
+# if IS_IN (rtld) || !defined NOT_IN_libc
|
|
|
147e83 |
extern void *__rtld___vdso_read_tp;
|
|
|
147e83 |
extern void *__rtld___vdso_atomic_cmpxchg_32;
|
|
|
147e83 |
extern void *__rtld___vdso_atomic_barrier;
|
|
|
147e83 |
@@ -44,14 +44,14 @@ extern void *__rtld___vdso_atomic_barrie
|
|
|
147e83 |
extern void __vdso_read_tp_stub (void);
|
|
|
147e83 |
extern void __vdso_atomic_cmpxchg_32_stub (void);
|
|
|
147e83 |
extern void __vdso_atomic_barrier_stub (void);
|
|
|
147e83 |
-# endif /* IS_IN_rtld || !NOT_IN_libc */
|
|
|
147e83 |
+# endif /* IS_IN (rtld) || !NOT_IN_libc */
|
|
|
147e83 |
|
|
|
147e83 |
/* RTLD should only use its own copies. */
|
|
|
147e83 |
-# ifndef IS_IN_rtld
|
|
|
147e83 |
+# if !IS_IN (rtld)
|
|
|
147e83 |
extern void *__vdso_read_tp;
|
|
|
147e83 |
extern void *__vdso_atomic_cmpxchg_32;
|
|
|
147e83 |
extern void *__vdso_atomic_barrier;
|
|
|
147e83 |
-# endif /* !IS_IN_rtld */
|
|
|
147e83 |
+# endif /* !IS_IN (rtld) */
|
|
|
147e83 |
|
|
|
147e83 |
# endif /* !__ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
|
|
|
147e83 |
@@ -51,7 +51,7 @@ END (__vdso_read_tp_stub)
|
|
|
147e83 |
equivalent helper function (which clobbers fewer registers than
|
|
|
147e83 |
a normal function call) in a vdso; tail call to the
|
|
|
147e83 |
helper. */
|
|
|
147e83 |
-# ifdef IS_IN_rtld
|
|
|
147e83 |
+# if IS_IN (rtld)
|
|
|
147e83 |
/* rtld gets a hidden copy of __m68k_read_tp. */
|
|
|
147e83 |
.hidden __m68k_read_tp
|
|
|
147e83 |
# endif
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
|
|
|
147e83 |
@@ -272,7 +272,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
|
|
|
147e83 |
@@ -282,7 +282,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
|
|
|
147e83 |
@@ -51,7 +51,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
|
|
|
147e83 |
@@ -367,7 +367,7 @@
|
|
|
147e83 |
_ret; })
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
|
|
|
147e83 |
@@ -373,7 +373,7 @@
|
|
|
147e83 |
_ret; })
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
|
|
|
147e83 |
@@ -50,7 +50,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sh/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/sh/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sh/sysdep.h
|
|
|
147e83 |
@@ -338,7 +338,7 @@
|
|
|
147e83 |
#endif /* __ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. Using a global variable
|
|
|
147e83 |
is too complicated here since we have no PC-relative addressing mode. */
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
|
|
|
147e83 |
@@ -56,7 +56,7 @@ extern void __cpu_relax (void);
|
|
|
147e83 |
#define BUSY_WAIT_NOP __cpu_relax ()
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
|
|
|
147e83 |
@@ -22,7 +22,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#include <sysdeps/unix/sysv/linux/sparc/sysdep.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
|
|
|
147e83 |
#endif
|
|
|
147e83 |
#include <tls.h>
|
|
|
147e83 |
@@ -126,7 +126,7 @@ ENTRY(name); \
|
|
|
147e83 |
#endif /* __ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
|
|
|
147e83 |
@@ -22,7 +22,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#include <sysdeps/unix/sysv/linux/sparc/sysdep.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
|
|
|
147e83 |
#endif
|
|
|
147e83 |
#include <tls.h>
|
|
|
147e83 |
@@ -141,7 +141,7 @@ ENTRY(name); \
|
|
|
147e83 |
#define STACK_BIAS 2047
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
|
|
|
147e83 |
@@ -205,7 +205,7 @@
|
|
|
147e83 |
#endif /* not __ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#if defined NOT_IN_libc && IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
#else
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
|
|
|
147e83 |
@@ -72,7 +72,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#ifndef __ASSEMBLER__
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/x86_64/sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/x86_64/sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/x86_64/sysdep.h
|
|
|
147e83 |
@@ -24,7 +24,7 @@
|
|
|
147e83 |
#include <bp-asm.h>
|
|
|
147e83 |
#include <tls.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -395,7 +395,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
|
|
147e83 |
earlier than the descriptor is initialized. */
|
|
|
147e83 |
# ifdef __ASSEMBLER__
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/unix/x86_64/sysdep.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/unix/x86_64/sysdep.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/unix/x86_64/sysdep.S
|
|
|
147e83 |
@@ -22,7 +22,7 @@
|
|
|
147e83 |
#include <bp-sym.h>
|
|
|
147e83 |
#include <tls.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/x86_64/setjmp.S
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/x86_64/setjmp.S
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/x86_64/setjmp.S
|
|
|
147e83 |
@@ -54,7 +54,7 @@ ENTRY (__sigsetjmp)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
movq %rax, (JB_PC*8)(%rdi)
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
xorl %eax, %eax
|
|
|
147e83 |
retq
|
|
|
147e83 |
Index: glibc-2.17-c758a686/include/unistd.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/include/unistd.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/include/unistd.h
|
|
|
147e83 |
@@ -151,7 +151,7 @@ libc_hidden_proto (__sbrk)
|
|
|
147e83 |
environment variables that normally affect them. */
|
|
|
147e83 |
extern int __libc_enable_secure attribute_relro;
|
|
|
147e83 |
extern int __libc_enable_secure_decided;
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
/* XXX The #ifdef should go. */
|
|
|
147e83 |
extern int __libc_enable_secure_internal attribute_relro attribute_hidden;
|
|
|
147e83 |
#endif
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
|
|
|
147e83 |
@@ -27,7 +27,7 @@
|
|
|
147e83 |
all the libc functions that ld.so uses are called without PLT and always
|
|
|
147e83 |
get the versions linked into ld.so rather than the libc ones. */
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# define RTLD_PRIVATE_ERRNO 1
|
|
|
147e83 |
#else
|
|
|
147e83 |
# define RTLD_PRIVATE_ERRNO 0
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
|
|
|
147e83 |
@@ -52,7 +52,7 @@
|
|
|
147e83 |
#define LLL_PRIVATE 0
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
|
|
|
147e83 |
@@ -49,7 +49,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
|
|
|
147e83 |
@@ -50,7 +50,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
|
|
|
147e83 |
@@ -48,7 +48,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
|
|
|
147e83 |
@@ -27,7 +27,7 @@
|
|
|
147e83 |
all the libc functions that ld.so uses are called without PLT and always
|
|
|
147e83 |
get the versions linked into ld.so rather than the libc ones. */
|
|
|
147e83 |
|
|
|
147e83 |
-#ifdef IS_IN_rtld
|
|
|
147e83 |
+#if IS_IN (rtld)
|
|
|
147e83 |
# define RTLD_PRIVATE_ERRNO 1
|
|
|
147e83 |
#else
|
|
|
147e83 |
# define RTLD_PRIVATE_ERRNO 0
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
|
|
|
147e83 |
@@ -50,7 +50,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
|
|
|
147e83 |
@@ -48,7 +48,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
|
|
|
147e83 |
@@ -50,7 +50,7 @@
|
|
|
147e83 |
#define LLL_SHARED FUTEX_PRIVATE_FLAG
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
-#if !defined NOT_IN_libc || defined IS_IN_rtld
|
|
|
147e83 |
+#if !defined NOT_IN_libc || IS_IN (rtld)
|
|
|
147e83 |
/* In libc.so or ld.so all futexes are private. */
|
|
|
147e83 |
# ifdef __ASSUME_PRIVATE_FUTEX
|
|
|
147e83 |
# define __lll_private_flag(fl, private) \
|