AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary uses of NOT_IN_libc

Browse Source 
If a IS_IN_* macro is defined, then NOT_IN_libc is always defined,
except obviously for IS_IN_libc.  There's no need to check for both.
Verified on x86_64 and i686 that the source is unchanged.

       * include/libc-symbols.h: Remove unnecessary check for
       NOT_IN_libc.
       * nptl/pthreadP.h: Likewise.
       * sysdeps/aarch64/setjmp.S: Likewise.
       * sysdeps/alpha/setjmp.S: Likewise.
       * sysdeps/arm/sysdep.h: Likewise.
       * sysdeps/i386/setjmp.S: Likewise.
       * sysdeps/m68k/setjmp.c: Likewise.
       * sysdeps/posix/getcwd.c: Likewise.
       * sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise.
       * sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.
       * sysdeps/s390/s390-32/setjmp.S: Likewise.
       * sysdeps/s390/s390-64/setjmp.S: Likewise.
       * sysdeps/sh/sh3/setjmp.S: Likewise.
       * sysdeps/sh/sh4/setjmp.S: Likewise.
       * sysdeps/unix/alpha/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise.
       * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise.
       * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
       * sysdeps/x86_64/setjmp.S: Likewise.
This commit is contained in:
Siddhesh Poyarekar 2014-08-21 10:26:46 +05:30
parent 7e54fd0421
commit eb72478a28
30 changed files with 80 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ChangeLog
View File

@ -1,3 +1,36 @@
2014-08-21 Siddhesh Poyarekar <siddhesh@redhat.com>
* include/libc-symbols.h: Remove unnecessary check for
NOT_IN_libc.
* nptl/pthreadP.h: Likewise.
* sysdeps/aarch64/setjmp.S: Likewise.
* sysdeps/alpha/setjmp.S: Likewise.
* sysdeps/arm/sysdep.h: Likewise.
* sysdeps/i386/setjmp.S: Likewise.
* sysdeps/m68k/setjmp.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise.
* sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.
* sysdeps/s390/s390-32/setjmp.S: Likewise.
* sysdeps/s390/s390-64/setjmp.S: Likewise.
* sysdeps/sh/sh3/setjmp.S: Likewise.
* sysdeps/sh/sh4/setjmp.S: Likewise.
* sysdeps/unix/alpha/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
* sysdeps/x86_64/setjmp.S: Likewise.
2014-08-13 Joseph Myers <joseph@codesourcery.com>
[BZ #17263]

18
include/libc-symbols.h
View File

@ -584,7 +584,7 @@ for linking")
# define libc_hidden_data_ver(local, name)
#endif
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
# define rtld_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define rtld_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
# define rtld_hidden_def(name) hidden_def (name)
@ -604,7 +604,7 @@ for linking")
# define rtld_hidden_data_ver(local, name)
#endif
#if defined NOT_IN_libc && defined IS_IN_libm
#ifdef IS_IN_libm
# define libm_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libm_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
# define libm_hidden_def(name) hidden_def (name)
@ -624,7 +624,7 @@ for linking")
# define libm_hidden_data_ver(local, name)
#endif
#if defined NOT_IN_libc && defined IS_IN_libresolv
#ifdef IS_IN_libresolv
# define libresolv_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libresolv_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@ -645,7 +645,7 @@ for linking")
# define libresolv_hidden_data_ver(local, name)
#endif
#if defined NOT_IN_libc && defined IS_IN_librt
#ifdef IS_IN_librt
# define librt_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define librt_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@ -666,7 +666,7 @@ for linking")
# define librt_hidden_data_ver(local, name)
#endif
#if defined NOT_IN_libc && defined IS_IN_libdl
#ifdef IS_IN_libdl
# define libdl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libdl_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@ -687,7 +687,7 @@ for linking")
# define libdl_hidden_data_ver(local, name)
#endif
#if defined NOT_IN_libc && defined IS_IN_libnss_files
#ifdef IS_IN_libnss_files
# define libnss_files_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnss_files_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@ -708,7 +708,7 @@ for linking")
# define libnss_files_hidden_data_ver(local, name)
#endif
#if defined NOT_IN_libc && defined IS_IN_libnsl
#ifdef IS_IN_libnsl
# define libnsl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnsl_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@ -729,7 +729,7 @@ for linking")
# define libnsl_hidden_data_ver(local, name)
#endif
#if defined NOT_IN_libc && defined IS_IN_libnss_nisplus
#ifdef IS_IN_libnss_nisplus
# define libnss_nisplus_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libnss_nisplus_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)
@ -758,7 +758,7 @@ for linking")
# define HIDDEN_BUILTIN_JUMPTARGET(name) HIDDEN_JUMPTARGET(name)
#endif
#if defined NOT_IN_libc && defined IS_IN_libutil
#ifdef IS_IN_libutil
# define libutil_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libutil_hidden_tls_proto(name, attrs...) \
hidden_tls_proto (name, ##attrs)

10
nptl/pthreadP.h
View File

@ -252,7 +252,7 @@ extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute;
extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
__cleanup_fct_attribute;
#if defined NOT_IN_libc && defined IS_IN_libpthread
#ifdef IS_IN_libpthread
hidden_proto (__pthread_unwind)
hidden_proto (__pthread_unwind_next)
hidden_proto (__pthread_register_cancel)
@ -296,13 +296,13 @@ __do_cancel (void)
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel")
#elif defined NOT_IN_libc && defined IS_IN_libpthread
#elif defined IS_IN_libpthread
# define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
# define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel")
#elif defined NOT_IN_libc && defined IS_IN_librt
#elif defined IS_IN_librt
# define LIBC_CANCEL_ASYNC() \
__librt_enable_asynccancel ()
# define LIBC_CANCEL_RESET(val) \
@ -341,7 +341,7 @@ extern int __make_stacks_executable (void **stack_endp)
/* longjmp handling. */
extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
#if defined NOT_IN_libc && defined IS_IN_libpthread
#ifdef IS_IN_libpthread
hidden_proto (__pthread_cleanup_upto)
#endif
@ -486,7 +486,7 @@ extern int __pthread_enable_asynccancel (void) attribute_hidden;
extern void __pthread_disable_asynccancel (int oldtype)
internal_function attribute_hidden;
#if defined NOT_IN_libc && defined IS_IN_libpthread
#ifdef IS_IN_libpthread
hidden_proto (__pthread_mutex_init)
hidden_proto (__pthread_mutex_destroy)
hidden_proto (__pthread_mutex_lock)

2
sysdeps/aarch64/setjmp.S
View File

@ -63,7 +63,7 @@ ENTRY (__sigsetjmp)
mov x2, sp
str x2, [x0, #JB_SP<<3]
#endif
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask */
mov w0, #0
RET

2
sysdeps/alpha/setjmp.S
View File

@ -86,7 +86,7 @@ $sigsetjmp_local:
ldq ra, 0(sp)
addq sp, 16, sp
ret
#elif defined NOT_IN_libc && defined IS_IN_rtld
#elif defined IS_IN_rtld
/* In ld.so we never save the signal mask. */
mov 0, v0
ret

4
sysdeps/arm/sysdep.h
View File

@ -292,8 +292,8 @@
#endif
/* Pointer mangling support. */
#if (defined NOT_IN_libc && defined IS_IN_rtld) || \
(!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread))
#if (defined IS_IN_rtld || \
(!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread)))
# ifdef __ASSEMBLER__
# define PTR_MANGLE_LOAD(guard, tmp) \
LDST_PCREL(ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local));

2
sysdeps/i386/setjmp.S
View File

@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
movl %ecx, (JB_PC*4)(%eax)
movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
xorl %eax, %eax
ret

2
sysdeps/m68k/setjmp.c
View File

@ -57,7 +57,7 @@ __sigsetjmp (jmp_buf env, int savemask)
: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
#endif
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
return 0;
#else

2
sysdeps/posix/getcwd.c
View File

@ -206,7 +206,7 @@ extern char *alloca ();
#ifdef __ASSUME_ATFCTS
# define __have_atfcts 1
#elif defined NOT_IN_libc && defined IS_IN_rtld
#elif defined IS_IN_rtld
static int __rtld_have_atfcts;
# define __have_atfcts __rtld_have_atfcts
#endif

2
sysdeps/powerpc/powerpc32/setjmp-common.S
View File

@ -69,7 +69,7 @@ ENTRY (__sigsetjmp_symbol)
SAVE_GP (29)
SAVE_GP (30)
SAVE_GP (31)
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
li r3,0
blr
#else

2
sysdeps/powerpc/powerpc64/setjmp-common.S
View File

@ -213,7 +213,7 @@ L(no_vmx):
#else
li r6,0
#endif
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
li r3,0
blr
#elif defined SHARED

2
sysdeps/s390/s390-32/setjmp.S
View File

@ -65,7 +65,7 @@ ENTRY(__sigsetjmp)
#endif
std %f4,40(%r2)
std %f6,48(%r2)
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
lhi %r2,0
br %r14

2
sysdeps/s390/s390-64/setjmp.S
View File

@ -71,7 +71,7 @@ ENTRY(__sigsetjmp)
std %f13,120(%r2)
std %f14,128(%r2)
std %f15,136(%r2)
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
lghi %r2,0
br %r14

2
sysdeps/sh/sh3/setjmp.S
View File

@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
mov.l r9, @-r4
mov.l r8, @-r4
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
rts
mov #0, r0

2
sysdeps/sh/sh4/setjmp.S
View File

@ -55,7 +55,7 @@ ENTRY (__sigsetjmp)
mov.l r9, @-r4
mov.l r8, @-r4
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
rts
mov #0, r0

7
sysdeps/unix/alpha/sysdep.h
View File

@ -349,7 +349,7 @@ __LABEL(name) \
we don't deoptimize things by placing the pointer check value there. */
#ifdef __ASSEMBLER__
# if defined NOT_IN_libc && defined IS_IN_rtld
# ifdef IS_IN_rtld
# define PTR_MANGLE(dst, src, tmp) \
ldah tmp, __pointer_chk_guard_local($29) !gprelhigh; \
ldq tmp, __pointer_chk_guard_local(tmp) !gprellow; \
@ -371,8 +371,9 @@ __LABEL(name) \
# define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp)
#else
# include <stdint.h>
# if (defined NOT_IN_libc && defined IS_IN_rtld) \
|| (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread))
# if (defined IS_IN_rtld \
|| (!defined SHARED && (!defined NOT_IN_libc \
|| defined IS_IN_libpthread)))
extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
# define PTR_MANGLE(var) \
(var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)

5
sysdeps/unix/sysv/linux/aarch64/sysdep.h
View File

@ -309,8 +309,9 @@
#endif /* __ASSEMBLER__ */
/* Pointer mangling is supported for AArch64. */
#if (defined NOT_IN_libc && defined IS_IN_rtld) || \
(!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread))
#if (defined IS_IN_rtld || \
(!defined SHARED && (!defined NOT_IN_libc \
|| defined IS_IN_libpthread)))
# ifdef __ASSEMBLER__
# define PTR_MANGLE(dst, src, guard, tmp) \
LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \

2
sysdeps/unix/sysv/linux/i386/sysdep.h
View File

@ -519,7 +519,7 @@ asm (".L__X'%ebx = 1\n\t"
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. Using a global variable
is too complicated here since we have no PC-relative addressing mode. */

2
sysdeps/unix/sysv/linux/ia64/setjmp.S
View File

@ -178,7 +178,7 @@ ENTRY(__sigsetjmp)
;;
st8.nta [r2]=r25 // ar.unat
st8.nta [r3]=in0 // &__jmp_buf
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
;;
#else

2
sysdeps/unix/sysv/linux/ia64/sysdep.h
View File

@ -364,7 +364,7 @@
#endif /* not __ASSEMBLER__ */
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else

2
sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
View File

@ -272,7 +272,7 @@
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else

2
sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
View File

@ -282,7 +282,7 @@
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else

2
sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
View File

@ -366,7 +366,7 @@
_ret; })
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else

2
sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
View File

@ -372,7 +372,7 @@
_ret; })
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else

2
sysdeps/unix/sysv/linux/sh/sysdep.h
View File

@ -338,7 +338,7 @@
#endif /* __ASSEMBLER__ */
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. Using a global variable
is too complicated here since we have no PC-relative addressing mode. */

2
sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
View File

@ -125,7 +125,7 @@ ENTRY(name); \
#endif /* __ASSEMBLER__ */
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else

2
sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
View File

@ -140,7 +140,7 @@ ENTRY(name); \
#define STACK_BIAS 2047
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else

2
sysdeps/unix/sysv/linux/tile/sysdep.h
View File

@ -205,7 +205,7 @@
#endif /* not __ASSEMBLER__ */
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
#else

2
sysdeps/unix/sysv/linux/x86_64/sysdep.h
View File

@ -393,7 +393,7 @@
/* Pointer mangling support. */
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
# ifdef __ASSEMBLER__

2
sysdeps/x86_64/setjmp.S
View File

@ -54,7 +54,7 @@ ENTRY (__sigsetjmp)
#endif
movq %rax, (JB_PC*8)(%rdi)
#if defined NOT_IN_libc && defined IS_IN_rtld
#ifdef IS_IN_rtld
/* In ld.so we never save the signal mask. */
xorl %eax, %eax
retq