ce426f
commit a38484851aa244e1d5c48405f0e26fe93fa8d3b5
ce426f
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
ce426f
Date:   Thu Nov 20 21:09:43 2014 +0530
ce426f
ce426f
    Remove IS_IN_rtld
ce426f
    
ce426f
    Replace with IS_IN (rtld).  Generated code is unchanged on
ce426f
    x86_64.
ce426f
    
ce426f
            * elf/Makefile (CPPFLAGS-.os): Remove IS_IN_rtld.
ce426f
            * elf/dl-open.c: Use IS_IN (rtld) instead if IS_IN_rtld.
ce426f
            * elf/rtld-Rules: Likewise.
ce426f
            * elf/setup-vdso.h: Likewise.
ce426f
            * include/assert.h: Likewise.
ce426f
            * include/bits/stdlib-float.h: Likewise.
ce426f
            * include/errno.h: Likewise.
ce426f
            * include/sys/stat.h: Likewise.
ce426f
            * include/unistd.h: Likewise.
ce426f
            * sysdeps/aarch64/setjmp.S: Likewise.
ce426f
            * sysdeps/alpha/setjmp.S: Likewise.
ce426f
            * sysdeps/arm/__longjmp.S: Likewise.
ce426f
            * sysdeps/arm/aeabi_unwind_cpp_pr1.c: Likewise.
ce426f
            * sysdeps/arm/setjmp.S: Likewise.
ce426f
            * sysdeps/arm/sysdep.h: Likewise.
ce426f
            * sysdeps/generic/_itoa.h: Likewise.
ce426f
            * sysdeps/generic/dl-sysdep.h: Likewise.
ce426f
            * sysdeps/generic/ldsodefs.h: Likewise.
ce426f
            * sysdeps/i386/dl-tls.h: Likewise.
ce426f
            * sysdeps/i386/setjmp.S: Likewise.
ce426f
            * sysdeps/m68k/setjmp.c: Likewise.
ce426f
            * sysdeps/mach/hurd/dl-execstack.c: Likewise.
ce426f
            * sysdeps/mach/hurd/opendir.c: Likewise.
ce426f
            * sysdeps/posix/getcwd.c: Likewise.
ce426f
            * sysdeps/posix/opendir.c: Likewise.
ce426f
            * sysdeps/posix/profil.c: Likewise.
ce426f
            * sysdeps/powerpc/dl-procinfo.h: Likewise.
ce426f
            * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: Likewise.
ce426f
            * sysdeps/powerpc/powerpc32/fpu/setjmp-common.S: Likewise.
ce426f
            * sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h: Likewise.
ce426f
            * sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise.
ce426f
            * sysdeps/powerpc/powerpc64/__longjmp-common.S: Likewise.
ce426f
            * sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.
ce426f
            * sysdeps/s390/dl-tls.h: Likewise.
ce426f
            * sysdeps/s390/s390-32/setjmp.S: Likewise.
ce426f
            * sysdeps/s390/s390-64/setjmp.S: Likewise.
ce426f
            * sysdeps/sh/sh3/setjmp.S: Likewise.
ce426f
            * sysdeps/sh/sh4/setjmp.S: Likewise.
ce426f
            * sysdeps/unix/alpha/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/arm/sysdep.S: Likewise.
ce426f
            * sysdeps/unix/i386/sysdep.S: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/getcwd.c: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/lowlevellock-futex.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/m68k/m68k-helpers.S: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/microblaze/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/sh/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/tile/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise.
ce426f
            * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
ce426f
            * sysdeps/unix/x86_64/sysdep.S: Likewise.
ce426f
            * sysdeps/x86_64/setjmp.S: Likewise.
ce426f
ce426f
Index: glibc-2.17-c758a686/elf/Makefile
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/elf/Makefile
ce426f
+++ glibc-2.17-c758a686/elf/Makefile
ce426f
@@ -444,7 +444,7 @@ CFLAGS-cache.c = $(SYSCONF-FLAGS)
ce426f
 CFLAGS-rtld.c = $(SYSCONF-FLAGS)
ce426f
 
ce426f
 CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
ce426f
-		     -DNOT_IN_libc=1 -DIS_IN_rtld=1)
ce426f
+		     -DNOT_IN_libc=1)
ce426f
 
ce426f
 # Disable any optimization which might result in function calls during early
ce426f
 # dynamic loader startup. We disable -ftree-loop-distribute-patterns which
ce426f
Index: glibc-2.17-c758a686/elf/dl-open.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/elf/dl-open.c
ce426f
+++ glibc-2.17-c758a686/elf/dl-open.c
ce426f
@@ -741,7 +741,7 @@ _dl_show_scope (struct link_map *l, int
ce426f
   _dl_debug_printf ("\n");
ce426f
 }
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* Return non-zero if ADDR lies within one of L's segments.  */
ce426f
 int
ce426f
 internal_function
ce426f
Index: glibc-2.17-c758a686/elf/rtld-Rules
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/elf/rtld-Rules
ce426f
+++ glibc-2.17-c758a686/elf/rtld-Rules
ce426f
@@ -134,6 +134,6 @@ lib := rtld
ce426f
 include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
ce426f
 
ce426f
 # This here is the whole point of all the shenanigans.
ce426f
-rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1
ce426f
+rtld-CPPFLAGS := -DNOT_IN_libc=1
ce426f
 
ce426f
 endif
ce426f
Index: glibc-2.17-c758a686/elf/setup-vdso.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/elf/setup-vdso.h
ce426f
+++ glibc-2.17-c758a686/elf/setup-vdso.h
ce426f
@@ -101,7 +101,7 @@ setup_vdso (struct link_map *main_map __
ce426f
       /* Add the vDSO to the object list.  */
ce426f
       _dl_add_to_namespace_list (l, LM_ID_BASE);
ce426f
 
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
       /* Rearrange the list so this DSO appears after rtld_map.  */
ce426f
       assert (l->l_next == NULL);
ce426f
       assert (l->l_prev == main_map);
ce426f
Index: glibc-2.17-c758a686/include/assert.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/include/assert.h
ce426f
+++ glibc-2.17-c758a686/include/assert.h
ce426f
@@ -20,7 +20,7 @@ extern void __assert_fail_base (const ch
ce426f
 				const char *function)
ce426f
      __THROW  __attribute__ ((__noreturn__));
ce426f
 
ce426f
-# if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+# if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 hidden_proto (__assert_fail)
ce426f
 hidden_proto (__assert_perror_fail)
ce426f
 # endif
ce426f
Index: glibc-2.17-c758a686/include/bits/stdlib-float.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/include/bits/stdlib-float.h
ce426f
+++ glibc-2.17-c758a686/include/bits/stdlib-float.h
ce426f
@@ -1,4 +1,4 @@
ce426f
 /* No floating-point inline functions in rtld.  */
ce426f
-#ifndef IS_IN_rtld
ce426f
+#if !IS_IN (rtld)
ce426f
 # include <stdlib/bits/stdlib-float.h>
ce426f
 #endif
ce426f
Index: glibc-2.17-c758a686/include/errno.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/include/errno.h
ce426f
+++ glibc-2.17-c758a686/include/errno.h
ce426f
@@ -4,7 +4,7 @@
ce426f
 
ce426f
 #if defined _ERRNO_H && !defined _ISOMAC && !defined __cplusplus
ce426f
 
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 #  include <dl-sysdep.h>
ce426f
 # endif
ce426f
 
ce426f
Index: glibc-2.17-c758a686/include/sys/stat.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/include/sys/stat.h
ce426f
+++ glibc-2.17-c758a686/include/sys/stat.h
ce426f
@@ -12,7 +12,7 @@ extern __mode_t __umask (__mode_t __mask
ce426f
 extern int __mkdir (const char *__path, __mode_t __mode);
ce426f
 extern int __mknod (const char *__path,
ce426f
 		    __mode_t __mode, __dev_t __dev);
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 hidden_proto (__fxstat)
ce426f
 hidden_proto (__fxstat64)
ce426f
 hidden_proto (__lxstat)
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/aarch64/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/aarch64/setjmp.S
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/aarch64/setjmp.S
ce426f
@@ -58,7 +58,7 @@ ENTRY (__sigsetjmp)
ce426f
 	mov	x2,  sp
ce426f
 	str	x2,  [x0, #JB_SP<<3]
ce426f
 #endif
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask */
ce426f
 	mov	w0, #0
ce426f
 	RET
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/alpha/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/alpha/setjmp.S
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/alpha/setjmp.S
ce426f
@@ -86,7 +86,7 @@ $sigsetjmp_local:
ce426f
 	ldq	ra, 0(sp)
ce426f
 	addq	sp, 16, sp
ce426f
 	ret
ce426f
-#elif defined IS_IN_rtld
ce426f
+#elif IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask.  */
ce426f
 	mov	0, v0
ce426f
 	ret
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/arm/__longjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/arm/__longjmp.S
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/arm/__longjmp.S
ce426f
@@ -52,7 +52,7 @@ ENTRY (__longjmp)
ce426f
 #endif
ce426f
 
ce426f
 #ifdef NEED_HWCAP
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 	ldr	a2, 1f
ce426f
 	ldr	a3, .Lrtld_local_ro
ce426f
 0:	add	a2, pc, a2
ce426f
@@ -104,7 +104,7 @@ ENTRY (__longjmp)
ce426f
 	DO_RET(lr)
ce426f
 
ce426f
 #ifdef NEED_HWCAP
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 1:	.long	_GLOBAL_OFFSET_TABLE_ - 0b - 8
ce426f
 .Lrtld_local_ro:
ce426f
 	.long	C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/arm/aeabi_unwind_cpp_pr1.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/arm/aeabi_unwind_cpp_pr1.c
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/arm/aeabi_unwind_cpp_pr1.c
ce426f
@@ -27,7 +27,7 @@ attribute_hidden
ce426f
 void
ce426f
 __aeabi_unwind_cpp_pr0 (void)
ce426f
 {
ce426f
-#ifndef IS_IN_rtld
ce426f
+#if !IS_IN (rtld)
ce426f
   abort ();
ce426f
 #endif
ce426f
 }
ce426f
@@ -36,7 +36,7 @@ attribute_hidden
ce426f
 void
ce426f
 __aeabi_unwind_cpp_pr1 (void)
ce426f
 {
ce426f
-#ifndef IS_IN_rtld
ce426f
+#if !IS_IN (rtld)
ce426f
   abort ();
ce426f
 #endif
ce426f
 }
ce426f
@@ -45,7 +45,7 @@ attribute_hidden
ce426f
 void
ce426f
 __aeabi_unwind_cpp_pr2 (void)
ce426f
 {
ce426f
-#ifndef IS_IN_rtld
ce426f
+#if !IS_IN (rtld)
ce426f
   abort ();
ce426f
 #endif
ce426f
 }
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/arm/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/arm/setjmp.S
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/arm/setjmp.S
ce426f
@@ -35,7 +35,7 @@ ENTRY (__sigsetjmp)
ce426f
 
ce426f
 #ifdef NEED_HWCAP
ce426f
 	/* Check if we have a VFP unit.  */
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 	ldr	a3, 1f
ce426f
 	ldr	a4, .Lrtld_local_ro
ce426f
 0:	add	a3, pc, a3
ce426f
@@ -90,7 +90,7 @@ ENTRY (__sigsetjmp)
ce426f
 	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
ce426f
 
ce426f
 #ifdef NEED_HWCAP
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 1:	.long	_GLOBAL_OFFSET_TABLE_ - 0b - 8
ce426f
 .Lrtld_local_ro:
ce426f
 	.long	C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
ce426f
Index: glibc-2.17-c758a686/sysdeps/generic/_itoa.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/generic/_itoa.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/generic/_itoa.h
ce426f
@@ -46,7 +46,7 @@ extern char *_itoa (unsigned long long i
ce426f
 
ce426f
 extern const char _itoa_upper_digits[];
ce426f
 extern const char _itoa_lower_digits[];
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 hidden_proto (_itoa_upper_digits)
ce426f
 hidden_proto (_itoa_lower_digits)
ce426f
 #endif
ce426f
Index: glibc-2.17-c758a686/sysdeps/generic/dl-sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/generic/dl-sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/generic/dl-sysdep.h
ce426f
@@ -27,7 +27,7 @@
ce426f
    all the libc functions that ld.so uses are called without PLT and always
ce426f
    get the versions linked into ld.so rather than the libc ones.  */
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # define RTLD_PRIVATE_ERRNO 1
ce426f
 #else
ce426f
 # define RTLD_PRIVATE_ERRNO 0
ce426f
Index: glibc-2.17-c758a686/sysdeps/generic/ldsodefs.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/generic/ldsodefs.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/generic/ldsodefs.h
ce426f
@@ -246,7 +246,7 @@ typedef void (*receiver_fct) (int, const
ce426f
 # define GL(name) _##name
ce426f
 #else
ce426f
 # define EXTERN
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 #  define GL(name) _rtld_local._##name
ce426f
 # else
ce426f
 #  define GL(name) _rtld_global._##name
ce426f
@@ -415,7 +415,7 @@ struct rtld_global
ce426f
 #ifdef SHARED
ce426f
 };
ce426f
 # define __rtld_global_attribute__
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 #  ifdef HAVE_SDATA_SECTION
ce426f
 #   define __rtld_local_attribute__ \
ce426f
 	    __attribute__ ((visibility ("hidden"), section (".sdata")))
ce426f
@@ -434,7 +434,7 @@ extern struct rtld_global _rtld_global _
ce426f
 #ifndef SHARED
ce426f
 # define GLRO(name) _##name
ce426f
 #else
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 #  define GLRO(name) _rtld_local_ro._##name
ce426f
 # else
ce426f
 #  define GLRO(name) _rtld_global_ro._##name
ce426f
@@ -593,7 +593,7 @@ struct rtld_global_ro
ce426f
   EXTERN int _dl_pointer_guard;
ce426f
 };
ce426f
 # define __rtld_global_attribute__
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 #  define __rtld_local_attribute__ __attribute__ ((visibility ("hidden")))
ce426f
 extern struct rtld_global_ro _rtld_local_ro
ce426f
     attribute_relro __rtld_local_attribute__;
ce426f
@@ -610,7 +610,7 @@ extern const struct rtld_global_ro _rtld
ce426f
 #endif
ce426f
 #undef EXTERN
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* This is the initial value of GL(dl_error_catch_tsd).
ce426f
    A non-TLS libpthread will change it.  */
ce426f
 extern void **_dl_initial_error_catch_tsd (void) __attribute__ ((const))
ce426f
@@ -641,7 +641,7 @@ extern char **_dl_argv
ce426f
      attribute_relro
ce426f
 #endif
ce426f
      ;
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 extern char **_dl_argv_internal attribute_hidden
ce426f
 # ifndef DL_ARGV_NOT_RELRO
ce426f
      attribute_relro
ce426f
@@ -655,7 +655,7 @@ extern char **_dl_argv_internal attribut
ce426f
 /* Flag set at startup and cleared when the last initializer has run.  */
ce426f
 extern int _dl_starting_up;
ce426f
 weak_extern (_dl_starting_up)
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 extern int _dl_starting_up_internal attribute_hidden;
ce426f
 #endif
ce426f
 
ce426f
Index: glibc-2.17-c758a686/sysdeps/i386/dl-tls.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/i386/dl-tls.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/i386/dl-tls.h
ce426f
@@ -32,7 +32,7 @@ extern void *___tls_get_addr (tls_index
ce426f
 extern void *___tls_get_addr_internal (tls_index *ti)
ce426f
      __attribute__ ((__regparm__ (1))) attribute_hidden;
ce426f
 
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 /* The special thing about the x86 TLS ABI is that we have two
ce426f
    variants of the __tls_get_addr function with different calling
ce426f
    conventions.  The GNU version, which we are mostly concerned here,
ce426f
Index: glibc-2.17-c758a686/sysdeps/i386/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/i386/setjmp.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/i386/setjmp.S
ce426f
@@ -51,7 +51,7 @@ ENTRY (BP_SYM (__sigsetjmp))
ce426f
 	LEAVE /* pop frame pointer to prepare for tail-call.  */
ce426f
 	movl %ebp, (JB_BP*4)(%eax) /* Save caller's frame pointer.  */
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask.  */
ce426f
 	xorl %eax, %eax
ce426f
 	ret
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/m68k/setjmp.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/m68k/setjmp.c
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/m68k/setjmp.c
ce426f
@@ -57,7 +57,7 @@ __sigsetjmp (jmp_buf env, int savemask)
ce426f
 		: : "m" (env[0].__jmpbuf[0].__fpregs[0]));
ce426f
 #endif
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
   /* In ld.so we never save the signal mask.  */
ce426f
   return 0;
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/sysdeps/mach/hurd/dl-execstack.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/mach/hurd/dl-execstack.c
ce426f
+++ glibc-2.17-c758a686/sysdeps/mach/hurd/dl-execstack.c
ce426f
@@ -34,7 +34,7 @@ _dl_make_stack_executable (void **stack_
ce426f
     return EPERM;
ce426f
   *stack_endp = NULL;
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
   if (__mprotect ((void *)_dl_hurd_data->stack_base, _dl_hurd_data->stack_size,
ce426f
 		  PROT_READ|PROT_WRITE|PROT_EXEC) != 0)
ce426f
     return errno;
ce426f
Index: glibc-2.17-c758a686/sysdeps/mach/hurd/opendir.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/mach/hurd/opendir.c
ce426f
+++ glibc-2.17-c758a686/sysdeps/mach/hurd/opendir.c
ce426f
@@ -82,7 +82,7 @@ __opendirat (int dfd, const char *name)
ce426f
 
ce426f
   int flags = O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC;
ce426f
   int fd;
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
   assert (dfd == AT_FDCWD);
ce426f
   fd = open_not_cancel_2 (name, flags);
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/sysdeps/posix/getcwd.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/posix/getcwd.c
ce426f
+++ glibc-2.17-c758a686/sysdeps/posix/getcwd.c
ce426f
@@ -206,7 +206,7 @@ extern char *alloca ();
ce426f
 
ce426f
 #ifdef __ASSUME_ATFCTS
ce426f
 # define __have_atfcts 1
ce426f
-#elif defined IS_IN_rtld
ce426f
+#elif IS_IN (rtld)
ce426f
 static int __rtld_have_atfcts;
ce426f
 # define __have_atfcts __rtld_have_atfcts
ce426f
 #endif
ce426f
Index: glibc-2.17-c758a686/sysdeps/posix/opendir.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/posix/opendir.c
ce426f
+++ glibc-2.17-c758a686/sysdeps/posix/opendir.c
ce426f
@@ -121,7 +121,7 @@ __opendirat (int dfd, const char *name)
ce426f
   flags |= O_CLOEXEC;
ce426f
 #endif
ce426f
   int fd;
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
   assert (dfd == AT_FDCWD);
ce426f
   fd = open_not_cancel_2 (name, flags);
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/sysdeps/posix/profil.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/posix/profil.c
ce426f
+++ glibc-2.17-c758a686/sysdeps/posix/profil.c
ce426f
@@ -65,7 +65,7 @@ __profil (u_short *sample_buffer, size_t
ce426f
 {
ce426f
   struct sigaction act;
ce426f
   struct itimerval timer;
ce426f
-#ifndef IS_IN_rtld
ce426f
+#if !IS_IN (rtld)
ce426f
   static struct sigaction oact;
ce426f
   static struct itimerval otimer;
ce426f
 # define oact_ptr &oact
ce426f
Index: glibc-2.17-c758a686/sysdeps/powerpc/dl-procinfo.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/dl-procinfo.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/dl-procinfo.h
ce426f
@@ -166,7 +166,7 @@ _dl_string_platform (const char *str)
ce426f
   return -1;
ce426f
 }
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 static inline int
ce426f
 __attribute__ ((unused))
ce426f
 _dl_procinfo (unsigned int type, unsigned long int word)
ce426f
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
ce426f
@@ -37,7 +37,7 @@ ENTRY (BP_SYM (__longjmp))
ce426f
 	addis	r5,r5,_GLOBAL_OFFSET_TABLE_-got_label@ha
ce426f
 	addi	r5,r5,_GLOBAL_OFFSET_TABLE_-got_label@l
ce426f
 #  ifdef SHARED
ce426f
-#   ifdef IS_IN_rtld
ce426f
+#   if IS_IN (rtld)
ce426f
 	/* Inside ld.so we use the local alias to avoid runtime GOT
ce426f
 	   relocations.  */
ce426f
 	lwz     r5,_rtld_local_ro@got(r5)
ce426f
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/fpu/setjmp-common.S
ce426f
@@ -90,7 +90,7 @@ ENTRY (BP_SYM (__sigsetjmp))
ce426f
 	mtlr	r6
ce426f
 	cfi_same_value (lr)
ce426f
 #  ifdef SHARED
ce426f
-#   ifdef IS_IN_rtld
ce426f
+#   if IS_IN (rtld)
ce426f
 	/* Inside ld.so we use the local alias to avoid runtime GOT
ce426f
 	   relocations.  */
ce426f
 	lwz     r5,_rtld_local_ro@got(r5)
ce426f
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h
ce426f
@@ -21,7 +21,7 @@
ce426f
    the dl_hwcap field. The assembly is to make the compiler not optimize the
ce426f
    test (&_rtld_global_ro != NULL), which is always true in ISO C (but not
ce426f
    in that case since _rtld_global_ro might not been realocated yet).  */
ce426f
-#if defined(SHARED) && !defined(IS_IN_rtld)
ce426f
+#if defined(SHARED) && !IS_IN (rtld)
ce426f
 # define __GLRO(value) \
ce426f
   ({ volatile void **__p = (volatile void**)(&_rtld_global_ro);	\
ce426f
     unsigned long int __ret;					\
ce426f
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp-common.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/setjmp-common.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/setjmp-common.S
ce426f
@@ -64,7 +64,7 @@ ENTRY (BP_SYM (__sigsetjmp))
ce426f
 	stw  r29,((JB_GPRS+15)*4)(3)
ce426f
 	stw  r30,((JB_GPRS+16)*4)(3)
ce426f
 	stw  r31,((JB_GPRS+17)*4)(3)
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	li   r3,0
ce426f
 	blr
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc64/__longjmp-common.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/__longjmp-common.S
ce426f
@@ -31,7 +31,7 @@
ce426f
 	.section	".toc","aw"
ce426f
 .LC__dl_hwcap:
ce426f
 # ifdef SHARED
ce426f
-#  ifdef IS_IN_rtld
ce426f
+#  if IS_IN (rtld)
ce426f
 	/* Inside ld.so we use the local alias to avoid runtime GOT
ce426f
 	   relocations.  */
ce426f
 	.tc _rtld_local_ro[TC],_rtld_local_ro
ce426f
@@ -132,7 +132,7 @@ L(no_vmx):
ce426f
 	ld r0,(JB_LR*8)(r3)
ce426f
 	ld r14,((JB_GPRS+0)*8)(r3)
ce426f
 	lfd fp14,((JB_FPRS+0)*8)(r3)
ce426f
-#if defined SHARED && !defined IS_IN_rtld
ce426f
+#if defined SHARED && !IS_IN (rtld)
ce426f
 	std r2,FRAME_TOC_SAVE(r1)	/* Restore the callers TOC save area.  */
ce426f
 #endif
ce426f
 	ld r15,((JB_GPRS+1)*8)(r3)
ce426f
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc64/setjmp-common.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/setjmp-common.S
ce426f
@@ -30,7 +30,7 @@
ce426f
 	.section	".toc","aw"
ce426f
 .LC__dl_hwcap:
ce426f
 # ifdef SHARED
ce426f
-#  ifdef IS_IN_rtld
ce426f
+#  if IS_IN (rtld)
ce426f
 	/* Inside ld.so we use the local alias to avoid runtime GOT
ce426f
 	   relocations.  */
ce426f
 	.tc _rtld_local_ro[TC],_rtld_local_ro
ce426f
@@ -50,7 +50,7 @@ ENTRY (setjmp)
ce426f
 	b JUMPTARGET (GLUE(__sigsetjmp,_ent))
ce426f
 END (setjmp)
ce426f
 
ce426f
-#if defined SHARED && !defined IS_IN_rtld && !defined __NO_VMX__
ce426f
+#if defined SHARED && !IS_IN (rtld) && !defined __NO_VMX__
ce426f
 /* When called from within libc we need a special version of _setjmp
ce426f
    that saves r2 since the call won't go via a plt call stub.  See
ce426f
    bugz #269.  __GI__setjmp is used in csu/libc-start.c when
ce426f
@@ -82,7 +82,7 @@ JUMPTARGET(GLUE(__sigsetjmp,_ent)):
ce426f
 	std  r1,(JB_GPR1*8)(3)
ce426f
 #endif
ce426f
 	mflr r0
ce426f
-#if defined SHARED && !defined IS_IN_rtld
ce426f
+#if defined SHARED && !IS_IN (rtld)
ce426f
 	ld   r5,FRAME_TOC_SAVE(r1)	/* Retrieve the callers TOC.  */
ce426f
 	std  r5,(JB_GPR2*8)(3)
ce426f
 #else
ce426f
@@ -212,7 +212,7 @@ L(no_vmx):
ce426f
 #else
ce426f
 	li	r6,0
ce426f
 #endif
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	li	r3,0
ce426f
 	blr
ce426f
 #elif defined SHARED
ce426f
Index: glibc-2.17-c758a686/sysdeps/s390/dl-tls.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/s390/dl-tls.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/s390/dl-tls.h
ce426f
@@ -29,7 +29,7 @@ typedef struct
ce426f
 
ce426f
 extern unsigned long __tls_get_offset (unsigned long got_offset);
ce426f
 
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 
ce426f
 #  include <shlib-compat.h>
ce426f
 
ce426f
@@ -78,9 +78,9 @@ __tls_get_offset:\n\
ce426f
 1:	.long	__tls_get_addr - 0b\n\
ce426f
 ");
ce426f
 #  endif
ce426f
-# else /* IS_IN_rtld */
ce426f
+# else /* IS_IN (rtld) */
ce426f
 extern void *__tls_get_addr_internal (tls_index *ti);
ce426f
-# endif /* !IS_IN_rtld */
ce426f
+# endif /* !IS_IN (rtld) */
ce426f
 
ce426f
 # define GET_ADDR_OFFSET \
ce426f
   (ti->ti_offset - (unsigned long) __builtin_thread_pointer ())
ce426f
Index: glibc-2.17-c758a686/sysdeps/s390/s390-32/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/s390/s390-32/setjmp.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/s390/s390-32/setjmp.S
ce426f
@@ -57,7 +57,7 @@ ENTRY(__sigsetjmp)
ce426f
 #endif
ce426f
 	std    %f4,40(%r2)
ce426f
 	std    %f6,48(%r2)
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask.  */
ce426f
 	lhi    %r2,0
ce426f
 	br     %r14
ce426f
Index: glibc-2.17-c758a686/sysdeps/s390/s390-64/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/s390/s390-64/setjmp.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/s390/s390-64/setjmp.S
ce426f
@@ -63,7 +63,7 @@ ENTRY(__sigsetjmp)
ce426f
 	std    %f13,120(%r2)
ce426f
 	std    %f14,128(%r2)
ce426f
 	std    %f15,136(%r2)
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask.  */
ce426f
 	lghi   %r2,0
ce426f
 	br     %r14
ce426f
Index: glibc-2.17-c758a686/sysdeps/sh/sh3/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/sh/sh3/setjmp.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/sh/sh3/setjmp.S
ce426f
@@ -46,7 +46,7 @@ ENTRY (__sigsetjmp)
ce426f
 	mov.l	r9, @-r4
ce426f
 	mov.l	r8, @-r4
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask.  */
ce426f
 	rts
ce426f
 	 mov	#0, r0
ce426f
Index: glibc-2.17-c758a686/sysdeps/sh/sh4/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/sh/sh4/setjmp.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/sh/sh4/setjmp.S
ce426f
@@ -55,7 +55,7 @@ ENTRY (__sigsetjmp)
ce426f
 	mov.l	r9, @-r4
ce426f
 	mov.l	r8, @-r4
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask.  */
ce426f
 	rts
ce426f
 	 mov	#0, r0
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/alpha/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/alpha/sysdep.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/alpha/sysdep.h
ce426f
@@ -26,7 +26,7 @@
ce426f
 # include <regdef.h>
ce426f
 #endif
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # include <dl-sysdep.h>         /* Defines RTLD_PRIVATE_ERRNO.  */
ce426f
 #endif
ce426f
 
ce426f
@@ -346,7 +346,7 @@ __LABEL(name)						\
ce426f
 
ce426f
 #include <stdint.h>
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # ifdef __ASSEMBLER__
ce426f
 #  define PTR_MANGLE(dst, src, tmp)				\
ce426f
 	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/arm/sysdep.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/arm/sysdep.S
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/arm/sysdep.S
ce426f
@@ -21,7 +21,7 @@
ce426f
 #define _ERRNO_H
ce426f
 #include <bits/errno.h>
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # include <dl-sysdep.h>			/* Defines RTLD_PRIVATE_ERRNO.  */
ce426f
 #endif
ce426f
 
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/i386/sysdep.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/i386/sysdep.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/i386/sysdep.S
ce426f
@@ -22,7 +22,7 @@
ce426f
 #include <bp-asm.h>
ce426f
 #include <bp-sym.h>
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # include <dl-sysdep.h>		/* Defines RTLD_PRIVATE_ERRNO.  */
ce426f
 #endif
ce426f
 
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/sysdep.h
ce426f
@@ -324,7 +324,7 @@
ce426f
 #endif	/* __ASSEMBLER__ */
ce426f
 
ce426f
 /* Pointer mangling is supported for AArch64.  */
ce426f
-#if (defined IS_IN_rtld) || \
ce426f
+#if (IS_IN (rtld)) || \
ce426f
      (!defined SHARED && (!defined NOT_IN_libc \
ce426f
 			  || IS_IN (libpthread)))
ce426f
 # ifdef __ASSEMBLER__
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/getcwd.c
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/getcwd.c
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/getcwd.c
ce426f
@@ -33,7 +33,7 @@
ce426f
 
ce426f
 /* If we compile the file for use in ld.so we don't need the feature
ce426f
    that getcwd() allocates the buffers itself.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # define NO_ALLOCATION	1
ce426f
 #endif
ce426f
 
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
ce426f
@@ -56,7 +56,7 @@
ce426f
 /* Initialize locks to zero.  */
ce426f
 #define LLL_MUTEX_LOCK_INITIALIZER (0)
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
ce426f
@@ -71,7 +71,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/i386/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/i386/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/i386/sysdep.h
ce426f
@@ -521,7 +521,7 @@ asm (".L__X'%ebx = 1\n\t"
ce426f
 
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  Using a global variable
ce426f
    is too complicated here since we have no PC-relative addressing mode.  */
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/lowlevellock.h
ce426f
@@ -50,7 +50,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
ce426f
@@ -179,7 +179,7 @@ ENTRY(__sigsetjmp)
ce426f
 	;;
ce426f
 	st8.nta [r2]=r25		// ar.unat
ce426f
 	st8.nta [r3]=in0		// &__jmp_buf
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask.  */
ce426f
 	;;
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/sysdep.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/sysdep.h
ce426f
@@ -361,7 +361,7 @@
ce426f
 #endif /* not __ASSEMBLER__ */
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h
ce426f
@@ -23,7 +23,7 @@
ce426f
 
ce426f
 #ifdef SHARED
ce426f
 
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 # define M68K_VDSO_SYMBOL(name) __rtld_##name
ce426f
 # define STR_M68K_VDSO_SYMBOL(name) "__rtld_" #name
ce426f
 # else
ce426f
@@ -35,7 +35,7 @@
ce426f
 
ce426f
 /* We define __rtld_* copies for rtld.
ce426f
    We need them visible in libc to initialize.  */
ce426f
-#  if defined IS_IN_rtld || !defined NOT_IN_libc
ce426f
+#  if IS_IN (rtld) || !defined NOT_IN_libc
ce426f
 extern void *__rtld___vdso_read_tp;
ce426f
 extern void *__rtld___vdso_atomic_cmpxchg_32;
ce426f
 extern void *__rtld___vdso_atomic_barrier;
ce426f
@@ -44,14 +44,14 @@ extern void *__rtld___vdso_atomic_barrie
ce426f
 extern void __vdso_read_tp_stub (void);
ce426f
 extern void __vdso_atomic_cmpxchg_32_stub (void);
ce426f
 extern void __vdso_atomic_barrier_stub (void);
ce426f
-#  endif /* IS_IN_rtld || !NOT_IN_libc */
ce426f
+#  endif /* IS_IN (rtld) || !NOT_IN_libc */
ce426f
 
ce426f
 /* RTLD should only use its own copies.  */
ce426f
-#  ifndef IS_IN_rtld
ce426f
+#  if !IS_IN (rtld)
ce426f
 extern void *__vdso_read_tp;
ce426f
 extern void *__vdso_atomic_cmpxchg_32;
ce426f
 extern void *__vdso_atomic_barrier;
ce426f
-#  endif /* !IS_IN_rtld */
ce426f
+#  endif /* !IS_IN (rtld) */
ce426f
 
ce426f
 # endif /* !__ASSEMBLER__ */
ce426f
 
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/m68k-helpers.S
ce426f
@@ -51,7 +51,7 @@ END (__vdso_read_tp_stub)
ce426f
    equivalent helper function (which clobbers fewer registers than
ce426f
    a normal function call) in a vdso; tail call to the
ce426f
    helper.  */
ce426f
-# ifdef IS_IN_rtld
ce426f
+# if IS_IN (rtld)
ce426f
 /* rtld gets a hidden copy of __m68k_read_tp.  */
ce426f
 	.hidden __m68k_read_tp
ce426f
 # endif
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
ce426f
@@ -272,7 +272,7 @@
ce426f
 
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
ce426f
@@ -282,7 +282,7 @@
ce426f
 
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h
ce426f
@@ -51,7 +51,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
ce426f
@@ -367,7 +367,7 @@
ce426f
     _ret; })
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
ce426f
@@ -373,7 +373,7 @@
ce426f
     _ret; })
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
ce426f
@@ -50,7 +50,7 @@
ce426f
 #define LLL_SHARED     FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sh/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/sh/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sh/sysdep.h
ce426f
@@ -338,7 +338,7 @@
ce426f
 #endif	/* __ASSEMBLER__ */
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  Using a global variable
ce426f
    is too complicated here since we have no PC-relative addressing mode.  */
ce426f
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
ce426f
@@ -56,7 +56,7 @@ extern void __cpu_relax (void);
ce426f
 #define BUSY_WAIT_NOP	__cpu_relax ()
ce426f
 #endif
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
ce426f
@@ -22,7 +22,7 @@
ce426f
 
ce426f
 #include <sysdeps/unix/sysv/linux/sparc/sysdep.h>
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # include <dl-sysdep.h>		/* Defines RTLD_PRIVATE_ERRNO.  */
ce426f
 #endif
ce426f
 #include <tls.h>
ce426f
@@ -126,7 +126,7 @@ ENTRY(name);					\
ce426f
 #endif	/* __ASSEMBLER__ */
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
ce426f
@@ -22,7 +22,7 @@
ce426f
 
ce426f
 #include <sysdeps/unix/sysv/linux/sparc/sysdep.h>
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # include <dl-sysdep.h>		/* Defines RTLD_PRIVATE_ERRNO.  */
ce426f
 #endif
ce426f
 #include <tls.h>
ce426f
@@ -141,7 +141,7 @@ ENTRY(name);					\
ce426f
 #define STACK_BIAS	2047
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/sysdep.h
ce426f
@@ -205,7 +205,7 @@
ce426f
 #endif /* not __ASSEMBLER__ */
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#if defined NOT_IN_libc && defined IS_IN_rtld
ce426f
+#if defined NOT_IN_libc && IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 #else
ce426f
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
ce426f
@@ -72,7 +72,7 @@
ce426f
 
ce426f
 #ifndef __ASSEMBLER__
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/sysv/linux/x86_64/sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/sysv/linux/x86_64/sysdep.h
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/x86_64/sysdep.h
ce426f
@@ -24,7 +24,7 @@
ce426f
 #include <bp-asm.h>
ce426f
 #include <tls.h>
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # include <dl-sysdep.h>		/* Defines RTLD_PRIVATE_ERRNO.  */
ce426f
 #endif
ce426f
 
ce426f
@@ -395,7 +395,7 @@
ce426f
 
ce426f
 
ce426f
 /* Pointer mangling support.  */
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* We cannot use the thread descriptor because in ld.so we use setjmp
ce426f
    earlier than the descriptor is initialized.  */
ce426f
 # ifdef __ASSEMBLER__
ce426f
Index: glibc-2.17-c758a686/sysdeps/unix/x86_64/sysdep.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/unix/x86_64/sysdep.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/unix/x86_64/sysdep.S
ce426f
@@ -22,7 +22,7 @@
ce426f
 #include <bp-sym.h>
ce426f
 #include <tls.h>
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # include <dl-sysdep.h>		/* Defines RTLD_PRIVATE_ERRNO.  */
ce426f
 #endif
ce426f
 
ce426f
Index: glibc-2.17-c758a686/sysdeps/x86_64/setjmp.S
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/sysdeps/x86_64/setjmp.S
ce426f
+++ glibc-2.17-c758a686/sysdeps/x86_64/setjmp.S
ce426f
@@ -54,7 +54,7 @@ ENTRY (__sigsetjmp)
ce426f
 #endif
ce426f
 	movq %rax, (JB_PC*8)(%rdi)
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 	/* In ld.so we never save the signal mask.  */
ce426f
 	xorl %eax, %eax
ce426f
 	retq
ce426f
Index: glibc-2.17-c758a686/include/unistd.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/include/unistd.h
ce426f
+++ glibc-2.17-c758a686/include/unistd.h
ce426f
@@ -151,7 +151,7 @@ libc_hidden_proto (__sbrk)
ce426f
    environment variables that normally affect them.  */
ce426f
 extern int __libc_enable_secure attribute_relro;
ce426f
 extern int __libc_enable_secure_decided;
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 /* XXX The #ifdef should go.  */
ce426f
 extern int __libc_enable_secure_internal attribute_relro attribute_hidden;
ce426f
 #endif
ce426f
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
ce426f
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
ce426f
@@ -27,7 +27,7 @@
ce426f
    all the libc functions that ld.so uses are called without PLT and always
ce426f
    get the versions linked into ld.so rather than the libc ones.  */
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # define RTLD_PRIVATE_ERRNO 1
ce426f
 #else
ce426f
 # define RTLD_PRIVATE_ERRNO 0
ce426f
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
ce426f
@@ -52,7 +52,7 @@
ce426f
 #define LLL_PRIVATE	0
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h
ce426f
@@ -49,7 +49,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/alpha/nptl/lowlevellock.h
ce426f
@@ -50,7 +50,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
ce426f
@@ -48,7 +48,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
ce426f
@@ -27,7 +27,7 @@
ce426f
    all the libc functions that ld.so uses are called without PLT and always
ce426f
    get the versions linked into ld.so rather than the libc ones.  */
ce426f
 
ce426f
-#ifdef IS_IN_rtld
ce426f
+#if IS_IN (rtld)
ce426f
 # define RTLD_PRIVATE_ERRNO 1
ce426f
 #else
ce426f
 # define RTLD_PRIVATE_ERRNO 0
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/m68k/nptl/lowlevellock.h
ce426f
@@ -50,7 +50,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h
ce426f
@@ -48,7 +48,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \
ce426f
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
ce426f
===================================================================
ce426f
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
ce426f
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/tile/nptl/lowlevellock.h
ce426f
@@ -50,7 +50,7 @@
ce426f
 #define LLL_SHARED	FUTEX_PRIVATE_FLAG
ce426f
 
ce426f
 
ce426f
-#if !defined NOT_IN_libc || defined IS_IN_rtld
ce426f
+#if !defined NOT_IN_libc || IS_IN (rtld)
ce426f
 /* In libc.so or ld.so all futexes are private.  */
ce426f
 # ifdef __ASSUME_PRIVATE_FUTEX
ce426f
 #  define __lll_private_flag(fl, private) \