From patchwork Thu Aug 21 10:57:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 2503 Received: (qmail 29196 invoked by alias); 21 Aug 2014 11:52:25 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 29185 invoked by uid 89); 21 Aug 2014 11:52:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_50, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: Siddhesh Poyarekar Subject: [PATCH 18/19] Define new macro NOT_IN Date: Thu, 21 Aug 2014 16:27:42 +0530 Message-Id: <1408618663-2281-19-git-send-email-siddhesh@redhat.com> In-Reply-To: <1408618663-2281-1-git-send-email-siddhesh@redhat.com> References: <1408618663-2281-1-git-send-email-siddhesh@redhat.com> Define a simple macro which is a negation of IS_IN to make the macro conditions a bit more readable. * include/libc-symbols.h (NOT_IN): New macro. * include/bits/stdlib-float.h: Use it. * intl/l10nflist.c: Likewise. * nptl/pthreadP.h: Likewise. * nptl_db/structs.def: Likewise. * sysdeps/arm/aeabi_unwind_cpp_pr1.c: Likewise. * sysdeps/arm/memmove.S: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_isinfl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_isnanl.c: Likewise. * sysdeps/ieee754/ldbl-64-128/s_isinfl.c: Likewise. * sysdeps/ieee754/ldbl-64-128/s_isnanl.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_isinf.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_isnan.c: Likewise. * sysdeps/nptl/bits/libc-lock.h: Likewise. * sysdeps/nptl/bits/libc-lockP.h: Likewise. * sysdeps/posix/profil.c: Likewise. * sysdeps/powerpc/powerpc32/__longjmp.S: Likewise. * sysdeps/powerpc/powerpc32/bsd-_setjmp.S: Likewise. * sysdeps/powerpc/powerpc32/fpu/__longjmp.S: Likewise. * sysdeps/powerpc/powerpc32/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc32/fpu/setjmp.S: Likewise. * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c: Likewise. * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c: Likewise. * sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h: Likewise. * sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc32/power6/memset.S: Likewise. * sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S: Likewise. * sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc32/setjmp.S: Likewise. * sysdeps/powerpc/powerpc64/__longjmp-common.S: Likewise. * sysdeps/powerpc/powerpc64/__longjmp.S: Likewise. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c: Likewise. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c: Likewise. * sysdeps/powerpc/powerpc64/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S: Likewise. * sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S: Likewise. * sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S: Likewise. * sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise. * sysdeps/powerpc/powerpc64/setjmp.S: Likewise. * sysdeps/s390/dl-tls.h: Likewise. * sysdeps/s390/s390-32/multiarch/memcmp.S: Likewise. * sysdeps/s390/s390-32/multiarch/memcpy.S: Likewise. * sysdeps/s390/s390-32/multiarch/memset.S: Likewise. * sysdeps/s390/s390-32/setjmp.S: Likewise. * sysdeps/s390/s390-64/multiarch/memcmp.S: Likewise. * sysdeps/s390/s390-64/multiarch/memcpy.S: Likewise. * sysdeps/s390/s390-64/multiarch/memset.S: Likewise. * sysdeps/s390/s390-64/setjmp.S: Likewise. * sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S: Likewise. * sysdeps/unix/arm/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/arm/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/getpid.c: Likewise. * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Likewise. * sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h: Likewise. * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise. * sysdeps/x86_64/strcmp.S: Likewise. --- include/bits/stdlib-float.h | 2 +- include/libc-symbols.h | 1 + intl/l10nflist.c | 2 +- nptl/pthreadP.h | 2 +- nptl_db/structs.def | 2 +- sysdeps/arm/aeabi_unwind_cpp_pr1.c | 6 +++--- sysdeps/arm/memmove.S | 2 +- sysdeps/ieee754/ldbl-128ibm/s_isinfl.c | 2 +- sysdeps/ieee754/ldbl-128ibm/s_isnanl.c | 2 +- sysdeps/ieee754/ldbl-64-128/s_isinfl.c | 4 ++-- sysdeps/ieee754/ldbl-64-128/s_isnanl.c | 4 ++-- sysdeps/ieee754/ldbl-opt/s_isinf.c | 2 +- sysdeps/ieee754/ldbl-opt/s_isnan.c | 2 +- sysdeps/nptl/bits/libc-lock.h | 2 +- sysdeps/nptl/bits/libc-lockP.h | 2 +- sysdeps/posix/profil.c | 2 +- sysdeps/powerpc/powerpc32/__longjmp.S | 2 +- sysdeps/powerpc/powerpc32/bsd-_setjmp.S | 2 +- sysdeps/powerpc/powerpc32/fpu/__longjmp.S | 2 +- sysdeps/powerpc/powerpc32/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc32/fpu/setjmp.S | 2 +- sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c | 2 +- sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c | 2 +- sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h | 2 +- sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc32/power6/memset.S | 2 +- sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S | 2 +- sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc32/setjmp.S | 2 +- sysdeps/powerpc/powerpc64/__longjmp-common.S | 2 +- sysdeps/powerpc/powerpc64/__longjmp.S | 2 +- sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c | 2 +- sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c | 2 +- sysdeps/powerpc/powerpc64/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S | 2 +- sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S | 2 +- sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S | 2 +- sysdeps/powerpc/powerpc64/setjmp-common.S | 4 ++-- sysdeps/powerpc/powerpc64/setjmp.S | 2 +- sysdeps/s390/dl-tls.h | 2 +- sysdeps/s390/s390-32/multiarch/memcmp.S | 2 +- sysdeps/s390/s390-32/multiarch/memcpy.S | 2 +- sysdeps/s390/s390-32/multiarch/memset.S | 2 +- sysdeps/s390/s390-32/setjmp.S | 8 ++++---- sysdeps/s390/s390-64/multiarch/memcmp.S | 2 +- sysdeps/s390/s390-64/multiarch/memcpy.S | 2 +- sysdeps/s390/s390-64/multiarch/memset.S | 2 +- sysdeps/s390/s390-64/setjmp.S | 8 ++++---- sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S | 2 +- sysdeps/unix/arm/sysdep.S | 2 +- sysdeps/unix/sysv/linux/aarch64/sysdep.h | 2 +- sysdeps/unix/sysv/linux/arm/sysdep.h | 2 +- sysdeps/unix/sysv/linux/getpid.c | 2 +- sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 4 ++-- sysdeps/unix/sysv/linux/i386/lowlevellock.h | 6 +++--- sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h | 4 ++-- sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h | 2 +- sysdeps/unix/sysv/linux/sh/lowlevellock.S | 4 ++-- sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 4 ++-- sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 6 +++--- sysdeps/x86_64/strcmp.S | 12 ++++++------ 66 files changed, 90 insertions(+), 89 deletions(-) diff --git a/include/bits/stdlib-float.h b/include/bits/stdlib-float.h index 3466314..8f7e683 100644 --- a/include/bits/stdlib-float.h +++ b/include/bits/stdlib-float.h @@ -1,4 +1,4 @@ /* No floating-point inline functions in rtld. */ -#if !IS_IN (rtld) +#if NOT_IN (rtld) # include #endif diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 5eb9e83..0081301 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -23,6 +23,7 @@ #include "libc-modules.h" #define IS_IN(lib) (IN_MODULE == MODULE_##lib) +#define NOT_IN(lib) !IS_IN (lib) /* Returns true if the current module is a versioned library. Versioned library names are culled from shlib-versions files are assigned a MODULE_* diff --git a/intl/l10nflist.c b/intl/l10nflist.c index ca04ad3..6f7ab7f 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -324,7 +324,7 @@ _nl_normalize_codeset (codeset, name_len) char *retval; char *wp; size_t cnt; -#if !IS_IN (libc) +#if NOT_IN (libc) locale_t locale = newlocale (0, "C", NULL); #else # define locale _nl_C_locobj_ptr diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index a8d5fb4..73f6c26 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -238,7 +238,7 @@ extern int __pthread_debug attribute_hidden; extern void __pthread_unwind (__pthread_unwind_buf_t *__buf) __cleanup_fct_attribute __attribute ((__noreturn__)) -#if !defined SHARED && !IS_IN (libpthread) +#if !defined SHARED && NOT_IN (libpthread) weak_function #endif ; diff --git a/nptl_db/structs.def b/nptl_db/structs.def index 5b905e2..ea8b7ac 100644 --- a/nptl_db/structs.def +++ b/nptl_db/structs.def @@ -74,7 +74,7 @@ DB_STRUCT_FIELD (link_map, l_tls_modid) DB_STRUCT_ARRAY_FIELD (dtv, dtv) #define pointer_val pointer.val /* Field of anonymous struct in dtv_t. */ DB_STRUCT_FIELD (dtv_t, pointer_val) -#if !IS_IN (libpthread) || TLS_TCB_AT_TP +#if NOT_IN (libpthread) || TLS_TCB_AT_TP DB_STRUCT_FIELD (pthread, dtvp) #endif diff --git a/sysdeps/arm/aeabi_unwind_cpp_pr1.c b/sysdeps/arm/aeabi_unwind_cpp_pr1.c index fa7e960..929379b 100644 --- a/sysdeps/arm/aeabi_unwind_cpp_pr1.c +++ b/sysdeps/arm/aeabi_unwind_cpp_pr1.c @@ -27,7 +27,7 @@ attribute_hidden void __aeabi_unwind_cpp_pr0 (void) { -#if !IS_IN (rtld) +#if NOT_IN (rtld) abort (); #endif } @@ -36,7 +36,7 @@ attribute_hidden void __aeabi_unwind_cpp_pr1 (void) { -#if !IS_IN (rtld) +#if NOT_IN (rtld) abort (); #endif } @@ -45,7 +45,7 @@ attribute_hidden void __aeabi_unwind_cpp_pr2 (void) { -#if !IS_IN (rtld) +#if NOT_IN (rtld) abort (); #endif } diff --git a/sysdeps/arm/memmove.S b/sysdeps/arm/memmove.S index 488e156..6032e51 100644 --- a/sysdeps/arm/memmove.S +++ b/sysdeps/arm/memmove.S @@ -69,7 +69,7 @@ ENTRY(memmove) subs ip, r0, r1 cmphi r2, ip -#if !IS_IN (libc) +#if NOT_IN (libc) bls memcpy #else bls HIDDEN_JUMPTARGET(memcpy) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c b/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c index 730aa4d..7fc3585 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_isinfl.c @@ -33,7 +33,7 @@ ___isinfl (long double x) return ~mask & (hx >> 62); } hidden_ver (___isinfl, __isinfl) -#if !IS_IN (libm) +#if NOT_IN (libm) weak_alias (___isinfl, ____isinfl) long_double_symbol (libc, ___isinfl, isinfl); long_double_symbol (libc, ____isinfl, __isinfl); diff --git a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c index 9980875..3eab03f 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_isnanl.c @@ -39,7 +39,7 @@ ___isnanl (long double x) return (int) (hx >> 63); } hidden_ver (___isnanl, __isnanl) -#if !IS_IN (libm) +#if NOT_IN (libm) weak_alias (___isnanl, ____isnanl) long_double_symbol (libc, ___isnanl, isnanl); long_double_symbol (libc, ____isnanl, __isnanl); diff --git a/sysdeps/ieee754/ldbl-64-128/s_isinfl.c b/sysdeps/ieee754/ldbl-64-128/s_isinfl.c index 6dab0e9..b36cd1b 100644 --- a/sysdeps/ieee754/ldbl-64-128/s_isinfl.c +++ b/sysdeps/ieee754/ldbl-64-128/s_isinfl.c @@ -1,5 +1,5 @@ #include -#if !IS_IN (libm) +#if NOT_IN (libm) # undef weak_alias # define weak_alias(n,a) # undef hidden_def @@ -7,7 +7,7 @@ # define __isinfl(arg) ___isinfl(arg) #endif #include -#if !IS_IN (libm) +#if NOT_IN (libm) # undef __isinfl hidden_ver (___isinfl, __isinfl) _weak_alias (___isinfl, ____isinfl) diff --git a/sysdeps/ieee754/ldbl-64-128/s_isnanl.c b/sysdeps/ieee754/ldbl-64-128/s_isnanl.c index ad5ecc5..9a2c023 100644 --- a/sysdeps/ieee754/ldbl-64-128/s_isnanl.c +++ b/sysdeps/ieee754/ldbl-64-128/s_isnanl.c @@ -1,5 +1,5 @@ #include -#if !IS_IN (libm) +#if NOT_IN (libm) # undef weak_alias # define weak_alias(n,a) # undef hidden_def @@ -7,7 +7,7 @@ # define __isnanl(arg) ___isnanl(arg) #endif #include -#if !IS_IN (libm) +#if NOT_IN (libm) # undef __isnanl hidden_ver (___isnanl, __isnanl) _weak_alias (___isnanl, ____isnanl) diff --git a/sysdeps/ieee754/ldbl-opt/s_isinf.c b/sysdeps/ieee754/ldbl-opt/s_isinf.c index 1f760a0..f3db150 100644 --- a/sysdeps/ieee754/ldbl-opt/s_isinf.c +++ b/sysdeps/ieee754/ldbl-opt/s_isinf.c @@ -1,6 +1,6 @@ #include #include -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0); compat_symbol (libc, isinf, isinfl, GLIBC_2_0); diff --git a/sysdeps/ieee754/ldbl-opt/s_isnan.c b/sysdeps/ieee754/ldbl-opt/s_isnan.c index 33f57f1..5f6d7b4 100644 --- a/sysdeps/ieee754/ldbl-opt/s_isnan.c +++ b/sysdeps/ieee754/ldbl-opt/s_isnan.c @@ -1,6 +1,6 @@ #include #include -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h index 7500790..eeb0331 100644 --- a/sysdeps/nptl/bits/libc-lock.h +++ b/sysdeps/nptl/bits/libc-lock.h @@ -26,7 +26,7 @@ /* Mutex type. */ #if defined _LIBC || defined _IO_MTSAFE_IO -# if (!IS_IN (libc) && !IS_IN (libpthread)) || !defined _LIBC +# if (NOT_IN (libc) && NOT_IN (libpthread)) || !defined _LIBC typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t; # else typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t; diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h index f6495b6..b0f0b4a 100644 --- a/sysdeps/nptl/bits/libc-lockP.h +++ b/sysdeps/nptl/bits/libc-lockP.h @@ -35,7 +35,7 @@ #include /* Mutex type. */ -#if !IS_IN (libc) && !IS_IN (libpthread) +#if NOT_IN (libc) && NOT_IN (libpthread) typedef pthread_mutex_t __libc_lock_t; #else typedef int __libc_lock_t; diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c index 54ace22..f3b6212 100644 --- a/sysdeps/posix/profil.c +++ b/sysdeps/posix/profil.c @@ -64,7 +64,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale) { struct sigaction act; struct itimerval timer; -#if !IS_IN (rtld) +#if NOT_IN (rtld) static struct sigaction oact; static struct itimerval otimer; # define oact_ptr &oact diff --git a/sysdeps/powerpc/powerpc32/__longjmp.S b/sysdeps/powerpc/powerpc32/__longjmp.S index 9a83369..1c993e4 100644 --- a/sysdeps/powerpc/powerpc32/__longjmp.S +++ b/sysdeps/powerpc/powerpc32/__longjmp.S @@ -19,7 +19,7 @@ #include #include -#if !IS_IN (libc) +#if NOT_IN (libc) /* Build a non-versioned object for rtld-*. */ # define __longjmp_symbol __longjmp # include "__longjmp-common.S" diff --git a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S index b952170..27cb7ba 100644 --- a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S +++ b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S @@ -19,7 +19,7 @@ #include #include -#if !IS_IN (libc) +#if NOT_IN (libc) /* Build a non-versioned object for rtld-*. */ ENTRY (_setjmp) li r4,0 /* Set second argument to 0. */ diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S index e68eb73..a45fbde 100644 --- a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S +++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S @@ -20,7 +20,7 @@ #include #include -#if !IS_IN (libc) +#if NOT_IN (libc) /* Build a non-versioned object for rtld-*. */ # define __longjmp_symbol __longjmp # include "__longjmp-common.S" diff --git a/sysdeps/powerpc/powerpc32/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/fpu/s_isnan.S index caa85e9..e95600c 100644 --- a/sysdeps/powerpc/powerpc32/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc32/fpu/s_isnan.S @@ -48,7 +48,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp.S b/sysdeps/powerpc/powerpc32/fpu/setjmp.S index 169704f..43fda46 100644 --- a/sysdeps/powerpc/powerpc32/fpu/setjmp.S +++ b/sysdeps/powerpc/powerpc32/fpu/setjmp.S @@ -20,7 +20,7 @@ #include #include -#if !IS_IN (libc) +#if NOT_IN (libc) /* Build a non-versioned object for rtld-*. */ # define __sigsetjmp_symbol __sigsetjmp # define __sigjmp_save_symbol __sigjmp_save diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c index ba57a25..e6468e6 100644 --- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isinf.c @@ -36,7 +36,7 @@ strong_alias (__isinf, __isinfl) weak_alias (__isinf, isinfl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0); compat_symbol (libc, isinf, isinfl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c index f182d50..37dbc59 100644 --- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_isnan.c @@ -42,7 +42,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h b/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h index ca479d8..96e6b5e 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/init-arch.h @@ -21,7 +21,7 @@ the dl_hwcap field. The assembly is to make the compiler not optimize the test (&_rtld_global_ro != NULL), which is always true in ISO C (but not in that case since _rtld_global_ro might not been realocated yet). */ -#if defined(SHARED) && !IS_IN (rtld) +#if defined(SHARED) && NOT_IN (rtld) # define __GLRO(value) \ ({ volatile void **__p = (volatile void**)(&_rtld_global_ro); \ unsigned long int __ret; \ diff --git a/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S index e91c567..a58fa53 100644 --- a/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc32/power5/fpu/s_isnan.S @@ -52,7 +52,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S index 461ae0d..ec33bbe 100644 --- a/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc32/power6/fpu/s_isnan.S @@ -52,7 +52,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc32/power6/memset.S b/sysdeps/powerpc/powerpc32/power6/memset.S index 811a7ef..64f1f00 100644 --- a/sysdeps/powerpc/powerpc32/power6/memset.S +++ b/sysdeps/powerpc/powerpc32/power6/memset.S @@ -236,7 +236,7 @@ L(nzCacheAligned128): L(nzCacheAligned256): cmplwi cr1,rLEN,256 addi rMEMP3,rMEMP,64 -#if !IS_IN (libc) +#if NOT_IN (libc) /* When we are not in libc we should use only GPRs to avoid the FPU lock interrupt. */ stw rCHR,0(rMEMP) diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S b/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S index f9d5ca1..6ca3f1c 100644 --- a/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S +++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_isinf.S @@ -77,7 +77,7 @@ strong_alias (__isinf, __isinfl) weak_alias (__isinf, isinfl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0); compat_symbol (libc, isinf, isinfl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S b/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S index 6aa9e11..a8a8b3c 100644 --- a/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc32/power7/fpu/s_isnan.S @@ -82,7 +82,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc32/setjmp.S b/sysdeps/powerpc/powerpc32/setjmp.S index c73e65c..65e9e44 100644 --- a/sysdeps/powerpc/powerpc32/setjmp.S +++ b/sysdeps/powerpc/powerpc32/setjmp.S @@ -19,7 +19,7 @@ #include #include -#if !IS_IN (libc) +#if NOT_IN (libc) /* Build a non-versioned object for rtld-*. */ # define __sigsetjmp_symbol __sigsetjmp # define __sigjmp_save_symbol __sigjmp_save diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S index e489224..bd792b5 100644 --- a/sysdeps/powerpc/powerpc64/__longjmp-common.S +++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S @@ -130,7 +130,7 @@ L(no_vmx): ld r0,(JB_LR*8)(r3) ld r14,((JB_GPRS+0)*8)(r3) lfd fp14,((JB_FPRS+0)*8)(r3) -#if defined SHARED && !IS_IN (rtld) +#if defined SHARED && NOT_IN (rtld) std r2,FRAME_TOC_SAVE(r1) /* Restore the callers TOC save area. */ #endif ld r15,((JB_GPRS+1)*8)(r3) diff --git a/sysdeps/powerpc/powerpc64/__longjmp.S b/sysdeps/powerpc/powerpc64/__longjmp.S index 9313eab..ee02ccf 100644 --- a/sysdeps/powerpc/powerpc64/__longjmp.S +++ b/sysdeps/powerpc/powerpc64/__longjmp.S @@ -20,7 +20,7 @@ #include #include -#if !IS_IN (libc) +#if NOT_IN (libc) /* Build a non-versioned object for rtld-*. */ # include "__longjmp-common.S" diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c index 5781c3d..4342b1b 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c @@ -39,7 +39,7 @@ strong_alias (__isinf, __isinfl) weak_alias (__isinf, isinfl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0); compat_symbol (libc, isinf, isinfl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c index 2fd76b4..32a8153 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c @@ -48,7 +48,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/fpu/s_isnan.S index 71e79f6..8bfd4cf 100644 --- a/sysdeps/powerpc/powerpc64/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc64/fpu/s_isnan.S @@ -47,7 +47,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S index 46796ab..e521696 100644 --- a/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S @@ -51,7 +51,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S index 0ba6ad4..83ed68d 100644 --- a/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S @@ -50,7 +50,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S index 20ed867..a2bc0fd 100644 --- a/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S @@ -49,7 +49,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S index 79fd2e6..f0af637 100644 --- a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S +++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S @@ -61,7 +61,7 @@ strong_alias (__isinf, __isinfl) weak_alias (__isinf, isinfl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0); compat_symbol (libc, isinf, isinfl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S index 5056261..c4a3d55 100644 --- a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S @@ -60,7 +60,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S index 0e01be7..8346676 100644 --- a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S +++ b/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S @@ -58,7 +58,7 @@ strong_alias (__isinf, __isinfl) weak_alias (__isinf, isinfl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isinf, __isinfl, GLIBC_2_0); compat_symbol (libc, isinf, isinfl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S index 7e3d2d1..f072cef 100644 --- a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S +++ b/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S @@ -53,7 +53,7 @@ strong_alias (__isnan, __isnanl) weak_alias (__isnan, isnanl) #endif -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S index 5979cde..51acdaa 100644 --- a/sysdeps/powerpc/powerpc64/setjmp-common.S +++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -49,7 +49,7 @@ ENTRY (setjmp_symbol) b JUMPTARGET (GLUE(__sigsetjmp_symbol,_ent)) END (setjmp_symbol) -#if defined SHARED && !IS_IN (rtld) && !defined __NO_VMX__ +#if defined SHARED && NOT_IN (rtld) && !defined __NO_VMX__ /* When called from within libc we need a special version of _setjmp that saves r2 since the call won't go via a plt call stub. See bugz #269. __GI__setjmp is used in csu/libc-start.c when @@ -80,7 +80,7 @@ JUMPTARGET(GLUE(__sigsetjmp_symbol,_ent)): std r1,(JB_GPR1*8)(3) #endif mflr r0 -#if defined SHARED && !IS_IN (rtld) +#if defined SHARED && NOT_IN (rtld) ld r5,FRAME_TOC_SAVE(r1) /* Retrieve the callers TOC. */ std r5,(JB_GPR2*8)(3) #else diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64/setjmp.S index a8de3bb..c04c55d 100644 --- a/sysdeps/powerpc/powerpc64/setjmp.S +++ b/sysdeps/powerpc/powerpc64/setjmp.S @@ -20,7 +20,7 @@ #include #include -#if !IS_IN (libc) +#if NOT_IN (libc) /* Build a non-versioned object for rtld-*. */ # define setjmp_symbol setjmp # define _setjmp_symbol _setjmp diff --git a/sysdeps/s390/dl-tls.h b/sysdeps/s390/dl-tls.h index 0ceb6f2..2fec72b 100644 --- a/sysdeps/s390/dl-tls.h +++ b/sysdeps/s390/dl-tls.h @@ -80,7 +80,7 @@ __tls_get_offset:\n\ # endif # else /* IS_IN (rtld) */ extern void *__tls_get_addr_internal (tls_index *ti); -# endif /* !IS_IN (rtld) */ +# endif /* NOT_IN (rtld) */ # define GET_ADDR_OFFSET \ (ti->ti_offset - (unsigned long) __builtin_thread_pointer ()) diff --git a/sysdeps/s390/s390-32/multiarch/memcmp.S b/sysdeps/s390/s390-32/multiarch/memcmp.S index 32f08ef..5ab8f2b 100644 --- a/sysdeps/s390/s390-32/multiarch/memcmp.S +++ b/sysdeps/s390/s390-32/multiarch/memcmp.S @@ -96,7 +96,7 @@ END(memcmp_z10) #include "../memcmp.S" -#if !IS_IN (libc) +#if NOT_IN (libc) .globl memcmp .set memcmp,memcmp_g5 .weak bcmp diff --git a/sysdeps/s390/s390-32/multiarch/memcpy.S b/sysdeps/s390/s390-32/multiarch/memcpy.S index bc65bd8..e6aea91 100644 --- a/sysdeps/s390/s390-32/multiarch/memcpy.S +++ b/sysdeps/s390/s390-32/multiarch/memcpy.S @@ -92,7 +92,7 @@ END(memcpy_z10) #include "../memcpy.S" -#if !defined SHARED || !IS_IN (libc) +#if !defined SHARED || NOT_IN (libc) .globl memcpy .set memcpy,memcpy_g5 #endif diff --git a/sysdeps/s390/s390-32/multiarch/memset.S b/sysdeps/s390/s390-32/multiarch/memset.S index 971c593..26edf9c 100644 --- a/sysdeps/s390/s390-32/multiarch/memset.S +++ b/sysdeps/s390/s390-32/multiarch/memset.S @@ -107,7 +107,7 @@ END(memset_mvcle) #include "../memset.S" -#if !IS_IN (libc) +#if NOT_IN (libc) .globl memset .set memset,memset_g5 #endif diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S index ea59cf9..c1437f5 100644 --- a/sysdeps/s390/s390-32/setjmp.S +++ b/sysdeps/s390/s390-32/setjmp.S @@ -23,12 +23,12 @@ #include #include -#if !IS_IN (rtld) +#if NOT_IN (rtld) # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) /* we need a unique name in case of symbol versioning. */ # define __sigsetjmp __v1__sigsetjmp # endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */ -#endif /* !IS_IN (rtld) */ +#endif /* NOT_IN (rtld) */ /* We include the BSD entry points here as well but we make them weak. */ @@ -87,7 +87,7 @@ ENTRY(__sigsetjmp) #endif END (__sigsetjmp) -#if !IS_IN (rtld) +#if NOT_IN (rtld) # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) /* In glibc release 2.19 new versions of setjmp-functions were introduced, but were reverted before 2.20. Thus both versions are the same function. */ @@ -108,4 +108,4 @@ strong_alias (__v1__sigsetjmp, __v2__sigsetjmp); versioned_symbol (libc, __v1__sigsetjmp, __sigsetjmp, GLIBC_2_0); compat_symbol (libc, __v2__sigsetjmp, __sigsetjmp, GLIBC_2_19); # endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */ -#endif /* if !IS_IN (rtld) */ +#endif /* if NOT_IN (rtld) */ diff --git a/sysdeps/s390/s390-64/multiarch/memcmp.S b/sysdeps/s390/s390-64/multiarch/memcmp.S index 8e4eca2..6b14879 100644 --- a/sysdeps/s390/s390-64/multiarch/memcmp.S +++ b/sysdeps/s390/s390-64/multiarch/memcmp.S @@ -93,7 +93,7 @@ END(memcmp_z10) #include "../memcmp.S" -#if !IS_IN (libc) +#if NOT_IN (libc) .globl memcmp .set memcmp,memcmp_z900 .weak bcmp diff --git a/sysdeps/s390/s390-64/multiarch/memcpy.S b/sysdeps/s390/s390-64/multiarch/memcpy.S index 2536ef4..9552ecb 100644 --- a/sysdeps/s390/s390-64/multiarch/memcpy.S +++ b/sysdeps/s390/s390-64/multiarch/memcpy.S @@ -88,7 +88,7 @@ END(memcpy_z10) #include "../memcpy.S" -#if !defined SHARED || !IS_IN (libc) +#if !defined SHARED || NOT_IN (libc) .globl memcpy .set memcpy,memcpy_z900 #endif diff --git a/sysdeps/s390/s390-64/multiarch/memset.S b/sysdeps/s390/s390-64/multiarch/memset.S index 4d52051..d5389cb 100644 --- a/sysdeps/s390/s390-64/multiarch/memset.S +++ b/sysdeps/s390/s390-64/multiarch/memset.S @@ -103,7 +103,7 @@ END(memset_mvcle) #include "../memset.S" -#if !IS_IN (libc) +#if NOT_IN (libc) .globl memset .set memset,memset_z900 #endif diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S index e3762e0..0cefce6 100644 --- a/sysdeps/s390/s390-64/setjmp.S +++ b/sysdeps/s390/s390-64/setjmp.S @@ -23,12 +23,12 @@ #include #include -#if !IS_IN (rtld) +#if NOT_IN (rtld) # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) /* we need a unique name in case of symbol versioning. */ # define __sigsetjmp __v1__sigsetjmp # endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */ -#endif /* !IS_IN (rtld) */ +#endif /* NOT_IN (rtld) */ /* We include the BSD entry points here as well but we make them weak. */ @@ -82,7 +82,7 @@ ENTRY(__sigsetjmp) #endif END (__sigsetjmp) -#if !IS_IN (rtld) +#if NOT_IN (rtld) # if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) /* In glibc release 2.19 new versions of setjmp-functions were introduced, but were reverted before 2.20. Thus both versions are the same function. */ @@ -103,4 +103,4 @@ strong_alias (__v1__sigsetjmp, __v2__sigsetjmp); versioned_symbol (libc, __v1__sigsetjmp, __sigsetjmp, GLIBC_2_0); compat_symbol (libc, __v2__sigsetjmp, __sigsetjmp, GLIBC_2_19); # endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */ -#endif /* if !IS_IN (rtld) */ +#endif /* if NOT_IN (rtld) */ diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S b/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S index 584204e..17859c7 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/s_isnan.S @@ -32,7 +32,7 @@ END (__isnan) hidden_def (__isnan) weak_alias (__isnan, isnan) -#if !IS_IN (libm) +#if NOT_IN (libm) # if LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) compat_symbol (libc, __isnan, __isnanl, GLIBC_2_0); compat_symbol (libc, isnan, isnanl, GLIBC_2_0); diff --git a/sysdeps/unix/arm/sysdep.S b/sysdeps/unix/arm/sysdep.S index 5566528..a801ea2 100644 --- a/sysdeps/unix/arm/sysdep.S +++ b/sysdeps/unix/arm/sysdep.S @@ -36,7 +36,7 @@ __syscall_error: moveq r0, $EAGAIN /* Yes; translate it to EAGAIN. */ #endif -#if !IS_IN (rtld) +#if NOT_IN (rtld) mov r1, r0 GET_TLS (r2) ldr r2, 1f diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index 45a8636..cda1afd 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -92,7 +92,7 @@ # define ret_ERRVAL ret -# if !IS_IN (libc) +# if NOT_IN (libc) # define SYSCALL_ERROR .Lsyscall_error # if RTLD_PRIVATE_ERRNO # define SYSCALL_ERROR_HANDLER \ diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h index 4863f0e..2efec6e 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep.h @@ -137,7 +137,7 @@ #define ret_ERRVAL PSEUDO_RET_NOERRNO -#if !IS_IN (libc) +#if NOT_IN (libc) # define SYSCALL_ERROR __local_syscall_error # if RTLD_PRIVATE_ERRNO # define SYSCALL_ERROR_HANDLER \ diff --git a/sysdeps/unix/sysv/linux/getpid.c b/sysdeps/unix/sysv/linux/getpid.c index af5db44..390e4ff 100644 --- a/sysdeps/unix/sysv/linux/getpid.c +++ b/sysdeps/unix/sysv/linux/getpid.c @@ -48,7 +48,7 @@ really_getpid (pid_t oldval) pid_t __getpid (void) { -#if !IS_IN (libc) +#if NOT_IN (libc) INTERNAL_SYSCALL_DECL (err); pid_t result = INTERNAL_SYSCALL (getpid, err, 0); #else diff --git a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S index 13596f1..240a442 100644 --- a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +++ b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -115,7 +115,7 @@ __lll_lock_wait_private: cfi_endproc .size __lll_lock_wait_private,.-__lll_lock_wait_private -#if !IS_IN (libc) +#if NOT_IN (libc) .globl __lll_lock_wait .type __lll_lock_wait,@function .hidden __lll_lock_wait @@ -361,7 +361,7 @@ __lll_unlock_wake_private: cfi_endproc .size __lll_unlock_wake_private,.-__lll_unlock_wake_private -#if !IS_IN (libc) +#if NOT_IN (libc) .globl __lll_unlock_wake .type __lll_unlock_wake,@function .hidden __lll_unlock_wake diff --git a/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 1032f4b..3192d38 100644 --- a/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -169,7 +169,7 @@ value is zero. In case the operation failed, the cmpxchg instruction has loaded the current value of the memory work which is guaranteed to be nonzero. */ -#if !IS_IN (libc) || defined UP +#if NOT_IN (libc) || defined UP # define __lll_trylock_asm LOCK_INSTR "cmpxchgl %2, %1" #else # define __lll_trylock_asm "cmpl $0, %%gs:%P5\n\t" \ @@ -198,7 +198,7 @@ : "memory"); \ ret; }) -#if !IS_IN (libc) || defined UP +#if NOT_IN (libc) || defined UP # define __lll_lock_asm_start LOCK_INSTR "cmpxchgl %1, %2\n\t" #else # define __lll_lock_asm_start "cmpl $0, %%gs:%P6\n\t" \ @@ -324,7 +324,7 @@ extern int __lll_timedlock_elision (int *futex, short *adapt_count, : "memory"); \ result; }) -#if !IS_IN (libc) || defined UP +#if NOT_IN (libc) || defined UP # define __lll_unlock_asm LOCK_INSTR "subl $1, %0\n\t" #else # define __lll_unlock_asm "cmpl $0, %%gs:%P3\n\t" \ diff --git a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h index aa116c4..1d4a265 100644 --- a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h +++ b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h @@ -47,11 +47,11 @@ extern void __vdso_atomic_barrier_stub (void); # endif /* IS_IN (rtld) || IS_IN (libc) */ /* RTLD should only use its own copies. */ -# if !IS_IN (rtld) +# if NOT_IN (rtld) extern void *__vdso_read_tp; extern void *__vdso_atomic_cmpxchg_32; extern void *__vdso_atomic_barrier; -# endif /* !IS_IN (rtld) */ +# endif /* NOT_IN (rtld) */ # endif /* !__ASSEMBLER__ */ diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h index 5e185a3..a0f7394 100644 --- a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h @@ -23,7 +23,7 @@ #if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) -# if !IS_IN (librt) || !defined(PIC) +# if NOT_IN (librt) || !defined(PIC) # define AC_STACK_SIZE 16 /* space for r15, async_cancel arg and 2 temp words */ # define AC_SET_GOT /* empty */ # define AC_RESTORE_GOT /* empty */ diff --git a/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/sysdeps/unix/sysv/linux/sh/lowlevellock.S index 3fab373..ffd06d0 100644 --- a/sysdeps/unix/sysv/linux/sh/lowlevellock.S +++ b/sysdeps/unix/sysv/linux/sh/lowlevellock.S @@ -172,7 +172,7 @@ __lll_lock_wait_private: cfi_endproc .size __lll_lock_wait_private,.-__lll_lock_wait_private -#if !IS_IN (libc) +#if NOT_IN (libc) .globl __lll_lock_wait .type __lll_lock_wait,@function .hidden __lll_lock_wait @@ -454,7 +454,7 @@ __lll_unlock_wake_private: cfi_endproc .size __lll_unlock_wake_private,.-__lll_unlock_wake_private -#if !IS_IN (libc) +#if NOT_IN (libc) .globl __lll_unlock_wake .type __lll_unlock_wake,@function .hidden __lll_unlock_wake diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S index 5d8e77c..3f53667 100644 --- a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -108,7 +108,7 @@ __lll_lock_wait_private: cfi_endproc .size __lll_lock_wait_private,.-__lll_lock_wait_private -#if !IS_IN (libc) +#if NOT_IN (libc) .globl __lll_lock_wait .type __lll_lock_wait,@function .hidden __lll_lock_wait @@ -348,7 +348,7 @@ __lll_unlock_wake_private: cfi_endproc .size __lll_unlock_wake_private,.-__lll_unlock_wake_private -#if !IS_IN (libc) +#if NOT_IN (libc) .globl __lll_unlock_wake .type __lll_unlock_wake,@function .hidden __lll_unlock_wake diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h index 2f0cf5c..1be8773 100644 --- a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -145,7 +145,7 @@ value is zero. In case the operation failed, the cmpxchg instruction has loaded the current value of the memory work which is guaranteed to be nonzero. */ -#if !IS_IN (libc) || defined UP +#if NOT_IN (libc) || defined UP # define __lll_trylock_asm LOCK_INSTR "cmpxchgl %2, %1" #else # define __lll_trylock_asm "cmpl $0, __libc_multiple_threads(%%rip)\n\t" \ @@ -174,7 +174,7 @@ : "memory"); \ ret; }) -#if !IS_IN (libc) || defined UP +#if NOT_IN (libc) || defined UP # define __lll_lock_asm_start LOCK_INSTR "cmpxchgl %4, %2\n\t" \ "jz 24f\n\t" #else @@ -316,7 +316,7 @@ extern int __lll_timedlock_elision (int *futex, short *adapt_count, : "memory", "cx", "cc", "r10", "r11"); \ result; }) -#if !IS_IN (libc) || defined UP +#if NOT_IN (libc) || defined UP # define __lll_unlock_asm_start LOCK_INSTR "decl %0\n\t" \ "je 24f\n\t" #else diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S index b022a04..8f619a0 100644 --- a/sysdeps/x86_64/strcmp.S +++ b/sysdeps/x86_64/strcmp.S @@ -32,7 +32,7 @@ /* The simplified code below is not set up to handle strncmp() so far. Should this become necessary it has to be implemented. For now just report the problem. */ -# if !IS_IN (libc) +# if NOT_IN (libc) # error "strncmp not implemented so far" # endif @@ -51,7 +51,7 @@ # include "locale-defines.h" /* No support for strcasecmp outside libc so far since it is not needed. */ -# if !IS_IN (libc) +# if NOT_IN (libc) # error "strcasecmp_l not implemented so far" # endif @@ -60,7 +60,7 @@ # include "locale-defines.h" /* No support for strncasecmp outside libc so far since it is not needed. */ -# if !IS_IN (libc) +# if NOT_IN (libc) # error "strncasecmp_l not implemented so far" # endif @@ -126,7 +126,7 @@ libc_hidden_def (__strncasecmp) #endif ENTRY (STRCMP) -#if !IS_IN (libc) +#if NOT_IN (libc) /* Simple version since we can't use SSE registers in ld.so. */ L(oop): movb (%rdi), %al cmpb (%rsi), %al @@ -144,7 +144,7 @@ L(neq): movl $1, %eax cmovbl %ecx, %eax ret END (STRCMP) -#else /* !IS_IN (libc) */ +#else /* NOT_IN (libc) */ # ifdef USE_AS_STRCASECMP_L /* We have to fall back on the C implementation for locales with encodings not matching ASCII for single bytes. */ @@ -2300,5 +2300,5 @@ LABEL(unaligned_table): .int LABEL(ashr_14) - LABEL(unaligned_table) .int LABEL(ashr_15) - LABEL(unaligned_table) .int LABEL(ashr_0) - LABEL(unaligned_table) -#endif /* !IS_IN (libc) */ +#endif /* NOT_IN (libc) */ libc_hidden_builtin_def (STRCMP)