|
 |
147e83 |
commit eb72478a286e0104f5636d21d86407b4c0e89fa1
|
|
|
147e83 |
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
|
|
|
147e83 |
Date: Thu Aug 21 10:26:46 2014 +0530
|
|
|
147e83 |
|
|
|
147e83 |
Remove unnecessary uses of NOT_IN_libc
|
|
|
147e83 |
|
|
|
147e83 |
If a IS_IN_* macro is defined, then NOT_IN_libc is always defined,
|
|
|
147e83 |
except obviously for IS_IN_libc. There's no need to check for both.
|
|
|
147e83 |
Verified on x86_64 and i686 that the source is unchanged.
|
|
|
147e83 |
|
|
|
147e83 |
* include/libc-symbols.h: Remove unnecessary check for
|
|
|
147e83 |
NOT_IN_libc.
|
|
|
147e83 |
* nptl/pthreadP.h: Likewise.
|
|
|
147e83 |
* sysdeps/aarch64/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/alpha/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/arm/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/i386/setjmp.S: Likewise.
|
|
|
147e83 |
* sysdeps/m68k/setjmp.c: Likewise.
|
|
|
147e83 |
* sysdeps/posix/getcwd.c: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise.
|
|
|
147e83 |
* sysdeps/powerpc/powerpc64/setjmp-common.S: 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/sysv/linux/aarch64/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/i386/sysdep.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/powerpc/powerpc32/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.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/sysdep.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/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
|
|
|
147e83 |
* sysdeps/x86_64/setjmp.S: Likewise.
|
|
|
147e83 |
Index: glibc-2.17-c758a686/include/libc-symbols.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/include/libc-symbols.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/include/libc-symbols.h
|
|
|
147e83 |
@@ -561,7 +561,7 @@ for linking")
|
|
|
147e83 |
# define libc_hidden_data_ver(local, name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef IS_IN_rtld
|
|
|
147e83 |
# define rtld_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define rtld_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define rtld_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
@@ -579,7 +579,7 @@ for linking")
|
|
|
147e83 |
# define rtld_hidden_data_ver(local, name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libm
|
|
|
147e83 |
+#ifdef IS_IN_libm
|
|
|
147e83 |
# define libm_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define libm_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define libm_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
@@ -597,7 +597,7 @@ for linking")
|
|
|
147e83 |
# define libm_hidden_data_ver(local, name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libresolv
|
|
|
147e83 |
+#ifdef IS_IN_libresolv
|
|
|
147e83 |
# define libresolv_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define libresolv_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define libresolv_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
@@ -615,7 +615,7 @@ for linking")
|
|
|
147e83 |
# define libresolv_hidden_data_ver(local, name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_librt
|
|
|
147e83 |
+#ifdef IS_IN_librt
|
|
|
147e83 |
# define librt_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define librt_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define librt_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
@@ -633,7 +633,7 @@ for linking")
|
|
|
147e83 |
# define librt_hidden_data_ver(local, name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libdl
|
|
|
147e83 |
+#ifdef IS_IN_libdl
|
|
|
147e83 |
# define libdl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define libdl_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define libdl_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
@@ -651,7 +651,7 @@ for linking")
|
|
|
147e83 |
# define libdl_hidden_data_ver(local, name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libnss_files
|
|
|
147e83 |
+#ifdef IS_IN_libnss_files
|
|
|
147e83 |
# define libnss_files_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define libnss_files_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define libnss_files_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
@@ -669,7 +669,7 @@ for linking")
|
|
|
147e83 |
# define libnss_files_hidden_data_ver(local, name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libnsl
|
|
|
147e83 |
+#ifdef IS_IN_libnsl
|
|
|
147e83 |
# define libnsl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define libnsl_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define libnsl_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
@@ -687,7 +687,7 @@ for linking")
|
|
|
147e83 |
# define libnsl_hidden_data_ver(local, name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libnss_nisplus
|
|
|
147e83 |
+#ifdef IS_IN_libnss_nisplus
|
|
|
147e83 |
# define libnss_nisplus_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define libnss_nisplus_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define libnss_nisplus_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
@@ -713,7 +713,7 @@ for linking")
|
|
|
147e83 |
# define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libutil
|
|
|
147e83 |
+#ifdef IS_IN_libutil
|
|
|
147e83 |
# define libutil_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
|
|
147e83 |
# define libutil_hidden_def(name) hidden_def (name)
|
|
|
147e83 |
# define libutil_hidden_weak(name) hidden_weak (name)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/pthreadP.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/pthreadP.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/pthreadP.h
|
|
|
147e83 |
@@ -239,7 +239,7 @@ extern void __pthread_register_cancel (_
|
|
|
147e83 |
__cleanup_fct_attribute;
|
|
|
147e83 |
extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
|
|
|
147e83 |
__cleanup_fct_attribute;
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libpthread
|
|
|
147e83 |
+#ifdef IS_IN_libpthread
|
|
|
147e83 |
hidden_proto (__pthread_unwind)
|
|
|
147e83 |
hidden_proto (__pthread_unwind_next)
|
|
|
147e83 |
hidden_proto (__pthread_register_cancel)
|
|
|
147e83 |
@@ -283,13 +283,13 @@ __do_cancel (void)
|
|
|
147e83 |
# define LIBC_CANCEL_HANDLED() \
|
|
|
147e83 |
__asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \
|
|
|
147e83 |
__asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel")
|
|
|
147e83 |
-#elif defined NOT_IN_libc && defined IS_IN_libpthread
|
|
|
147e83 |
+#elif defined IS_IN_libpthread
|
|
|
147e83 |
# define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
|
|
|
147e83 |
# define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
|
|
|
147e83 |
# define LIBC_CANCEL_HANDLED() \
|
|
|
147e83 |
__asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \
|
|
|
147e83 |
__asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel")
|
|
|
147e83 |
-#elif defined NOT_IN_libc && defined IS_IN_librt
|
|
|
147e83 |
+#elif defined IS_IN_librt
|
|
|
147e83 |
# define LIBC_CANCEL_ASYNC() \
|
|
|
147e83 |
__librt_enable_asynccancel ()
|
|
|
147e83 |
# define LIBC_CANCEL_RESET(val) \
|
|
|
147e83 |
@@ -344,7 +344,7 @@ extern int __make_stacks_executable (voi
|
|
|
147e83 |
|
|
|
147e83 |
/* longjmp handling. */
|
|
|
147e83 |
extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libpthread
|
|
|
147e83 |
+#ifdef IS_IN_libpthread
|
|
|
147e83 |
hidden_proto (__pthread_cleanup_upto)
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
@@ -489,7 +489,7 @@ extern int __pthread_enable_asynccancel
|
|
|
147e83 |
extern void __pthread_disable_asynccancel (int oldtype)
|
|
|
147e83 |
internal_function attribute_hidden;
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_libpthread
|
|
|
147e83 |
+#ifdef IS_IN_libpthread
|
|
|
147e83 |
hidden_proto (__pthread_mutex_init)
|
|
|
147e83 |
hidden_proto (__pthread_mutex_destroy)
|
|
|
147e83 |
hidden_proto (__pthread_mutex_lock)
|
|
|
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 NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#elif defined 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/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 |
@@ -212,7 +212,7 @@ L(no_vmx):
|
|
|
147e83 |
#else
|
|
|
147e83 |
li r6,0
|
|
|
147e83 |
#endif
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef IS_IN_rtld
|
|
|
147e83 |
li r3,0
|
|
|
147e83 |
blr
|
|
|
147e83 |
#elif defined SHARED
|
|
|
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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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-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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
@@ -126,7 +126,7 @@ ENTRY(name); \
|
|
|
147e83 |
#endif /* __ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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 |
@@ -141,7 +141,7 @@ ENTRY(name); \
|
|
|
147e83 |
#define STACK_BIAS 2047
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
@@ -395,7 +395,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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 NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#elif defined 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/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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef IS_IN_rtld
|
|
|
147e83 |
/* In ld.so we never save the signal mask. */
|
|
|
147e83 |
return 0;
|
|
|
147e83 |
#else
|
|
|
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 |
@@ -346,7 +346,7 @@ __LABEL(name) \
|
|
|
147e83 |
|
|
|
147e83 |
#include <stdint.h>
|
|
|
147e83 |
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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/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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef IS_IN_rtld
|
|
|
147e83 |
li r3,0
|
|
|
147e83 |
blr
|
|
|
147e83 |
#else
|
|
|
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,8 +324,9 @@
|
|
|
147e83 |
#endif /* __ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling is supported for AArch64. */
|
|
|
147e83 |
-#if (defined NOT_IN_libc && defined IS_IN_rtld) || \
|
|
|
147e83 |
- (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread))
|
|
|
147e83 |
+#if (defined IS_IN_rtld) || \
|
|
|
147e83 |
+ (!defined SHARED && (!defined NOT_IN_libc \
|
|
|
147e83 |
+ || defined IS_IN_libpthread))
|
|
|
147e83 |
# ifdef __ASSEMBLER__
|
|
|
147e83 |
# define PTR_MANGLE(dst, src, guard, tmp) \
|
|
|
147e83 |
LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \
|
|
|
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 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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 |
@@ -62,7 +62,7 @@
|
|
|
147e83 |
|
|
|
147e83 |
#if defined USE_DL_SYSINFO \
|
|
|
147e83 |
&& (!defined NOT_IN_libc \
|
|
|
147e83 |
- || defined IS_IN_libpthread || defined IS_IN_librt)
|
|
|
147e83 |
+ || IS_IN (libpthread) || defined IS_IN_librt)
|
|
|
147e83 |
# define IA64_USE_NEW_STUB
|
|
|
147e83 |
#else
|
|
|
147e83 |
# undef IA64_USE_NEW_STUB
|
|
|
147e83 |
@@ -361,7 +361,7 @@
|
|
|
147e83 |
#endif /* not __ASSEMBLER__ */
|
|
|
147e83 |
|
|
|
147e83 |
/* Pointer mangling support. */
|
|
|
147e83 |
-#if defined NOT_IN_libc && defined IS_IN_rtld
|
|
|
147e83 |
+#ifdef 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
|