diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-20 14:22:40 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-11-24 11:41:46 +0530 |
| commit | ce9f10f7f0cc83df3e307a18e480587c3b404321 (patch) | |
| tree | 5928110640fc4f478949efc01ad50b97de4266e0 /nptl | |
| parent | 016afc75cd45dfaf49c0aa7a9befda77ab933846 (diff) | |
| download | glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.tar glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.tar.gz glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.tar.bz2 glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.zip | |
Remove IS_IN_libpthread
Replace with IS_IN (libpthread). Generated code unchanged on
x86_64.
* nptl/lowlevellock.c: Use IS_IN instead of IS_IN_libpthread.
* nptl/pthreadP.h: Likewise.
* nptl_db/structs.def: Likewise.
* sysdeps/arm/sysdep.h: Likewise.
* sysdeps/nptl/bits/libc-lock.h: Likewise.
* sysdeps/nptl/bits/libc-lockP.h: Likewise.
* sysdeps/sparc/sparc32/lowlevellock.c: Likewise.
* sysdeps/unix/alpha/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/mips/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/not-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/tile/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/tile/waitpid.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/cancellation.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/lowlevellock.c | 2 | ||||
| -rw-r--r-- | nptl/pthreadP.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nptl/lowlevellock.c b/nptl/lowlevellock.c index e198af7e8d..4c093fcb01 100644 --- a/nptl/lowlevellock.c +++ b/nptl/lowlevellock.c @@ -35,7 +35,7 @@ __lll_lock_wait_private (int *futex) /* These functions don't get included in libc.so */ -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) void __lll_lock_wait (int *futex, int private) { diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 376dbff316..318505635f 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -244,7 +244,7 @@ extern int __pthread_debug attribute_hidden; extern void __pthread_unwind (__pthread_unwind_buf_t *__buf) __cleanup_fct_attribute __attribute ((__noreturn__)) -#if !defined SHARED && !defined IS_IN_libpthread +#if !defined SHARED && !IS_IN (libpthread) weak_function #endif ; @@ -258,7 +258,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; -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) hidden_proto (__pthread_unwind) hidden_proto (__pthread_unwind_next) hidden_proto (__pthread_register_cancel) @@ -302,7 +302,7 @@ __do_cancel (void) # define LIBC_CANCEL_HANDLED() \ __asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \ __asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel") -#elif defined IS_IN_libpthread +#elif IS_IN (libpthread) # define LIBC_CANCEL_ASYNC() CANCEL_ASYNC () # define LIBC_CANCEL_RESET(val) CANCEL_RESET (val) # define LIBC_CANCEL_HANDLED() \ @@ -347,7 +347,7 @@ extern int __make_stacks_executable (void **stack_endp) /* longjmp handling. */ extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe); -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) hidden_proto (__pthread_cleanup_upto) #endif @@ -492,7 +492,7 @@ extern int __pthread_enable_asynccancel (void) attribute_hidden; extern void __pthread_disable_asynccancel (int oldtype) internal_function attribute_hidden; -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) hidden_proto (__pthread_mutex_init) hidden_proto (__pthread_mutex_destroy) hidden_proto (__pthread_mutex_lock) @@ -531,7 +531,7 @@ extern int __librt_enable_asynccancel (void) attribute_hidden; extern void __librt_disable_asynccancel (int oldtype) internal_function attribute_hidden; -#ifdef IS_IN_libpthread +#if IS_IN (libpthread) /* Special versions which use non-exported functions. */ extern void __pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer, void (*routine) (void *), void *arg) |