mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Remove unnecessary uses of NOT_IN_libc
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:
@ -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)
|
||||
|
Reference in New Issue
Block a user