aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-20 14:22:40 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-11-24 11:41:46 +0530
commitce9f10f7f0cc83df3e307a18e480587c3b404321 (patch)
tree5928110640fc4f478949efc01ad50b97de4266e0 /sysdeps
parent016afc75cd45dfaf49c0aa7a9befda77ab933846 (diff)
downloadglibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.zip
glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.tar.gz
glibc-ce9f10f7f0cc83df3e307a18e480587c3b404321.tar.bz2
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 'sysdeps')
-rw-r--r--sysdeps/arm/sysdep.h2
-rw-r--r--sysdeps/nptl/bits/libc-lock.h14
-rw-r--r--sysdeps/nptl/bits/libc-lockP.h14
-rw-r--r--sysdeps/sparc/sparc32/lowlevellock.c2
-rw-r--r--sysdeps/unix/alpha/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h6
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h6
-rw-r--r--sysdeps/unix/sysv/linux/arm/sysdep-cancel.h6
-rw-r--r--sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h8
-rw-r--r--sysdeps/unix/sysv/linux/i386/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/i386/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/ia64/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h6
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/mips/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/not-cancel.h2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h6
-rw-r--r--sysdeps/unix/sysv/linux/sh/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/tile/sysdep-cancel.h4
-rw-r--r--sysdeps/unix/sysv/linux/tile/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/tile/waitpid.S2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/cancellation.S2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h6
31 files changed, 70 insertions, 70 deletions
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index 9225293..9299be2 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -344,7 +344,7 @@
/* Pointer mangling support. */
#if (defined IS_IN_rtld || \
- (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread)))
+ (!defined SHARED && (!defined NOT_IN_libc || IS_IN (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE_LOAD(guard, tmp) \
LDR_HIDDEN (guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local), 0)
diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h
index 66e5b93..2acc6bf 100644
--- a/sysdeps/nptl/bits/libc-lock.h
+++ b/sysdeps/nptl/bits/libc-lock.h
@@ -26,7 +26,7 @@
/* Mutex type. */
#if defined _LIBC || defined _IO_MTSAFE_IO
-# if (defined NOT_IN_libc && !defined IS_IN_libpthread) || !defined _LIBC
+# if (defined NOT_IN_libc && !IS_IN (libpthread)) || !defined _LIBC
typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
# else
typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t;
@@ -47,7 +47,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
/* Define an initialized recursive lock variable NAME with storage
class CLASS. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
# define __libc_lock_define_initialized_recursive(CLASS, NAME) \
CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
# define _LIBC_LOCK_RECURSIVE_INITIALIZER \
@@ -60,7 +60,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Initialize a recursive mutex. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
# define __libc_lock_init_recursive(NAME) \
((void) ((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER))
#else
@@ -78,7 +78,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Finalize recursive named lock. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
# define __libc_lock_fini_recursive(NAME) ((void) 0)
#else
# define __libc_lock_fini_recursive(NAME) \
@@ -86,7 +86,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Lock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
# define __libc_lock_lock_recursive(NAME) \
do { \
void *self = THREAD_SELF; \
@@ -103,7 +103,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Try to lock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
# define __libc_lock_trylock_recursive(NAME) \
({ \
int result = 0; \
@@ -128,7 +128,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
#endif
/* Unlock the recursive named lock variable. */
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
/* We do no error checking here. */
# define __libc_lock_unlock_recursive(NAME) \
do { \
diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h
index 5351a51..ae17507 100644
--- a/sysdeps/nptl/bits/libc-lockP.h
+++ b/sysdeps/nptl/bits/libc-lockP.h
@@ -35,7 +35,7 @@
#include <pthread-functions.h>
/* Mutex type. */
-#if defined NOT_IN_libc && !defined IS_IN_libpthread
+#if defined NOT_IN_libc && !IS_IN (libpthread)
typedef pthread_mutex_t __libc_lock_t;
#else
typedef int __libc_lock_t;
@@ -69,7 +69,7 @@ typedef pthread_key_t __libc_key_t;
initialized locks must be set to one due to the lack of normal
atomic operations.) */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# if LLL_LOCK_INITIALIZER == 0
# define __libc_lock_define_initialized(CLASS,NAME) \
CLASS __libc_lock_t NAME;
@@ -125,7 +125,7 @@ typedef pthread_key_t __libc_key_t;
/* Initialize the named lock variable, leaving it in a consistent, unlocked
state. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# define __libc_lock_init(NAME) \
((void) ((NAME) = LLL_LOCK_INITIALIZER))
#else
@@ -144,7 +144,7 @@ typedef pthread_key_t __libc_key_t;
/* Finalize the named lock variable, which must be locked. It cannot be
used again until __libc_lock_init is called again on it. This must be
called on a lock variable before the containing storage is reused. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# define __libc_lock_fini(NAME) ((void) 0)
#else
# define __libc_lock_fini(NAME) \
@@ -158,7 +158,7 @@ typedef pthread_key_t __libc_key_t;
#endif
/* Lock the named lock variable. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# ifndef __libc_lock_lock
# define __libc_lock_lock(NAME) \
({ lll_lock (NAME, LLL_PRIVATE); 0; })
@@ -174,7 +174,7 @@ typedef pthread_key_t __libc_key_t;
__libc_ptf_call (__pthread_rwlock_wrlock, (&(NAME)), 0)
/* Try to lock the named lock variable. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# ifndef __libc_lock_trylock
# define __libc_lock_trylock(NAME) \
lll_trylock (NAME)
@@ -193,7 +193,7 @@ typedef pthread_key_t __libc_key_t;
__libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
/* Unlock the named lock variable. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || IS_IN (libpthread)
# define __libc_lock_unlock(NAME) \
lll_unlock (NAME, LLL_PRIVATE)
#else
diff --git a/sysdeps/sparc/sparc32/lowlevellock.c b/sysdeps/sparc/sparc32/lowlevellock.c
index 8384281..78cfad9 100644
--- a/sysdeps/sparc/sparc32/lowlevellock.c
+++ b/sysdeps/sparc/sparc32/lowlevellock.c
@@ -37,7 +37,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/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index 17dad91..68b06e1 100644
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -373,7 +373,7 @@ __LABEL(name) \
# include <stdint.h>
# if (defined IS_IN_rtld \
|| (!defined SHARED && (!defined NOT_IN_libc \
- || defined IS_IN_libpthread)))
+ || 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)
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
index 9e347de..f2f8009 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -81,7 +81,7 @@ ENTRY (name); \
# define UNDOCARGS_5 UNDOCARGS_3; ldp x3, x4, [sp, 32]
# define UNDOCARGS_6 UNDOCARGS_4; ldp x4, x5, [sp, 40]
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE bl __pthread_enable_asynccancel
# define CDISABLE bl __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
@@ -96,7 +96,7 @@ ENTRY (name); \
# error Unsupported library
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 84999f1..84bec80 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
@@ -311,7 +311,7 @@
/* Pointer mangling is supported for AArch64. */
#if (defined IS_IN_rtld || \
(!defined SHARED && (!defined NOT_IN_libc \
- || defined IS_IN_libpthread)))
+ || IS_IN (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE(dst, src, guard, tmp) \
LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \
diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
index 45bf93b..5479556 100644
--- a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
/* ??? Assumes that nothing comes between PSEUDO and PSEUDO_END
besides "ret". */
@@ -113,7 +113,7 @@ __LABEL($multi_error) \
# define LOAD_ARGS_5 LOAD_ARGS_4; ldq a4, 40(sp)
# define LOAD_ARGS_6 LOAD_ARGS_5; ldq a5, 48(sp)
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define __local_enable_asynccancel __pthread_enable_asynccancel
# define __local_disable_asynccancel __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
@@ -136,7 +136,7 @@ __LABEL($multi_error) \
# define CDISABLE jsr ra, __local_disable_asynccancel; ldgp ra, 0(gp)
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
index e5a8e36..9211d04 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
/* NOTE: We do mark syscalls with unwind annotations, for the benefit of
cancellation; but they're really only accurate at the point of the
@@ -181,7 +181,7 @@
# define RESTORE_LR_6 \
RESTORE_LR_0
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE bl PLTJMP(__pthread_enable_asynccancel)
# define CDISABLE bl PLTJMP(__pthread_disable_asynccancel)
# define __local_multiple_threads __pthread_multiple_threads
@@ -196,7 +196,7 @@
# error Unsupported library
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h
index 365237e..5d4ff34 100644
--- a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# ifndef NO_ERROR
# define NO_ERROR -0x1000
@@ -204,7 +204,7 @@ L(pre_end): ASM_LINE_SEP \
# define POPARGS_6 POPARGS_5 ldw -56(%sr0,%sp), %r21 ASM_LINE_SEP \
.cfi_restore 21 ASM_LINE_SEP
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# ifdef PIC
# define CENABLE .import __pthread_enable_asynccancel,code ASM_LINE_SEP \
bl __pthread_enable_asynccancel,%r2 ASM_LINE_SEP
@@ -244,7 +244,7 @@ L(pre_end): ASM_LINE_SEP \
# error Unsupported library
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define __local_multiple_threads __pthread_multiple_threads
# elif !defined NOT_IN_libc
# define __local_multiple_threads __libc_multiple_threads
@@ -271,7 +271,7 @@ L(pre_end): ASM_LINE_SEP \
# define NO_CANCELLATION 1
#endif
-/* !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) */
+/* !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) */
#ifndef __ASSEMBLER__
# define RTLD_SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index 75fe2e6..c17ff6c 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -108,7 +108,7 @@
# define _POPCARGS_6 _POPCARGS_5; popl %ebp; \
cfi_adjust_cfa_offset (-4); cfi_restore (ebp);
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 57d5ea0..0282761 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -34,7 +34,7 @@
#define SYS_ify(syscall_name) __NR_##syscall_name
#if defined USE_DL_SYSINFO \
- && (!defined NOT_IN_libc || defined IS_IN_libpthread)
+ && (!defined NOT_IN_libc || IS_IN (libpthread))
# define I386_USE_SYSENTER 1
#else
# undef I386_USE_SYSENTER
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
index 366728f..0458fce 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
@@ -179,7 +179,7 @@ __GC_##name: \
# undef PSEUDO_END
# define PSEUDO_END(name) .endp
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE br.call.sptk.many b0 = __pthread_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 49d289c..47fd577 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -62,7 +62,7 @@
#if defined USE_DL_SYSINFO \
&& (!defined NOT_IN_libc \
- || defined IS_IN_libpthread || IS_IN (librt))
+ || IS_IN (libpthread) || IS_IN (librt))
# define IA64_USE_NEW_STUB
#else
# undef IA64_USE_NEW_STUB
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
index 0e19a38..33ce922 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -100,7 +100,7 @@
# define PSEUDO_JMP(sym) jbsr sym
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
index 4d371ef..0fe5b12 100644
--- a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# if !IS_IN (librt) || !defined(PIC)
# define AC_STACK_SIZE 16 /* space for r15, async_cancel arg and 2 temp words */
@@ -102,7 +102,7 @@ L(pseudo_cancel): \
# define PSEUDO_JMP(sym) brlid r15, sym; addk r0, r0, r0
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# define __local_multiple_threads __pthread_multiple_threads
@@ -118,7 +118,7 @@ L(pseudo_cancel): \
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
index acbc5da..6f79b14 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h
@@ -27,7 +27,7 @@
happen before any instructions. So we use cfi_same_value instead of
cfi_restore. */
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
#ifdef __PIC__
# undef PSEUDO
@@ -213,7 +213,7 @@
# define PSEUDO_JMP(sym) jal sym
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# elif IS_IN (librt)
diff --git a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
index 5fdd567..1d711f7 100644
--- a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# ifdef __PIC__
# define PSEUDO_CPLOAD .cpload t9;
@@ -154,7 +154,7 @@
# define PSEUDO_JMP(sym) jal sym;
# endif
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel)
# define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel)
# elif IS_IN (librt)
diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index d089531..1d65f20 100644
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -19,7 +19,7 @@
#include <sysdep.h>
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
extern int __open_nocancel (const char *, int, ...) attribute_hidden;
extern int __close_nocancel (int) attribute_hidden;
extern int __read_nocancel (int, void *, size_t) attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
index 962beaf..25bf797 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
@@ -23,7 +23,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -81,7 +81,7 @@
# define DOCARGS_6 stw 8,40(1); DOCARGS_5
# define UNDOCARGS_6 lwz 8,40(1); UNDOCARGS_5
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE bl __pthread_enable_asynccancel@local
# define CDISABLE bl __pthread_disable_asynccancel@local
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
index 0447062..8683b6b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
@@ -23,7 +23,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# ifdef HAVE_ASM_GLOBAL_DOT_NAME
# define DASHDASHPFX(str) .__##str
@@ -99,7 +99,7 @@
# define DOCARGS_6 std 8,CANCEL_PARM_SAVE+40(1); DOCARGS_5
# define UNDOCARGS_6 ld 8,CANCEL_PARM_SAVE+40(1); UNDOCARGS_5
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# ifdef SHARED
# define CENABLE bl JUMPTARGET(__pthread_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__pthread_disable_asynccancel)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
index bc5d852..d19500d 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -75,7 +75,7 @@ L(pseudo_check): \
.size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \
L(pseudo_end):
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE __pthread_enable_asynccancel
# define CDISABLE __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
index 885bf7e..9622d5a 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -69,7 +69,7 @@ L(pseudo_check): \
.size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \
L(pseudo_end):
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE __pthread_enable_asynccancel
# define CDISABLE __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
@@ -111,7 +111,7 @@ L(pseudo_end):
#define LR7_6 lg %r7,56+160(%r15); \
cfi_restore (%r7);
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
diff --git a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
index 4ef51c0..131f42b 100644
--- a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
@@ -21,7 +21,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# define _IMM12 #-12
# define _IMM16 #-16
@@ -105,7 +105,7 @@
# define LOAD_ARGS_5 LOAD_ARGS_4
# define LOAD_ARGS_6 LOAD_ARGS_5
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define __local_enable_asynccancel __pthread_enable_asynccancel
# define __local_disable_asynccancel __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
index 2e24d2a..cc7adfc 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -68,7 +68,7 @@ __##syscall_name##_nocancel: \
restore %g0, %l1, %o0;
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE call __pthread_enable_asynccancel
# define CDISABLE call __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
index 0ae3b61..aee3dee 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -66,7 +66,7 @@ __##syscall_name##_nocancel: \
2: jmpl %i7 + 8, %g0; \
restore %g0, %l1, %o0;
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE call __pthread_enable_asynccancel
# define CDISABLE call __pthread_disable_asynccancel
# elif !defined NOT_IN_libc
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
index 8140273..028c393 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
/* Allow hacking in some extra code if desired. */
#ifndef PSEUDO_EXTRA
@@ -117,7 +117,7 @@
# define STKSPACE (13 * REGSIZE)
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE jal __pthread_enable_asynccancel
# define CDISABLE jal __pthread_disable_asynccancel
# elif IS_IN (librt)
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index 238b266..d03a74b 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -45,7 +45,7 @@
#ifndef PIC
/* For static code, on error jump to __syscall_error directly. */
# define SYSCALL_ERROR_NAME __syscall_error
-#elif !defined NOT_IN_libc || defined IS_IN_libpthread
+#elif !defined NOT_IN_libc || IS_IN (libpthread)
/* Use the internal name for libc/libpthread shared objects. */
# define SYSCALL_ERROR_NAME __GI___syscall_error
#else
diff --git a/sysdeps/unix/sysv/linux/tile/waitpid.S b/sysdeps/unix/sysv/linux/tile/waitpid.S
index 7ccdf25..7fa1cca 100644
--- a/sysdeps/unix/sysv/linux/tile/waitpid.S
+++ b/sysdeps/unix/sysv/linux/tile/waitpid.S
@@ -1,7 +1,7 @@
/*
extern pid_t __waitpid_nocancel (pid_t, int *, int) attribute_hidden;
*/
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
/* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */
#define PSEUDO_EXTRA move r3, zero;
diff --git a/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
index 89fda5e..5189bbc 100644
--- a/sysdeps/unix/sysv/linux/x86_64/cancellation.S
+++ b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
@@ -21,7 +21,7 @@
#include <kernel-features.h>
#include "lowlevellock.h"
-#ifdef IS_IN_libpthread
+#if IS_IN (libpthread)
# if defined SHARED && !defined NO_HIDDEN
# define __pthread_unwind __GI___pthread_unwind
# endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
index efdb1c6..2667292 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
@@ -22,7 +22,7 @@
# include <nptl/pthreadP.h>
#endif
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
/* The code to disable cancellation depends on the fact that the called
functions are special. They don't modify registers other than %rax
@@ -59,7 +59,7 @@
jae SYSCALL_ERROR_LABEL
-# ifdef IS_IN_libpthread
+# if IS_IN (libpthread)
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel;
# define __local_multiple_threads __pthread_multiple_threads
@@ -74,7 +74,7 @@
# error Unsupported library
# endif
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
+# if IS_IN (libpthread) || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \