bca718
commit ce9f10f7f0cc83df3e307a18e480587c3b404321
bca718
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
bca718
Date:   Thu Nov 20 14:22:40 2014 +0530
bca718
bca718
    Remove IS_IN_libpthread
bca718
    
bca718
    Replace with IS_IN (libpthread).  Generated code unchanged on
bca718
    x86_64.
bca718
    
bca718
    	* nptl/lowlevellock.c: Use IS_IN instead of IS_IN_libpthread.
bca718
    	* nptl/pthreadP.h: Likewise.
bca718
    	* nptl_db/structs.def: Likewise.
bca718
    	* sysdeps/arm/sysdep.h: Likewise.
bca718
    	* sysdeps/nptl/bits/libc-lock.h: Likewise.
bca718
    	* sysdeps/nptl/bits/libc-lockP.h: Likewise.
bca718
    	* sysdeps/sparc/sparc32/lowlevellock.c: Likewise.
bca718
    	* sysdeps/unix/alpha/sysdep.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/mips/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/not-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/tile/sysdep-cancel.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/tile/waitpid.S: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/x86_64/cancellation.S: Likewise.
bca718
    	* sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise.
bca718
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/lowlevellock.c
bca718
@@ -37,7 +37,7 @@ __lll_lock_wait_private (int *futex)
bca718
 
bca718
 
bca718
 /* These functions don't get included in libc.so  */
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 void
bca718
 __lll_lock_wait (int *futex, int private)
bca718
 {
bca718
Index: glibc-2.17-c758a686/nptl/pthreadP.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/pthreadP.h
bca718
+++ glibc-2.17-c758a686/nptl/pthreadP.h
bca718
@@ -225,7 +225,7 @@ extern int __pthread_debug attribute_hid
bca718
 
bca718
 extern void __pthread_unwind (__pthread_unwind_buf_t *__buf)
bca718
      __cleanup_fct_attribute __attribute ((__noreturn__))
bca718
-#if !defined SHARED && !defined IS_IN_libpthread
bca718
+#if !defined SHARED && !IS_IN (libpthread)
bca718
      weak_function
bca718
 #endif
bca718
      ;
bca718
@@ -239,7 +239,7 @@ extern void __pthread_register_cancel (_
bca718
      __cleanup_fct_attribute;
bca718
 extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
bca718
      __cleanup_fct_attribute;
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 hidden_proto (__pthread_unwind)
bca718
 hidden_proto (__pthread_unwind_next)
bca718
 hidden_proto (__pthread_register_cancel)
bca718
@@ -283,7 +283,7 @@ __do_cancel (void)
bca718
 # define LIBC_CANCEL_HANDLED() \
bca718
   __asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \
bca718
   __asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel")
bca718
-#elif defined IS_IN_libpthread
bca718
+#elif IS_IN (libpthread)
bca718
 # define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
bca718
 # define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
bca718
 # define LIBC_CANCEL_HANDLED() \
bca718
@@ -344,7 +344,7 @@ extern int __make_stacks_executable (voi
bca718
 
bca718
 /* longjmp handling.  */
bca718
 extern void __pthread_cleanup_upto (__jmp_buf target, char *targetframe);
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 hidden_proto (__pthread_cleanup_upto)
bca718
 #endif
bca718
 
bca718
@@ -489,7 +489,7 @@ extern int __pthread_enable_asynccancel
bca718
 extern void __pthread_disable_asynccancel (int oldtype)
bca718
      internal_function attribute_hidden;
bca718
 
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 hidden_proto (__pthread_mutex_init)
bca718
 hidden_proto (__pthread_mutex_destroy)
bca718
 hidden_proto (__pthread_mutex_lock)
bca718
@@ -528,7 +528,7 @@ extern int __librt_enable_asynccancel (v
bca718
 extern void __librt_disable_asynccancel (int oldtype)
bca718
      internal_function attribute_hidden;
bca718
 
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 /* Special versions which use non-exported functions.  */
bca718
 extern void __pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer,
bca718
 				    void (*routine) (void *), void *arg)
bca718
Index: glibc-2.17-c758a686/nptl_db/structs.def
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl_db/structs.def
bca718
+++ glibc-2.17-c758a686/nptl_db/structs.def
bca718
@@ -31,7 +31,7 @@
bca718
 #endif
bca718
 
bca718
 #ifndef DB_RTLD_GLOBAL_FIELD
bca718
-# if !defined IS_IN_libpthread
bca718
+# if !IS_IN (libpthread)
bca718
 #  define DB_RTLD_GLOBAL_FIELD(field)		\
bca718
   DB_STRUCT_FIELD (rtld_global, _##field)	\
bca718
   DB_MAIN_VARIABLE (_##field)
bca718
@@ -98,11 +98,11 @@ DB_STRUCT_ARRAY_FIELD (dtv, dtv)
bca718
 #define pointer_val pointer.val /* Field of anonymous struct in dtv_t.  */
bca718
 DB_STRUCT_FIELD (dtv_t, pointer_val)
bca718
 DB_STRUCT_FIELD (dtv_t, counter)
bca718
-#if !defined IS_IN_libpthread || TLS_TCB_AT_TP
bca718
+#if !IS_IN (libpthread) || TLS_TCB_AT_TP
bca718
 DB_STRUCT_FIELD (pthread, dtvp)
bca718
 #endif
bca718
 
bca718
-#if !(defined IS_IN_libpthread && !defined SHARED)
bca718
+#if !(IS_IN (libpthread) && !defined SHARED)
bca718
 DB_STRUCT (rtld_global)
bca718
 DB_RTLD_VARIABLE (_rtld_global)
bca718
 #endif
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/pthread/bits/libc-lock.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/pthread/bits/libc-lock.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/pthread/bits/libc-lock.h
bca718
@@ -26,7 +26,7 @@
bca718
 
bca718
 /* Mutex type.  */
bca718
 #if defined _LIBC || defined _IO_MTSAFE_IO
bca718
-# if (defined NOT_IN_libc && !defined IS_IN_libpthread) || !defined _LIBC
bca718
+# if (defined NOT_IN_libc && !IS_IN (libpthread)) || !defined _LIBC
bca718
 typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
bca718
 # else
bca718
 typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t;
bca718
@@ -47,7 +47,7 @@ typedef struct __libc_lock_recursive_opa
bca718
 
bca718
 /* Define an initialized recursive lock variable NAME with storage
bca718
    class CLASS.  */
bca718
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
bca718
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
bca718
 # if LLL_LOCK_INITIALIZER == 0
bca718
 #  define __libc_lock_define_initialized_recursive(CLASS,NAME) \
bca718
   CLASS __libc_lock_recursive_t NAME;
bca718
@@ -65,7 +65,7 @@ typedef struct __libc_lock_recursive_opa
bca718
 #endif
bca718
 
bca718
 /* Initialize a recursive mutex.  */
bca718
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
bca718
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
bca718
 # define __libc_lock_init_recursive(NAME) \
bca718
   ((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER, 0)
bca718
 #else
bca718
@@ -83,7 +83,7 @@ typedef struct __libc_lock_recursive_opa
bca718
 #endif
bca718
 
bca718
 /* Finalize recursive named lock.  */
bca718
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
bca718
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
bca718
 # define __libc_lock_fini_recursive(NAME) ((void) 0)
bca718
 #else
bca718
 # define __libc_lock_fini_recursive(NAME) \
bca718
@@ -91,7 +91,7 @@ typedef struct __libc_lock_recursive_opa
bca718
 #endif
bca718
 
bca718
 /* Lock the recursive named lock variable.  */
bca718
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
bca718
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
bca718
 # define __libc_lock_lock_recursive(NAME) \
bca718
   do {									      \
bca718
     void *self = THREAD_SELF;						      \
bca718
@@ -108,7 +108,7 @@ typedef struct __libc_lock_recursive_opa
bca718
 #endif
bca718
 
bca718
 /* Try to lock the recursive named lock variable.  */
bca718
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
bca718
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
bca718
 # define __libc_lock_trylock_recursive(NAME) \
bca718
   ({									      \
bca718
     int result = 0;							      \
bca718
@@ -133,7 +133,7 @@ typedef struct __libc_lock_recursive_opa
bca718
 #endif
bca718
 
bca718
 /* Unlock the recursive named lock variable.  */
bca718
-#if defined _LIBC && (!defined NOT_IN_libc || defined IS_IN_libpthread)
bca718
+#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread))
bca718
 /* We do no error checking here.  */
bca718
 # define __libc_lock_unlock_recursive(NAME) \
bca718
   do {									      \
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/pthread/bits/libc-lockP.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/pthread/bits/libc-lockP.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/pthread/bits/libc-lockP.h
bca718
@@ -35,7 +35,7 @@
bca718
 #include <pthread-functions.h>
bca718
 
bca718
 /* Mutex type.  */
bca718
-#if defined NOT_IN_libc && !defined IS_IN_libpthread
bca718
+#if defined NOT_IN_libc && !IS_IN (libpthread)
bca718
 typedef pthread_mutex_t __libc_lock_t;
bca718
 #else
bca718
 typedef int __libc_lock_t;
bca718
@@ -69,7 +69,7 @@ typedef pthread_key_t __libc_key_t;
bca718
    initialized locks must be set to one due to the lack of normal
bca718
    atomic operations.) */
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread)
bca718
 # if LLL_LOCK_INITIALIZER == 0
bca718
 #  define __libc_lock_define_initialized(CLASS,NAME) \
bca718
   CLASS __libc_lock_t NAME;
bca718
@@ -130,7 +130,7 @@ typedef pthread_key_t __libc_key_t;
bca718
 
bca718
 /* Initialize the named lock variable, leaving it in a consistent, unlocked
bca718
    state.  */
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread)
bca718
 # define __libc_lock_init(NAME) ((NAME) = LLL_LOCK_INITIALIZER, 0)
bca718
 #else
bca718
 # define __libc_lock_init(NAME) \
bca718
@@ -149,7 +149,7 @@ typedef pthread_key_t __libc_key_t;
bca718
 /* Finalize the named lock variable, which must be locked.  It cannot be
bca718
    used again until __libc_lock_init is called again on it.  This must be
bca718
    called on a lock variable before the containing storage is reused.  */
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread)
bca718
 # define __libc_lock_fini(NAME) ((void) 0)
bca718
 #else
bca718
 # define __libc_lock_fini(NAME) \
bca718
@@ -163,7 +163,7 @@ typedef pthread_key_t __libc_key_t;
bca718
 #endif
bca718
 
bca718
 /* Lock the named lock variable.  */
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread)
bca718
 # ifndef __libc_lock_lock
bca718
 #  define __libc_lock_lock(NAME) \
bca718
   ({ lll_lock (NAME, LLL_PRIVATE); 0; })
bca718
@@ -179,7 +179,7 @@ typedef pthread_key_t __libc_key_t;
bca718
   __libc_ptf_call (__pthread_rwlock_wrlock, (&(NAME)), 0)
bca718
 
bca718
 /* Try to lock the named lock variable.  */
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread)
bca718
 # ifndef __libc_lock_trylock
bca718
 #  define __libc_lock_trylock(NAME) \
bca718
   lll_trylock (NAME)
bca718
@@ -198,7 +198,7 @@ typedef pthread_key_t __libc_key_t;
bca718
   __libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0)
bca718
 
bca718
 /* Unlock the named lock variable.  */
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread)
bca718
 # define __libc_lock_unlock(NAME) \
bca718
   lll_unlock (NAME, LLL_PRIVATE)
bca718
 #else
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)				\
bca718
@@ -81,7 +81,7 @@ ENTRY (name);								\
bca718
 # define UNDOCARGS_5	UNDOCARGS_3; ldp x3, x4, [sp, 32]
bca718
 # define UNDOCARGS_6	UNDOCARGS_4; ldp x4, x5, [sp, 40]
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	bl __pthread_enable_asynccancel
bca718
 #  define CDISABLE	bl __pthread_disable_asynccancel
bca718
 #  define __local_multiple_threads __pthread_multiple_threads
bca718
@@ -96,7 +96,7 @@ ENTRY (name);								\
bca718
 #  error Unsupported library
bca718
 # endif
bca718
 
bca718
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
bca718
+# if IS_IN (libpthread) || !defined NOT_IN_libc
bca718
 #  ifndef __ASSEMBLER__
bca718
 extern int __local_multiple_threads attribute_hidden;
bca718
 #   define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
bca718
@@ -326,7 +326,7 @@
bca718
 /* Pointer mangling is supported for AArch64.  */
bca718
 #if (defined IS_IN_rtld) || \
bca718
      (!defined SHARED && (!defined NOT_IN_libc \
bca718
-			  || defined IS_IN_libpthread))
bca718
+			  || IS_IN (libpthread)))
bca718
 # ifdef __ASSEMBLER__
bca718
 #  define PTR_MANGLE(dst, src, guard, tmp)                                \
bca718
   LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
bca718
@@ -21,7 +21,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 /* NOTE: We do mark syscalls with unwind annotations, for the benefit of
bca718
    cancellation; but they're really only accurate at the point of the
bca718
@@ -186,7 +186,7 @@
bca718
 # define RESTORE_LR_6 \
bca718
   RESTORE_LR_0
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	bl PLTJMP(__pthread_enable_asynccancel)
bca718
 #  define CDISABLE	bl PLTJMP(__pthread_disable_asynccancel)
bca718
 #  define __local_multiple_threads __pthread_multiple_threads
bca718
@@ -201,7 +201,7 @@
bca718
 #  error Unsupported library
bca718
 # endif
bca718
 
bca718
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
bca718
+# if IS_IN (libpthread) || !defined NOT_IN_libc
bca718
 #  ifndef __ASSEMBLER__
bca718
 extern int __local_multiple_threads attribute_hidden;
bca718
 #   define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)				      \
bca718
@@ -108,7 +108,7 @@
bca718
 # define _POPCARGS_6	_POPCARGS_5; popl %ebp; \
bca718
 			cfi_adjust_cfa_offset (-4); cfi_restore (ebp);
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	call __pthread_enable_asynccancel;
bca718
 #  define CDISABLE	call __pthread_disable_asynccancel
bca718
 # elif !defined NOT_IN_libc
bca718
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/i386/sysdep.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/i386/sysdep.h
bca718
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/i386/sysdep.h
bca718
@@ -36,7 +36,7 @@
bca718
 #define SYS_ify(syscall_name)	__NR_##syscall_name
bca718
 
bca718
 #if defined USE_DL_SYSINFO \
bca718
-    && (!defined NOT_IN_libc || defined IS_IN_libpthread)
bca718
+    && (!defined NOT_IN_libc || IS_IN (libpthread))
bca718
 # define I386_USE_SYSENTER	1
bca718
 #else
bca718
 # undef I386_USE_SYSENTER
bca718
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/not-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/not-cancel.h
bca718
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/not-cancel.h
bca718
@@ -27,7 +27,7 @@
bca718
    INLINE_SYSCALL (open, 2, (const char *) (name), (flags))
bca718
 
bca718
 /* Uncancelable openat.  */
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 extern int __openat_nocancel (int fd, const char *fname, int oflag,
bca718
 			      mode_t mode) attribute_hidden;
bca718
 extern int __openat64_nocancel (int fd, const char *fname, int oflag,
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
bca718
@@ -23,7 +23,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)				\
bca718
@@ -81,7 +81,7 @@
bca718
 # define DOCARGS_6	stw 8,40(1); DOCARGS_5
bca718
 # define UNDOCARGS_6	lwz 8,40(1); UNDOCARGS_5
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	bl __pthread_enable_asynccancel@local
bca718
 #  define CDISABLE	bl __pthread_disable_asynccancel@local
bca718
 # elif !defined NOT_IN_libc
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
bca718
@@ -23,7 +23,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # ifdef HAVE_ASM_GLOBAL_DOT_NAME
bca718
 #  define DASHDASHPFX(str) .__##str
bca718
@@ -99,7 +99,7 @@
bca718
 # define DOCARGS_6	std 8,CANCEL_PARM_SAVE+40(1); DOCARGS_5
bca718
 # define UNDOCARGS_6	ld 8,CANCEL_PARM_SAVE+40(1); UNDOCARGS_5
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  ifdef SHARED
bca718
 #   define CENABLE	bl JUMPTARGET(__pthread_enable_asynccancel)
bca718
 #   define CDISABLE	bl JUMPTARGET(__pthread_disable_asynccancel)
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)				      \
bca718
@@ -75,7 +75,7 @@ L(pseudo_check):							      \
bca718
 .size	__##syscall_name##_nocancel,.-__##syscall_name##_nocancel;	      \
bca718
 L(pseudo_end):
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	__pthread_enable_asynccancel
bca718
 #  define CDISABLE	__pthread_disable_asynccancel
bca718
 # elif !defined NOT_IN_libc
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)				      \
bca718
@@ -69,7 +69,7 @@ L(pseudo_check):							      \
bca718
 .size	__##syscall_name##_nocancel,.-__##syscall_name##_nocancel;	      \
bca718
 L(pseudo_end):
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	__pthread_enable_asynccancel
bca718
 #  define CDISABLE	__pthread_disable_asynccancel
bca718
 #  define __local_multiple_threads	__pthread_multiple_threads
bca718
@@ -111,7 +111,7 @@ L(pseudo_end):
bca718
 #define LR7_6		lg %r7,56+160(%r15); \
bca718
 			cfi_restore (%r7);
bca718
 
bca718
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
bca718
+# if IS_IN (libpthread) || !defined NOT_IN_libc
bca718
 #  ifndef __ASSEMBLER__
bca718
 extern int __local_multiple_threads attribute_hidden;
bca718
 #   define SINGLE_THREAD_P \
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
bca718
@@ -21,7 +21,7 @@
bca718
 #include <kernel-features.h>
bca718
 #include "lowlevellock.h"
bca718
 
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 # ifdef SHARED
bca718
 #  define __pthread_unwind __GI___pthread_unwind
bca718
 # endif
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 /* The code to disable cancellation depends on the fact that the called
bca718
    functions are special.  They don't modify registers other than %rax
bca718
@@ -59,7 +59,7 @@
bca718
     jae SYSCALL_ERROR_LABEL
bca718
 
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	call __pthread_enable_asynccancel;
bca718
 #  define CDISABLE	call __pthread_disable_asynccancel;
bca718
 #  define __local_multiple_threads __pthread_multiple_threads
bca718
@@ -74,7 +74,7 @@
bca718
 #  error Unsupported library
bca718
 # endif
bca718
 
bca718
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
bca718
+# if IS_IN (libpthread) || !defined NOT_IN_libc
bca718
 #  ifndef __ASSEMBLER__
bca718
 extern int __local_multiple_threads attribute_hidden;
bca718
 #   define SINGLE_THREAD_P \
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/not-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/i386/not-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/not-cancel.h
bca718
@@ -19,7 +19,7 @@
bca718
 
bca718
 #include <sysdep.h>
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 extern int __open_nocancel (const char *, int, ...) attribute_hidden;
bca718
 extern int __close_nocancel (int) attribute_hidden;
bca718
 extern int __read_nocancel (int, void *, size_t) attribute_hidden;
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.c
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.c
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.c
bca718
@@ -35,7 +35,7 @@ __lll_lock_wait_private (int *futex)
bca718
 
bca718
 
bca718
 /* These functions don't get included in libc.so  */
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 void
bca718
 __lll_lock_wait (int *futex, int private)
bca718
 {
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
bca718
@@ -21,7 +21,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # define _IMM12 #-12
bca718
 # define _IMM16 #-16
bca718
@@ -105,7 +105,7 @@
bca718
 # define LOAD_ARGS_5	LOAD_ARGS_4
bca718
 # define LOAD_ARGS_6	LOAD_ARGS_5
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define __local_enable_asynccancel	__pthread_enable_asynccancel
bca718
 #  define __local_disable_asynccancel	__pthread_disable_asynccancel
bca718
 # elif !defined NOT_IN_libc
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/lowlevellock.c
bca718
@@ -37,7 +37,7 @@ __lll_lock_wait_private (int *futex)
bca718
 
bca718
 
bca718
 /* These functions don't get included in libc.so  */
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 void
bca718
 __lll_lock_wait (int *futex, int private)
bca718
 {
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)	\
bca718
@@ -68,7 +68,7 @@ __##syscall_name##_nocancel:			\
bca718
 	 restore %g0, %l1, %o0;
bca718
 
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	call __pthread_enable_asynccancel
bca718
 #  define CDISABLE	call __pthread_disable_asynccancel
bca718
 # elif !defined NOT_IN_libc
bca718
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)	\
bca718
@@ -66,7 +66,7 @@ __##syscall_name##_nocancel:			\
bca718
 2:	jmpl %i7 + 8, %g0;			\
bca718
 	 restore %g0, %l1, %o0;
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	call __pthread_enable_asynccancel
bca718
 #  define CDISABLE	call __pthread_disable_asynccancel
bca718
 # elif !defined NOT_IN_libc
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/alpha/nptl/sysdep-cancel.h
bca718
@@ -21,7 +21,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 /* ??? Assumes that nothing comes between PSEUDO and PSEUDO_END
bca718
    besides "ret".  */
bca718
@@ -105,7 +105,7 @@ __LABEL($multi_error)						\
bca718
 # define LOAD_ARGS_5	LOAD_ARGS_4; ldq a4, 40(sp)
bca718
 # define LOAD_ARGS_6	LOAD_ARGS_5; ldq a5, 48(sp)
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define __local_enable_asynccancel	__pthread_enable_asynccancel
bca718
 #  define __local_disable_asynccancel	__pthread_disable_asynccancel
bca718
 #  define __local_multiple_threads	__pthread_multiple_threads
bca718
@@ -128,7 +128,7 @@ __LABEL($multi_error)						\
bca718
 #  define CDISABLE	jsr ra, __local_disable_asynccancel; ldgp ra, 0(gp)
bca718
 # endif
bca718
 
bca718
-# if defined IS_IN_libpthread || !defined NOT_IN_libc
bca718
+# if IS_IN (libpthread) || !defined NOT_IN_libc
bca718
 #  ifndef __ASSEMBLER__
bca718
 extern int __local_multiple_threads attribute_hidden;
bca718
 #   define SINGLE_THREAD_P \
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/am33/linuxthreads/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/am33/linuxthreads/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/am33/linuxthreads/sysdep-cancel.h
bca718
@@ -23,7 +23,7 @@
bca718
 # include <linuxthreads/internals.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)				\
bca718
@@ -79,7 +79,7 @@
bca718
 # define LOAD_ARGS_5	LOAD_ARGS_4
bca718
 # define LOAD_ARGS_6	LOAD_ARGS_5
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	call __pthread_enable_asynccancel,[],0;
bca718
 #  define CDISABLE	call __pthread_disable_asynccancel,[],0;
bca718
 # elif IS_IN (librt)
bca718
@@ -105,7 +105,7 @@
bca718
 
bca718
 #if !defined NOT_IN_libc
bca718
 # define __local_multiple_threads __libc_multiple_threads
bca718
-#elif defined IS_IN_libpthread
bca718
+#elif IS_IN (libpthread)
bca718
 # define __local_multiple_threads __pthread_multiple_threads
bca718
 #else
bca718
 # define __local_multiple_threads __librt_multiple_threads
bca718
@@ -118,7 +118,7 @@
bca718
 				   p_header.data.multiple_threads) == 0, 1)
bca718
 #  else
bca718
 extern int __local_multiple_threads
bca718
-#   if !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#   if !defined NOT_IN_libc || IS_IN (libpthread)
bca718
   attribute_hidden;
bca718
 #   else
bca718
   ;
bca718
@@ -130,7 +130,7 @@ extern int __local_multiple_threads
bca718
 #   define SINGLE_THREAD_P \
bca718
 	mov (+__local_multiple_threads),d0; \
bca718
 	cmp 0,d0
bca718
-#  elif !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#  elif !defined NOT_IN_libc || IS_IN (libpthread)
bca718
 #   define SINGLE_THREAD_P \
bca718
 	movm [a2],(sp); \
bca718
      1: mov pc,a2; \
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c
bca718
@@ -85,7 +85,7 @@ __lll_timedlock_wait (lll_lock_t *futex,
bca718
 
bca718
 
bca718
 /* These don't get included in libc.so  */
bca718
-#ifdef IS_IN_libpthread
bca718
+#if IS_IN (libpthread)
bca718
 int
bca718
 lll_unlock_wake_cb (lll_lock_t *futex)
bca718
 {
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # ifndef NO_ERROR
bca718
 #  define NO_ERROR -0x1000
bca718
@@ -204,7 +204,7 @@ L(pre_end):						ASM_LINE_SEP	\
bca718
 # define POPARGS_6	POPARGS_5 ldw -56(%sr0,%sp), %r21	ASM_LINE_SEP	\
bca718
 			.cfi_restore 21				ASM_LINE_SEP
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  ifdef PIC
bca718
 #   define CENABLE .import __pthread_enable_asynccancel,code ASM_LINE_SEP \
bca718
 			bl __pthread_enable_asynccancel,%r2 ASM_LINE_SEP
bca718
@@ -244,7 +244,7 @@ L(pre_end):						ASM_LINE_SEP	\
bca718
 #  error Unsupported library
bca718
 # endif
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define __local_multiple_threads __pthread_multiple_threads
bca718
 # elif !defined NOT_IN_libc
bca718
 #  define __local_multiple_threads __libc_multiple_threads
bca718
@@ -271,7 +271,7 @@ L(pre_end):						ASM_LINE_SEP	\
bca718
 # define NO_CANCELLATION 1
bca718
 
bca718
 #endif
bca718
-/* !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt) */
bca718
+/* !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) */
bca718
 
bca718
 #ifndef __ASSEMBLER__
bca718
 # define RTLD_SINGLE_THREAD_P \
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 
bca718
@@ -160,7 +160,7 @@ __GC_##name:								      \
bca718
 # undef PSEUDO_END
bca718
 # define PSEUDO_END(name) .endp
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	br.call.sptk.many b0 = __pthread_enable_asynccancel
bca718
 #  define CDISABLE	br.call.sptk.many b0 = __pthread_disable_asynccancel
bca718
 # elif !defined NOT_IN_libc
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # undef PSEUDO
bca718
 # define PSEUDO(name, syscall_name, args)				      \
bca718
@@ -100,7 +100,7 @@
bca718
 #  define PSEUDO_JMP(sym) jbsr sym
bca718
 # endif
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	PSEUDO_JMP (__pthread_enable_asynccancel)
bca718
 #  define CDISABLE	PSEUDO_JMP (__pthread_disable_asynccancel)
bca718
 # elif !defined NOT_IN_libc
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
bca718
@@ -27,7 +27,7 @@
bca718
    happen before any instructions.  So we use cfi_same_value instead of
bca718
    cfi_restore.  */
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 #ifdef __PIC__
bca718
 # undef PSEUDO
bca718
@@ -146,7 +146,7 @@
bca718
 # define SAVESTK 	PTR_SUBU sp, STKSPACE; cfi_adjust_cfa_offset(STKSPACE)
bca718
 # define RESTORESTK 	PTR_ADDU sp, STKSPACE; cfi_adjust_cfa_offset(-STKSPACE)
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	PTR_LA t9, __pthread_enable_asynccancel; jalr t9
bca718
 #  define CDISABLE	PTR_LA t9, __pthread_disable_asynccancel; jalr t9
bca718
 # elif IS_IN (librt)
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/nptl/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 # ifdef __PIC__
bca718
 #  define PSEUDO_CPLOAD .cpload t9;
bca718
@@ -152,7 +152,7 @@
bca718
 #  define PSEUDO_JMP(sym) jal sym;
bca718
 # endif
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	PSEUDO_JMP (__pthread_enable_asynccancel)
bca718
 #  define CDISABLE	PSEUDO_JMP (__pthread_disable_asynccancel)
bca718
 # elif IS_IN (librt)
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/nptl/sysdep-cancel.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/tile/nptl/sysdep-cancel.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/nptl/sysdep-cancel.h
bca718
@@ -22,7 +22,7 @@
bca718
 # include <nptl/pthreadP.h>
bca718
 #endif
bca718
 
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 /* Allow hacking in some extra code if desired. */
bca718
 #ifndef PSEUDO_EXTRA
bca718
@@ -117,7 +117,7 @@
bca718
 
bca718
 # define STKSPACE	(13 * REGSIZE)
bca718
 
bca718
-# ifdef IS_IN_libpthread
bca718
+# if IS_IN (libpthread)
bca718
 #  define CENABLE	jal __pthread_enable_asynccancel
bca718
 #  define CDISABLE	jal __pthread_disable_asynccancel
bca718
 # elif IS_IN (librt)
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/nptl/waitpid.S
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/tile/nptl/waitpid.S
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/nptl/waitpid.S
bca718
@@ -1,7 +1,7 @@
bca718
 /*
bca718
 extern pid_t __waitpid_nocancel (pid_t, int *, int) attribute_hidden;
bca718
 */
bca718
-#if !defined NOT_IN_libc || defined IS_IN_libpthread || IS_IN (librt)
bca718
+#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt)
bca718
 
bca718
 /* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */
bca718
 #define PSEUDO_EXTRA move r3, zero;
bca718
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
bca718
===================================================================
bca718
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
bca718
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
bca718
@@ -45,7 +45,7 @@
bca718
 #ifndef PIC
bca718
 /* For static code, on error jump to __syscall_error directly. */
bca718
 # define SYSCALL_ERROR_NAME __syscall_error
bca718
-#elif !defined NOT_IN_libc || defined IS_IN_libpthread
bca718
+#elif !defined NOT_IN_libc || IS_IN (libpthread)
bca718
 /* Use the internal name for libc/libpthread shared objects. */
bca718
 # define SYSCALL_ERROR_NAME __GI___syscall_error
bca718
 #else