diff options
317 files changed, 751 insertions, 447 deletions
diff --git a/ChangeLog b/ChangeLog index c70d68ad1f..8362e08557 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,329 @@ 2014-11-24 Siddhesh Poyarekar <siddhesh@redhat.com> + * stdlib/isomac.c (fmt): Replace NOT_IN_libc with IN_MODULE. + (get_null_defines): Adjust. + * sunrpc/Makefile: Adjust comment. + * Makerules (CPPFLAGS-nonlib): Remove NOT_IN_libc. + * elf/Makefile (CPPFLAGS-sotruss-lib): Likewise. + (CFLAGS-interp.c): Likewise. + (CFLAGS-ldconfig.c): Likewise. + (CPPFLAGS-.os): Likewise. + * elf/rtld-Rules (rtld-CPPFLAGS): Likewise. + * extra-lib.mk (CPPFLAGS-$(lib)): Likewise. + * extra-modules.mk (extra-modules.mk): Likewise. + * iconv/Makefile (CPPFLAGS-iconvprogs): Likewise. + * locale/Makefile (CPPFLAGS-locale_programs): Likewise. + * malloc/Makefile (CPPFLAGS-memusagestat): Likewise. + * nscd/Makefile (CPPFLAGS-nscd): Likewise. + * nss/Makefile (CPPFLAGS-nss_test1): Likewise. + * stdlib/Makefile (CFLAGS-tst-putenvmod.c): Likewise. + * sysdeps/gnu/Makefile ($(objpfx)errlist-compat.c): Likewise. + * sysdeps/unix/sysv/linux/Makefile (CPPFLAGS-lddlibc4): Likewise. + * iconvdata/Makefile (CPPFLAGS): Likewise. + (cpp-srcs-left): Add libof for all iconvdata routines. + * bits/stdio-lock.h: Replace NOT_IN_libc with IS_IN. + * include/assert.h: Likewise. + * include/ctype.h: Likewise. + * include/errno.h: Likewise. + * include/libc-symbols.h: Likewise. + * include/math.h: Likewise. + * include/netdb.h: Likewise. + * include/resolv.h: Likewise. + * include/stdio.h: Likewise. + * include/stdlib.h: Likewise. + * include/string.h: Likewise. + * include/sys/stat.h: Likewise. + * include/wctype.h: Likewise. + * intl/l10nflist.c: Likewise. + * libidn/idn-stub.c: Likewise. + * libio/libioP.h: Likewise. + * nptl/libc_multiple_threads.c: Likewise. + * nptl/pthreadP.h: Likewise. + * posix/regex_internal.h: Likewise. + * resolv/res_hconf.c: Likewise. + * sysdeps/arm/armv7/multiarch/memcpy.S: Likewise. + * sysdeps/arm/memmove.S: Likewise. + * sysdeps/arm/sysdep.h: Likewise. + * sysdeps/generic/_itoa.h: Likewise. + * sysdeps/generic/symbol-hacks.h: Likewise. + * sysdeps/gnu/errlist.awk: Likewise. + * sysdeps/gnu/errlist.c: Likewise. + * sysdeps/i386/i586/memcpy.S: Likewise. + * sysdeps/i386/i586/memset.S: Likewise. + * sysdeps/i386/i686/memcpy.S: Likewise. + * sysdeps/i386/i686/memmove.S: Likewise. + * sysdeps/i386/i686/mempcpy.S: Likewise. + * sysdeps/i386/i686/memset.S: Likewise. + * sysdeps/i386/i686/multiarch/bcopy.S: Likewise. + * sysdeps/i386/i686/multiarch/bzero.S: Likewise. + * sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S: Likewise. + * sysdeps/i386/i686/multiarch/memchr-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/memchr.S: Likewise. + * sysdeps/i386/i686/multiarch/memcmp-sse4.S: Likewise. + * sysdeps/i386/i686/multiarch/memcmp-ssse3.S: Likewise. + * sysdeps/i386/i686/multiarch/memcmp.S: Likewise. + * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Likewise. + * sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise. + * sysdeps/i386/i686/multiarch/memcpy.S: Likewise. + * sysdeps/i386/i686/multiarch/memcpy_chk.S: Likewise. + * sysdeps/i386/i686/multiarch/memmove.S: Likewise. + * sysdeps/i386/i686/multiarch/memmove_chk.S: Likewise. + * sysdeps/i386/i686/multiarch/mempcpy.S: Likewise. + * sysdeps/i386/i686/multiarch/mempcpy_chk.S: Likewise. + * sysdeps/i386/i686/multiarch/memrchr-c.c: Likewise. + * sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S: Likewise. + * sysdeps/i386/i686/multiarch/memrchr-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/memrchr.S: Likewise. + * sysdeps/i386/i686/multiarch/memset-sse2-rep.S: Likewise. + * sysdeps/i386/i686/multiarch/memset-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/memset.S: Likewise. + * sysdeps/i386/i686/multiarch/memset_chk.S: Likewise. + * sysdeps/i386/i686/multiarch/rawmemchr.S: Likewise. + * sysdeps/i386/i686/multiarch/strcat-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/strcat-ssse3.S: Likewise. + * sysdeps/i386/i686/multiarch/strcat.S: Likewise. + * sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S: Likewise. + * sysdeps/i386/i686/multiarch/strchr-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/strchr.S: Likewise. + * sysdeps/i386/i686/multiarch/strcmp-sse4.S: Likewise. + * sysdeps/i386/i686/multiarch/strcmp-ssse3.S: Likewise. + * sysdeps/i386/i686/multiarch/strcmp.S: Likewise. + * sysdeps/i386/i686/multiarch/strcpy-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/strcpy-ssse3.S: Likewise. + * sysdeps/i386/i686/multiarch/strcpy.S: Likewise. + * sysdeps/i386/i686/multiarch/strcspn.S: Likewise. + * sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S: Likewise. + * sysdeps/i386/i686/multiarch/strlen-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/strlen.S: Likewise. + * sysdeps/i386/i686/multiarch/strnlen.S: Likewise. + * sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S: Likewise. + * sysdeps/i386/i686/multiarch/strrchr-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/strrchr.S: Likewise. + * sysdeps/i386/i686/multiarch/strspn.S: Likewise. + * sysdeps/i386/i686/multiarch/wcschr-c.c: Likewise. + * sysdeps/i386/i686/multiarch/wcschr-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/wcschr.S: Likewise. + * sysdeps/i386/i686/multiarch/wcscmp-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/wcscmp.S: Likewise. + * sysdeps/i386/i686/multiarch/wcscpy-c.c: Likewise. + * sysdeps/i386/i686/multiarch/wcscpy-ssse3.S: Likewise. + * sysdeps/i386/i686/multiarch/wcscpy.S: Likewise. + * sysdeps/i386/i686/multiarch/wcslen-c.c: Likewise. + * sysdeps/i386/i686/multiarch/wcslen-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/wcslen.S: Likewise. + * sysdeps/i386/i686/multiarch/wcsrchr-c.c: Likewise. + * sysdeps/i386/i686/multiarch/wcsrchr-sse2.S: Likewise. + * sysdeps/i386/i686/multiarch/wcsrchr.S: Likewise. + * sysdeps/i386/i686/multiarch/wmemcmp-c.c: Likewise. + * sysdeps/i386/i686/multiarch/wmemcmp.S: Likewise. + * sysdeps/ia64/fpu/libm-symbols.h: Likewise. + * sysdeps/nptl/bits/libc-lock.h: Likewise. + * sysdeps/nptl/bits/libc-lockP.h: Likewise. + * sysdeps/nptl/bits/stdio-lock.h: Likewise. + * sysdeps/posix/closedir.c: Likewise. + * sysdeps/posix/opendir.c: Likewise. + * sysdeps/posix/readdir.c: Likewise. + * sysdeps/posix/rewinddir.c: Likewise. + * sysdeps/powerpc/novmx-sigjmp.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/setjmp.S: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/memset.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c: Likewise. + * sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c: Likewise. + * sysdeps/powerpc/powerpc32/power6/memset.S: Likewise. + * sysdeps/powerpc/powerpc32/setjmp.S: Likewise. + * sysdeps/powerpc/powerpc64/__longjmp.S: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/bzero.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memchr.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memcmp.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memcpy.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memmove.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/mempcpy.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memrchr.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/memset.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/stpcpy.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/stpncpy.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strcat.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strchr.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strchrnul.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strcmp.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strcpy.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strcspn.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strlen.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strncase.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strncase_l.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strncat.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strncmp.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strncpy.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strnlen.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strpbrk.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strrchr.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/strspn.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/wcschr.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/wcscpy.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c: Likewise. + * sysdeps/powerpc/powerpc64/multiarch/wordcopy.c: Likewise. + * sysdeps/powerpc/powerpc64/setjmp.S: Likewise. + * sysdeps/s390/s390-32/multiarch/ifunc-resolve.c: 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-64/multiarch/ifunc-resolve.c: 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/sparc/sparc64/multiarch/memcpy-niagara1.S: Likewise. + * sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S: Likewise. + * sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S: Likewise. + * sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: Likewise. + * sysdeps/sparc/sparc64/multiarch/memcpy.S: Likewise. + * sysdeps/sparc/sparc64/multiarch/memset-niagara1.S: Likewise. + * sysdeps/sparc/sparc64/multiarch/memset-niagara4.S: Likewise. + * sysdeps/sparc/sparc64/multiarch/memset.S: Likewise. + * sysdeps/unix/alpha/sysdep.S: Likewise. + * sysdeps/unix/alpha/sysdep.h: Likewise. + * sysdeps/unix/make-syscalls.sh: Likewise. + * sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/alpha/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/arm/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/getpid.c: Likewise. + * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Likewise. + * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/sysdep.S: Likewise. + * sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/lowlevellock-futex.h: Likewise. + * sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h: Likewise. + * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/m68k/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/microblaze/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/mips/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/not-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/s390/longjmp_chk.c: Likewise. + * sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Likewise. + * sysdeps/unix/sysv/linux/sh/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/sh/vfork.S: Likewise. + * sysdeps/unix/sysv/linux/sparc/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/brk.S: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/tile/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/tile/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/tile/waitpid.S: Likewise. + * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Likewise. + * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise. + * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise. + * sysdeps/wordsize-32/symbol-hacks.h: Likewise. + * sysdeps/x86_64/memcpy.S: Likewise. + * sysdeps/x86_64/memmove.c: Likewise. + * sysdeps/x86_64/memset.S: Likewise. + * sysdeps/x86_64/multiarch/init-arch.h: Likewise. + * sysdeps/x86_64/multiarch/memcmp-sse4.S: Likewise. + * sysdeps/x86_64/multiarch/memcmp-ssse3.S: Likewise. + * sysdeps/x86_64/multiarch/memcmp.S: Likewise. + * sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S: Likewise. + * sysdeps/x86_64/multiarch/memcpy-ssse3-back.S: Likewise. + * sysdeps/x86_64/multiarch/memcpy-ssse3.S: Likewise. + * sysdeps/x86_64/multiarch/memcpy.S: Likewise. + * sysdeps/x86_64/multiarch/memcpy_chk.S: Likewise. + * sysdeps/x86_64/multiarch/memmove.c: Likewise. + * sysdeps/x86_64/multiarch/mempcpy.S: Likewise. + * sysdeps/x86_64/multiarch/mempcpy_chk.S: Likewise. + * sysdeps/x86_64/multiarch/memset-avx2.S: Likewise. + * sysdeps/x86_64/multiarch/memset.S: Likewise. + * sysdeps/x86_64/multiarch/memset_chk.S: Likewise. + * sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S: Likewise. + * sysdeps/x86_64/multiarch/strcat-ssse3.S: Likewise. + * sysdeps/x86_64/multiarch/strcat.S: Likewise. + * sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S: Likewise. + * sysdeps/x86_64/multiarch/strchr.S: Likewise. + * sysdeps/x86_64/multiarch/strcmp-ssse3.S: Likewise. + * sysdeps/x86_64/multiarch/strcmp.S: Likewise. + * sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S: Likewise. + * sysdeps/x86_64/multiarch/strcpy-ssse3.S: Likewise. + * sysdeps/x86_64/multiarch/strcpy.S: Likewise. + * sysdeps/x86_64/multiarch/strcspn.S: Likewise. + * sysdeps/x86_64/multiarch/strspn.S: Likewise. + * sysdeps/x86_64/multiarch/wcscpy-c.c: Likewise. + * sysdeps/x86_64/multiarch/wcscpy-ssse3.S: Likewise. + * sysdeps/x86_64/multiarch/wcscpy.S: Likewise. + * sysdeps/x86_64/multiarch/wmemcmp-c.c: Likewise. + * sysdeps/x86_64/multiarch/wmemcmp.S: Likewise. + * sysdeps/x86_64/strcmp.S: Likewise. + * extra-lib.mk (CPPFLAGS-$(lib)): Remove IS_IN_$(lib). * elf/Makefile (CPPFLAGS-.os): Remove IS_IN_rtld. diff --git a/Makerules b/Makerules index 3cf4c407f2..46ec1970fe 100644 --- a/Makerules +++ b/Makerules @@ -1228,9 +1228,6 @@ lib := nonlib include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) endif -# The include magic above causes those files to use this variable for flags. -CPPFLAGS-nonlib = -DNOT_IN_libc=1 - ifeq ($(build-shared),yes) # Generate normalized lists of symbols, versions, and data sizes. diff --git a/bits/stdio-lock.h b/bits/stdio-lock.h index 198cb67535..f68b13eb58 100644 --- a/bits/stdio-lock.h +++ b/bits/stdio-lock.h @@ -44,7 +44,7 @@ __libc_lock_define_recursive (typedef, _IO_lock_t) #define _IO_cleanup_region_end(_doit) \ __libc_cleanup_region_end (_doit) -#if defined _LIBC && !defined NOT_IN_libc +#if defined _LIBC && IS_IN (libc) # define _IO_acquire_lock(_fp) \ _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ _IO_flockfile (_fp) diff --git a/elf/Makefile b/elf/Makefile index eef3cb8a64..9e07073de0 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -97,7 +97,6 @@ install-others += $(inst_auditdir)/sotruss-lib.so install-bin-script += sotruss generated += sotruss libof-sotruss-lib = extramodules -CPPFLAGS-sotruss-lib = -DNOT_IN_libc $(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os $(build-module-asneeded) $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ @@ -437,15 +436,12 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DNOT_IN_libc + -D'SLIBDIR="$(slibdir)"' libof-ldconfig = ldconfig CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) CFLAGS-rtld.c = $(SYSCONF-FLAGS) -CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ - -DNOT_IN_libc=1) - cpp-srcs-left := $(all-rtld-routines:=.os) lib := rtld include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) diff --git a/elf/rtld-Rules b/elf/rtld-Rules index 65d147f6c4..3c1a5ea749 100644 --- a/elf/rtld-Rules +++ b/elf/rtld-Rules @@ -138,12 +138,10 @@ ifdef rtld-depfiles -include $(rtld-depfiles) endif +# This here is the whole point of all the shenanigans. # Set libof-* for each routine. cpp-srcs-left := $(rtld-modules:%.os=%) lib := rtld include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) -# This here is the whole point of all the shenanigans. -rtld-CPPFLAGS := -DNOT_IN_libc=1 - endif diff --git a/extra-lib.mk b/extra-lib.mk index 7cdf8234af..b10748d185 100644 --- a/extra-lib.mk +++ b/extra-lib.mk @@ -105,5 +105,3 @@ cpp-srcs-left := $($(lib)-routines) $($(lib)-sysdep_routines) ifneq (,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) endif - -CPPFLAGS-$(lib) := -DNOT_IN_libc=1 diff --git a/extra-modules.mk b/extra-modules.mk index 9c2e4d2f16..5f8e693b15 100644 --- a/extra-modules.mk +++ b/extra-modules.mk @@ -7,4 +7,3 @@ module := $(firstword $(extra-modules-left)) extra-modules-left := $(filter-out $(module),$(extra-modules-left)) libof-$(notdir $(module)) := extramodules -CPPFLAGS-$(module).c += -DNOT_IN_libc diff --git a/iconv/Makefile b/iconv/Makefile index 8031a88bd1..d1a9011202 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -52,8 +52,6 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"' CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"' CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"' -CPPFLAGS-iconvprogs = -DNOT_IN_libc - # Set libof-* for each routine. cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules) lib := iconvprogs diff --git a/iconvdata/Makefile b/iconvdata/Makefile index e0252ee83f..5595a3c940 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -75,9 +75,6 @@ endif test-srcs := tst-table-from tst-table-to endif -# No code here is in libc.so. -CPPFLAGS += -DNOT_IN_libc - libJIS-routines := jis0201 jis0208 jis0212 libKSC-routines := ksc5601 libGB-routines := gb2312 @@ -275,7 +272,9 @@ endif include ../Rules # Set libof-* for each routine. -cpp-srcs-left := $(modules) $(generated-modules) +cpp-srcs-left := $(modules) $(generated-modules) $(libJIS-routines) \ + $(libKSC-routines) $(libGB-routines) $(libCNS-routines) \ + $(libISOIR165-routines) $(libJISX0213-routines) lib := iconvdata include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) diff --git a/include/assert.h b/include/assert.h index abe182fced..c452667956 100644 --- a/include/assert.h +++ b/include/assert.h @@ -20,7 +20,7 @@ extern void __assert_fail_base (const char *fmt, const char *assertion, const char *function) __THROW __attribute__ ((__noreturn__)); -# if !defined NOT_IN_libc || IS_IN (rtld) +# if IS_IN (libc) || IS_IN (rtld) hidden_proto (__assert_fail) hidden_proto (__assert_perror_fail) # endif diff --git a/include/ctype.h b/include/ctype.h index 2ef2bd24e8..f3157b9e7d 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -11,7 +11,7 @@ libc_hidden_proto (__ctype_init) So defeat macro expansion with parens for this declaration. */ extern int (__isctype) (int __c, int __mask); -# ifndef NOT_IN_libc +# if IS_IN (libc) /* These accessors are used by the optimized macros to find the thread-local cache of ctype information from the current thread's @@ -61,7 +61,7 @@ __ctype_tolower_loc (void) # define __isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; }) # endif /* Not __NO_CTYPE. */ -# endif /* Not NOT_IN_libc. */ +# endif /* IS_IN (libc). */ #endif /* Not _ISOMAC. */ #endif /* ctype.h */ diff --git a/include/errno.h b/include/errno.h index d650a1545f..7df41dfc31 100644 --- a/include/errno.h +++ b/include/errno.h @@ -22,19 +22,19 @@ # define errno rtld_errno extern int rtld_errno attribute_hidden; -# elif !defined NOT_IN_libc || IS_IN_LIB +# elif IS_IN_LIB # include <tls.h> # undef errno -# ifndef NOT_IN_libc +# if IS_IN (libc) # define errno __libc_errno # else # define errno errno /* For #ifndef errno tests. */ # endif extern __thread int errno attribute_tls_model_ie; -# endif /* !NOT_IN_libc || IS_IN_LIB */ +# endif /* IS_IN_LIB */ # define __set_errno(val) (errno = (val)) diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 52350d3b60..6d9b95d036 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -549,7 +549,7 @@ for linking") # define hidden_nolink(name, lib, version) #endif -#if !defined NOT_IN_libc +#if IS_IN (libc) # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) diff --git a/include/math.h b/include/math.h index b10bfa0474..42bb55eb98 100644 --- a/include/math.h +++ b/include/math.h @@ -6,7 +6,7 @@ /* Now define the internal interfaces. */ extern int __matherr (struct exception *__exc); -# if !defined NOT_IN_libc || IS_IN (libm) +# if IS_IN (libc) || IS_IN (libm) hidden_proto (__finite) hidden_proto (__isinf) hidden_proto (__isnan) diff --git a/include/netdb.h b/include/netdb.h index eccdbe6462..9e64a15ff7 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -4,15 +4,15 @@ #ifndef _ISOMAC /* Macros for accessing h_errno from inside libc. */ -# if !defined NOT_IN_libc || IS_IN_LIB +# if IS_IN_LIB # undef h_errno -# ifndef NOT_IN_libc +# if IS_IN (libc) # define h_errno __libc_h_errno # else # define h_errno h_errno /* For #ifndef h_errno tests. */ # endif extern __thread int h_errno attribute_tls_model_ie; -# endif /* !NOT_IN_libc || IS_IN_LIB */ +# endif /* IS_IN_LIB */ # define __set_h_errno(x) (h_errno = (x)) libc_hidden_proto (hstrerror) diff --git a/include/resolv.h b/include/resolv.h index 3904cb77c7..4c614760a8 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -13,7 +13,7 @@ #ifdef _RESOLV_H_ -# ifndef NOT_IN_libc +# if IS_IN (libc) # define __resp __libc_resp # endif extern __thread struct __res_state *__resp attribute_tls_model_ie; diff --git a/include/stdio.h b/include/stdio.h index 1c54fc48d8..0010607949 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -117,7 +117,7 @@ extern const char *const _sys_errlist_internal[] attribute_hidden; extern int _sys_nerr_internal attribute_hidden; libc_hidden_proto (__asprintf) -# if !defined NOT_IN_libc +# if IS_IN (libc) extern _IO_FILE *_IO_new_fopen (const char*, const char*); # define fopen(fname, mode) _IO_new_fopen (fname, mode) extern _IO_FILE *_IO_new_fdopen (int, const char*); diff --git a/include/stdlib.h b/include/stdlib.h index b8efbd7b3a..992b87793c 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -226,7 +226,7 @@ extern int __qfcvt_r (long double __value, int __ndigit, int *__restrict __decpt, int *__restrict __sign, char *__restrict __buf, size_t __len); -# ifndef NOT_IN_libc +# if IS_IN (libc) # undef MB_CUR_MAX # define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX)) # endif diff --git a/include/string.h b/include/string.h index 172940b759..034e2953df 100644 --- a/include/string.h +++ b/include/string.h @@ -57,7 +57,7 @@ extern __typeof (strcasecmp_l) __strcasecmp_l; extern __typeof (strncasecmp_l) __strncasecmp_l; /* Alternative version which doesn't pollute glibc's namespace. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # undef strndupa # define strndupa(s, n) \ (__extension__ \ @@ -115,7 +115,7 @@ libc_hidden_builtin_proto (strspn) libc_hidden_builtin_proto (strstr) libc_hidden_builtin_proto (ffs) -#if (defined NOT_IN_libc || !defined SHARED) \ +#if (!IS_IN (libc) || !defined SHARED) \ && !defined NO_MEMPCPY_STPCPY_REDIRECT /* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call __mempcpy and __stpcpy if not inlined. */ diff --git a/include/sys/stat.h b/include/sys/stat.h index a44fbec465..873562a99d 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -12,7 +12,7 @@ extern __mode_t __umask (__mode_t __mask); extern int __mkdir (const char *__path, __mode_t __mode); extern int __mknod (const char *__path, __mode_t __mode, __dev_t __dev); -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) hidden_proto (__fxstat) hidden_proto (__fxstat64) hidden_proto (__lxstat) diff --git a/include/wctype.h b/include/wctype.h index 676c04358b..b29e82484b 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -80,7 +80,7 @@ libc_hidden_proto (__towupper_l) /* The spec says that isdigit must only match the decimal digits. We can check this without a memory access. */ -# ifndef NOT_IN_libc +# if IS_IN (libc) # undef iswdigit # define iswdigit(c) ({ wint_t __c = (c); __c >= L'0' && __c <= L'9'; }) # undef iswdigit_l diff --git a/intl/l10nflist.c b/intl/l10nflist.c index 428a3f1d15..ca04ad3dbc 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; -#ifdef NOT_IN_libc +#if !IS_IN (libc) locale_t locale = newlocale (0, "C", NULL); #else # define locale _nl_C_locobj_ptr diff --git a/libidn/idn-stub.c b/libidn/idn-stub.c index 9361b250a6..afd93caed8 100644 --- a/libidn/idn-stub.c +++ b/libidn/idn-stub.c @@ -130,7 +130,7 @@ __idna_to_ascii_lz (const char *input, char **output, int flags) } -#ifndef NOT_IN_libc +#if IS_IN (libc) libc_freeres_fn (unload_libidn) { if (h != NULL && h != (void *) 1l) diff --git a/libio/libioP.h b/libio/libioP.h index bd94041937..08b77cac67 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -902,7 +902,7 @@ _IO_acquire_lock_clear_flags2_fct (_IO_FILE **p) _IO_funlockfile (fp); } -#if !defined _IO_MTSAFE_IO && !defined NOT_IN_libc +#if !defined _IO_MTSAFE_IO && IS_IN (libc) # define _IO_acquire_lock(_fp) \ do { \ _IO_FILE *_IO_acquire_lock_file = NULL diff --git a/locale/Makefile b/locale/Makefile index bbbb3e5b39..1a9c51984a 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -88,14 +88,13 @@ locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \ CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \ -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \ - -DLOCSRCDIR='"$(i18ndir)/locales"' \ - -DNOT_IN_libc + -DLOCSRCDIR='"$(i18ndir)/locales"' CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-charmap-dir.c = -Wno-write-strings -# This makes sure -DNOT_IN_libc et al are passed for all these modules. +# Set libof-* for each routine. cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \ $(lib-modules) lib := locale-programs diff --git a/malloc/Makefile b/malloc/Makefile index fbfada2e58..6df6f16674 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -48,8 +48,6 @@ extra-objs = mcheck-init.o libmcheck.a # Include the cleanup handler. aux := set-freeres thread-freeres -CPPFLAGS-memusagestat = -DNOT_IN_libc - # The Perl script to analyze the output of the mtrace functions. ifneq ($(PERL),no) install-bin-script = mtrace diff --git a/nptl/libc_multiple_threads.c b/nptl/libc_multiple_threads.c index acf3594d71..0361f6c273 100644 --- a/nptl/libc_multiple_threads.c +++ b/nptl/libc_multiple_threads.c @@ -18,7 +18,7 @@ #include <pthreadP.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifndef TLS_MULTIPLE_THREADS_IN_TCB /* Variable set to a nonzero value either if more than one thread runs or ran, or if a single-threaded process is trying to cancel itself. See diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 318505635f..a26a68b46a 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -292,7 +292,7 @@ __do_cancel (void) #define CANCEL_RESET(oldtype) \ __pthread_disable_asynccancel (oldtype) -#if !defined NOT_IN_libc +#if IS_IN (libc) /* Same as CANCEL_ASYNC, but for use in libc.so. */ # define LIBC_CANCEL_ASYNC() \ __libc_enable_asynccancel () diff --git a/nscd/Makefile b/nscd/Makefile index 40e99aa54c..8e03e9e882 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -79,7 +79,7 @@ CFLAGS-nscd_gethst_r.c = -fexceptions CFLAGS-nscd_getai.c = -fexceptions CFLAGS-nscd_initgroups.c = -fexceptions -CPPFLAGS-nscd += -D_FORTIFY_SOURCE=2 -DNOT_IN_libc +CPPFLAGS-nscd += -D_FORTIFY_SOURCE=2 ifeq (yesyes,$(have-fpie)$(build-shared)) CFLAGS-nscd += $(pie-ccflag) diff --git a/nss/Makefile b/nss/Makefile index 7114d74938..e0adf9008d 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -106,7 +106,6 @@ $(inst_vardbdir)/Makefile: db-Makefile $(+force) $(do-install) libof-nss_test1 = extramodules -CPPFLAGS-nss_test1 = -DNOT_IN_libc=1 $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) $(build-module) ifdef libnss_test1.so-version diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 5c39f05dfd..284b23620b 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -381,7 +381,7 @@ typedef struct re_dfa_t re_dfa_t; # endif #endif -#ifndef NOT_IN_libc +#if IS_IN (libc) static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, int new_buf_len) internal_function; @@ -731,7 +731,7 @@ re_string_wchar_at (const re_string_t *pstr, int idx) return (wint_t) pstr->wcs[idx]; } -# ifndef NOT_IN_libc +# if IS_IN (libc) # ifdef _LIBC # include <locale/weight.h> # endif diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index b4c86227f8..cde0229330 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -358,7 +358,7 @@ _res_hconf_init (void) } -#ifndef NOT_IN_libc +#if IS_IN (libc) # if defined SIOCGIFCONF && defined SIOCGIFNETMASK /* List of known interfaces. */ libc_freeres_ptr ( diff --git a/stdlib/Makefile b/stdlib/Makefile index da6e0764fc..76b7ca7faa 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -146,7 +146,6 @@ LDFLAGS-tst-putenv = $(no-as-needed) $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps) $(build-module) libof-tst-putenvmod = extramodules -CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1 $(objpfx)bug-getcontext: $(libm) $(objpfx)tst-strtod-round: $(libm) diff --git a/stdlib/isomac.c b/stdlib/isomac.c index 13accb566c..6fc97cd4f8 100644 --- a/stdlib/isomac.c +++ b/stdlib/isomac.c @@ -176,7 +176,8 @@ static char *macros[] = /* Format string to build command to invoke compiler. */ static const char fmt[] = "\ echo \"#include <%s>\" |\ -%s -E -dM -ansi -pedantic %s -D_LIBC -D_ISOMAC -DNOT_IN_libc -I. \ +%s -E -dM -ansi -pedantic %s -D_LIBC -D_ISOMAC \ +-DIN_MODULE=MODULE_extramodules -I. \ -isystem `%s --print-prog-name=include` - 2> /dev/null > %s"; @@ -305,7 +306,7 @@ get_null_defines (void) ; result[result_len] = xstrndup (start, end - start); - if (strcmp (result[result_len], "NOT_IN_libc") != 0) + if (strcmp (result[result_len], "IN_MODULE") != 0) { if (first) { diff --git a/sunrpc/Makefile b/sunrpc/Makefile index a2722af5f7..d7de8ae1da 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -166,7 +166,7 @@ $(cross-rpcgen-objs): $(objpfx)cross-%.o: %.c $(before-compile) $(objpfx)cross-rpcgen: $(cross-rpcgen-objs) $(BUILD_CC) $^ $(BUILD_LDFLAGS) -o $@ -# This makes sure -DNOT_IN_libc is passed for all these modules. +# This makes sure -DIN_MODULE is passed for all these modules. cpp-srcs-left := $(rpcgen-objs:.o=.c) lib := nonlib include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) diff --git a/sysdeps/arm/armv7/multiarch/memcpy.S b/sysdeps/arm/armv7/multiarch/memcpy.S index c4f4e80fb0..3439cb7a2c 100644 --- a/sysdeps/arm/armv7/multiarch/memcpy.S +++ b/sysdeps/arm/armv7/multiarch/memcpy.S @@ -22,7 +22,7 @@ #include <sysdep.h> #include <rtld-global-offsets.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) /* Under __ARM_NEON__, memcpy_neon.S defines the name memcpy. */ # ifndef __ARM_NEON__ .text diff --git a/sysdeps/arm/memmove.S b/sysdeps/arm/memmove.S index 04aa7db7b4..488e1562a3 100644 --- a/sysdeps/arm/memmove.S +++ b/sysdeps/arm/memmove.S @@ -69,7 +69,7 @@ ENTRY(memmove) subs ip, r0, r1 cmphi r2, ip -#ifdef NOT_IN_libc +#if !IS_IN (libc) bls memcpy #else bls HIDDEN_JUMPTARGET(memcpy) diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h index bc86d5a4e6..62f74eb49e 100644 --- a/sysdeps/arm/sysdep.h +++ b/sysdeps/arm/sysdep.h @@ -344,7 +344,7 @@ /* Pointer mangling support. */ #if (IS_IN (rtld) || \ - (!defined SHARED && (!defined NOT_IN_libc || IS_IN (libpthread)))) + (!defined SHARED && (IS_IN (libc) || IS_IN (libpthread)))) # ifdef __ASSEMBLER__ # define PTR_MANGLE_LOAD(guard, tmp) \ LDR_HIDDEN (guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local), 0) diff --git a/sysdeps/generic/_itoa.h b/sysdeps/generic/_itoa.h index 8360bafe70..ed84e56ae4 100644 --- a/sysdeps/generic/_itoa.h +++ b/sysdeps/generic/_itoa.h @@ -46,12 +46,12 @@ extern char *_itoa (unsigned long long int value, char *buflim, extern const char _itoa_upper_digits[]; extern const char _itoa_lower_digits[]; -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) hidden_proto (_itoa_upper_digits) hidden_proto (_itoa_lower_digits) #endif -#ifndef NOT_IN_libc +#if IS_IN (libc) extern char *_itoa_word (_ITOA_WORD_TYPE value, char *buflim, unsigned int base, int upper_case); #else diff --git a/sysdeps/generic/symbol-hacks.h b/sysdeps/generic/symbol-hacks.h index 6bec24b7a0..ce576c9fd2 100644 --- a/sysdeps/generic/symbol-hacks.h +++ b/sysdeps/generic/symbol-hacks.h @@ -1,6 +1,6 @@ /* Some compiler optimizations may transform loops into memset/memmove calls and without proper declaration it may generate PLT calls. */ -#if !defined __ASSEMBLER__ && !defined NOT_IN_libc && defined SHARED +#if !defined __ASSEMBLER__ && IS_IN (libc) && defined SHARED asm ("memmove = __GI_memmove"); asm ("memset = __GI_memset"); asm ("memcpy = __GI_memcpy"); diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile index b5b2cf0562..ba495ed236 100644 --- a/sysdeps/gnu/Makefile +++ b/sysdeps/gnu/Makefile @@ -40,7 +40,7 @@ $(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \ endif $(make-target-directory) $(AWK) -v maxerr=`\ - $(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -DEMIT_ERR_MAX $< -o - \ + $(CC) -S $(CPPFLAGS) $(CFLAGS) -DEMIT_ERR_MAX $< -o - \ | sed -n 's/^.*@@@[^0-9]*\([0-9]*\)[^0-9]*@@@.*$$/\1/p'` \ -f $(..)sysdeps/gnu/errlist-compat.awk \ $(wildcard $(sysdirs:=/Versions)) > $@T diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk index 7fa53053ae..6da844a246 100644 --- a/sysdeps/gnu/errlist.awk +++ b/sysdeps/gnu/errlist.awk @@ -110,7 +110,7 @@ END { print " (sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0])"; print "const int _sys_nerr_internal = NERR;" print ""; - print "#if !defined NOT_IN_libc && !defined ERRLIST_NO_COMPAT"; + print "#if IS_IN (libc) && !defined ERRLIST_NO_COMPAT"; print "# include <errlist-compat.c>"; print "#endif"; print ""; diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c index 8381434c2c..a9a5960503 100644 --- a/sysdeps/gnu/errlist.c +++ b/sysdeps/gnu/errlist.c @@ -1480,7 +1480,7 @@ TRANS error; @pxref{Cancel AIO Operations}. */ (sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0]) const int _sys_nerr_internal = NERR; -#if !defined NOT_IN_libc && !defined ERRLIST_NO_COMPAT +#if IS_IN (libc) && !defined ERRLIST_NO_COMPAT # include <errlist-compat.c> #endif diff --git a/sysdeps/i386/i586/memcpy.S b/sysdeps/i386/i586/memcpy.S index edd9f08723..6e0cc4c76b 100644 --- a/sysdeps/i386/i586/memcpy.S +++ b/sysdeps/i386/i586/memcpy.S @@ -32,7 +32,7 @@ #define LEN SRC+4 .text -#if defined PIC && !defined NOT_IN_libc +#if defined PIC && IS_IN (libc) ENTRY (__memcpy_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) diff --git a/sysdeps/i386/i586/memset.S b/sysdeps/i386/i586/memset.S index 910d7bbb99..50b498b6ab 100644 --- a/sysdeps/i386/i586/memset.S +++ b/sysdeps/i386/i586/memset.S @@ -35,7 +35,7 @@ #endif .text -#if defined PIC && !defined NOT_IN_libc && !BZERO_P +#if defined PIC && IS_IN (libc) && !BZERO_P ENTRY (__memset_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) diff --git a/sysdeps/i386/i686/memcpy.S b/sysdeps/i386/i686/memcpy.S index 17e815e901..6a150048c6 100644 --- a/sysdeps/i386/i686/memcpy.S +++ b/sysdeps/i386/i686/memcpy.S @@ -28,7 +28,7 @@ #define LEN SRC+4 .text -#if defined PIC && !defined NOT_IN_libc +#if defined PIC && IS_IN (libc) ENTRY_CHK (__memcpy_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S index 4b8785f22c..561f2fc837 100644 --- a/sysdeps/i386/i686/memmove.S +++ b/sysdeps/i386/i686/memmove.S @@ -35,7 +35,7 @@ # define SRC DEST+4 # define LEN SRC+4 -# if defined PIC && !defined NOT_IN_libc +# if defined PIC && IS_IN (libc) ENTRY_CHK (__memmove_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) diff --git a/sysdeps/i386/i686/mempcpy.S b/sysdeps/i386/i686/mempcpy.S index ec4b42b8d7..8e51a1390b 100644 --- a/sysdeps/i386/i686/mempcpy.S +++ b/sysdeps/i386/i686/mempcpy.S @@ -28,7 +28,7 @@ #define LEN SRC+4 .text -#if defined PIC && !defined NOT_IN_libc +#if defined PIC && IS_IN (libc) ENTRY_CHK (__mempcpy_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) diff --git a/sysdeps/i386/i686/memset.S b/sysdeps/i386/i686/memset.S index 72d21fa92d..877bdda290 100644 --- a/sysdeps/i386/i686/memset.S +++ b/sysdeps/i386/i686/memset.S @@ -36,7 +36,7 @@ #endif .text -#if defined PIC && !defined NOT_IN_libc && !BZERO_P +#if defined PIC && IS_IN (libc) && !BZERO_P ENTRY_CHK (__memset_chk) movl 12(%esp), %eax cmpl %eax, 16(%esp) @@ -99,7 +99,7 @@ ENTRY (memset) END (memset) libc_hidden_builtin_def (memset) -#if defined PIC && !defined NOT_IN_libc && !BZERO_P +#if defined PIC && IS_IN (libc) && !BZERO_P strong_alias (__memset_chk, __memset_zero_constant_len_parameter) .section .gnu.warning.__memset_zero_constant_len_parameter .string "memset used with constant zero length parameter; this could be due to transposed parameters" diff --git a/sysdeps/i386/i686/multiarch/bcopy.S b/sysdeps/i386/i686/multiarch/bcopy.S index 4f50035d0a..a0fca885ee 100644 --- a/sysdeps/i386/i686/multiarch/bcopy.S +++ b/sysdeps/i386/i686/multiarch/bcopy.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in lib. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(bcopy) diff --git a/sysdeps/i386/i686/multiarch/bzero.S b/sysdeps/i386/i686/multiarch/bzero.S index cd59940f9c..2dc1d8a436 100644 --- a/sysdeps/i386/i686/multiarch/bzero.S +++ b/sysdeps/i386/i686/multiarch/bzero.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in lib. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(__bzero) diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S index 8f5ccca195..a0083a325c 100644 --- a/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S +++ b/sysdeps/i386/i686/multiarch/memchr-sse2-bsf.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S index 8d2c159cea..59a8a7caae 100644 --- a/sysdeps/i386/i686/multiarch/memchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/memchr.S b/sysdeps/i386/i686/multiarch/memchr.S index 1bdf0e7968..b2a22f384d 100644 --- a/sysdeps/i386/i686/multiarch/memchr.S +++ b/sysdeps/i386/i686/multiarch/memchr.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # define CFI_POP(REG) \ cfi_adjust_cfa_offset (-4); \ cfi_restore (REG) diff --git a/sysdeps/i386/i686/multiarch/memcmp-sse4.S b/sysdeps/i386/i686/multiarch/memcmp-sse4.S index a23861556a..570fec0424 100644 --- a/sysdeps/i386/i686/multiarch/memcmp-sse4.S +++ b/sysdeps/i386/i686/multiarch/memcmp-sse4.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/memcmp-ssse3.S b/sysdeps/i386/i686/multiarch/memcmp-ssse3.S index 4a0bd6727a..546342892a 100644 --- a/sysdeps/i386/i686/multiarch/memcmp-ssse3.S +++ b/sysdeps/i386/i686/multiarch/memcmp-ssse3.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/memcmp.S b/sysdeps/i386/i686/multiarch/memcmp.S index e4d56fa28f..1c5e30c0fc 100644 --- a/sysdeps/i386/i686/multiarch/memcmp.S +++ b/sysdeps/i386/i686/multiarch/memcmp.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(memcmp) diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S index c4cdcfdbe3..a7a8f982fc 100644 --- a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S +++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S @@ -19,7 +19,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc \ +#if IS_IN (libc) \ && (defined SHARED \ || defined USE_AS_MEMMOVE \ || !defined USE_MULTIARCH) diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S index c0d718b8aa..d190ba02e8 100644 --- a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S +++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined NOT_IN_libc \ +#if IS_IN (libc) \ && (defined SHARED \ || defined USE_AS_MEMMOVE \ || !defined USE_MULTIARCH) diff --git a/sysdeps/i386/i686/multiarch/memcpy.S b/sysdeps/i386/i686/multiarch/memcpy.S index f583482bd7..76195a52eb 100644 --- a/sysdeps/i386/i686/multiarch/memcpy.S +++ b/sysdeps/i386/i686/multiarch/memcpy.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in lib and for DSO. In static binaries we need memcpy before the initialization happened. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) .text ENTRY(memcpy) .type memcpy, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/memcpy_chk.S b/sysdeps/i386/i686/multiarch/memcpy_chk.S index bf93b68fa4..c67968ea6c 100644 --- a/sysdeps/i386/i686/multiarch/memcpy_chk.S +++ b/sysdeps/i386/i686/multiarch/memcpy_chk.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in lib and for DSO. There are no multiarch memcpy functions for static binaries. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(__memcpy_chk) diff --git a/sysdeps/i386/i686/multiarch/memmove.S b/sysdeps/i386/i686/multiarch/memmove.S index 90cf16770f..d8de7c6894 100644 --- a/sysdeps/i386/i686/multiarch/memmove.S +++ b/sysdeps/i386/i686/multiarch/memmove.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in lib. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(memmove) diff --git a/sysdeps/i386/i686/multiarch/memmove_chk.S b/sysdeps/i386/i686/multiarch/memmove_chk.S index 182aeb3d46..3442ce15f1 100644 --- a/sysdeps/i386/i686/multiarch/memmove_chk.S +++ b/sysdeps/i386/i686/multiarch/memmove_chk.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in lib. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(__memmove_chk) diff --git a/sysdeps/i386/i686/multiarch/mempcpy.S b/sysdeps/i386/i686/multiarch/mempcpy.S index 56b50bb2fc..3aab63d172 100644 --- a/sysdeps/i386/i686/multiarch/mempcpy.S +++ b/sysdeps/i386/i686/multiarch/mempcpy.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in lib and for DSO. In static binaries we need mempcpy before the initialization happened. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) .text ENTRY(__mempcpy) .type __mempcpy, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S b/sysdeps/i386/i686/multiarch/mempcpy_chk.S index a76341c0e3..5d81f4ee2d 100644 --- a/sysdeps/i386/i686/multiarch/mempcpy_chk.S +++ b/sysdeps/i386/i686/multiarch/mempcpy_chk.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in lib and for DSO. There are no multiarch mempcpy functions for static binaries. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(__mempcpy_chk) diff --git a/sysdeps/i386/i686/multiarch/memrchr-c.c b/sysdeps/i386/i686/multiarch/memrchr-c.c index 44ec1a6ed9..ef7bbbe792 100644 --- a/sysdeps/i386/i686/multiarch/memrchr-c.c +++ b/sysdeps/i386/i686/multiarch/memrchr-c.c @@ -1,4 +1,4 @@ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define MEMRCHR __memrchr_ia32 # include <string.h> extern void *__memrchr_ia32 (const void *, int, size_t); diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S index 303ef9dd62..bc6277508c 100644 --- a/sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S +++ b/sysdeps/i386/i686/multiarch/memrchr-sse2-bsf.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S index 90ba738498..ef605d1c28 100644 --- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> # define CFI_PUSH(REG) \ diff --git a/sysdeps/i386/i686/multiarch/memrchr.S b/sysdeps/i386/i686/multiarch/memrchr.S index 0dff8b6e80..5ffcc2623c 100644 --- a/sysdeps/i386/i686/multiarch/memrchr.S +++ b/sysdeps/i386/i686/multiarch/memrchr.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # define CFI_POP(REG) \ cfi_adjust_cfa_offset (-4); \ cfi_restore (REG) diff --git a/sysdeps/i386/i686/multiarch/memset-sse2-rep.S b/sysdeps/i386/i686/multiarch/memset-sse2-rep.S index 8655a8c5b4..2a064a1ad0 100644 --- a/sysdeps/i386/i686/multiarch/memset-sse2-rep.S +++ b/sysdeps/i386/i686/multiarch/memset-sse2-rep.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) #include <sysdep.h> #include "asm-syntax.h" @@ -79,7 +79,7 @@ #endif .section .text.sse2,"ax",@progbits -#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BZERO +#if defined SHARED && IS_IN (libc) && !defined USE_AS_BZERO ENTRY (__memset_chk_sse2_rep) movl 12(%esp), %eax cmpl %eax, 16(%esp) diff --git a/sysdeps/i386/i686/multiarch/memset-sse2.S b/sysdeps/i386/i686/multiarch/memset-sse2.S index cd94e4e7b9..a48f9fae1b 100644 --- a/sysdeps/i386/i686/multiarch/memset-sse2.S +++ b/sysdeps/i386/i686/multiarch/memset-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) #include <sysdep.h> #include "asm-syntax.h" @@ -79,7 +79,7 @@ #endif .section .text.sse2,"ax",@progbits -#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BZERO +#if defined SHARED && IS_IN (libc) && !defined USE_AS_BZERO ENTRY (__memset_chk_sse2) movl 12(%esp), %eax cmpl %eax, 16(%esp) diff --git a/sysdeps/i386/i686/multiarch/memset.S b/sysdeps/i386/i686/multiarch/memset.S index ecec1ead46..c818002cdc 100644 --- a/sysdeps/i386/i686/multiarch/memset.S +++ b/sysdeps/i386/i686/multiarch/memset.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in lib. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(memset) diff --git a/sysdeps/i386/i686/multiarch/memset_chk.S b/sysdeps/i386/i686/multiarch/memset_chk.S index 92c6099590..f9805206c7 100644 --- a/sysdeps/i386/i686/multiarch/memset_chk.S +++ b/sysdeps/i386/i686/multiarch/memset_chk.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in lib. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(__memset_chk) diff --git a/sysdeps/i386/i686/multiarch/rawmemchr.S b/sysdeps/i386/i686/multiarch/rawmemchr.S index 01850cf904..db4d461054 100644 --- a/sysdeps/i386/i686/multiarch/rawmemchr.S +++ b/sysdeps/i386/i686/multiarch/rawmemchr.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # define CFI_POP(REG) \ cfi_adjust_cfa_offset (-4); \ cfi_restore (REG) diff --git a/sysdeps/i386/i686/multiarch/strcat-sse2.S b/sysdeps/i386/i686/multiarch/strcat-sse2.S index efd3f67a39..ae82e9a9f7 100644 --- a/sysdeps/i386/i686/multiarch/strcat-sse2.S +++ b/sysdeps/i386/i686/multiarch/strcat-sse2.S @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strcat-ssse3.S b/sysdeps/i386/i686/multiarch/strcat-ssse3.S index 8527166f75..0c506c1a68 100644 --- a/sysdeps/i386/i686/multiarch/strcat-ssse3.S +++ b/sysdeps/i386/i686/multiarch/strcat-ssse3.S @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strcat.S b/sysdeps/i386/i686/multiarch/strcat.S index 598c3f0a58..267ad13ef2 100644 --- a/sysdeps/i386/i686/multiarch/strcat.S +++ b/sysdeps/i386/i686/multiarch/strcat.S @@ -43,7 +43,7 @@ /* Define multiple versions only for the definition in libc. Don't define multiple versions for strncat in static library since we need strncat before the initialization happened. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text diff --git a/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S index 3357f53f56..9ab6c82400 100644 --- a/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S +++ b/sysdeps/i386/i686/multiarch/strchr-sse2-bsf.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strchr-sse2.S b/sysdeps/i386/i686/multiarch/strchr-sse2.S index e0f3a2edf4..37867afeb6 100644 --- a/sysdeps/i386/i686/multiarch/strchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/strchr-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strchr.S b/sysdeps/i386/i686/multiarch/strchr.S index 0fc4d8c293..cc0ab9d146 100644 --- a/sysdeps/i386/i686/multiarch/strchr.S +++ b/sysdeps/i386/i686/multiarch/strchr.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(strchr) .type strchr, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/strcmp-sse4.S b/sysdeps/i386/i686/multiarch/strcmp-sse4.S index 42d308a923..ad15aa8e0f 100644 --- a/sysdeps/i386/i686/multiarch/strcmp-sse4.S +++ b/sysdeps/i386/i686/multiarch/strcmp-sse4.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) #include <sysdep.h> #include "asm-syntax.h" diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S index c3107e50ef..1b32a8dfe3 100644 --- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S +++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) #include <sysdep.h> #include "asm-syntax.h" diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S index 23cbd6f3c5..536e87e7c8 100644 --- a/sysdeps/i386/i686/multiarch/strcmp.S +++ b/sysdeps/i386/i686/multiarch/strcmp.S @@ -50,7 +50,7 @@ /* Define multiple versions only for the definition in libc. Don't define multiple versions for strncmp in static library since we need strncmp before the initialization happened. */ -#if (defined SHARED || !defined USE_AS_STRNCMP) && !defined NOT_IN_libc +#if (defined SHARED || !defined USE_AS_STRNCMP) && IS_IN (libc) # ifdef SHARED .text ENTRY(STRCMP) diff --git a/sysdeps/i386/i686/multiarch/strcpy-sse2.S b/sysdeps/i386/i686/multiarch/strcpy-sse2.S index cbe040caf8..640fd06422 100644 --- a/sysdeps/i386/i686/multiarch/strcpy-sse2.S +++ b/sysdeps/i386/i686/multiarch/strcpy-sse2.S @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strcpy-ssse3.S b/sysdeps/i386/i686/multiarch/strcpy-ssse3.S index 2d67994816..ad3f7faa99 100644 --- a/sysdeps/i386/i686/multiarch/strcpy-ssse3.S +++ b/sysdeps/i386/i686/multiarch/strcpy-ssse3.S @@ -18,7 +18,7 @@ <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifndef USE_AS_STRCAT # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strcpy.S b/sysdeps/i386/i686/multiarch/strcpy.S index f44ddf7ec4..54e5b24fe7 100644 --- a/sysdeps/i386/i686/multiarch/strcpy.S +++ b/sysdeps/i386/i686/multiarch/strcpy.S @@ -59,7 +59,7 @@ /* Define multiple versions only for the definition in libc. Don't define multiple versions for strncpy in static library since we need strncpy before the initialization happened. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text diff --git a/sysdeps/i386/i686/multiarch/strcspn.S b/sysdeps/i386/i686/multiarch/strcspn.S index c35f4bfc3b..d60874be24 100644 --- a/sysdeps/i386/i686/multiarch/strcspn.S +++ b/sysdeps/i386/i686/multiarch/strcspn.S @@ -41,7 +41,7 @@ /* Define multiple versions only for the definition in libc. Don't define multiple versions for strpbrk in static library since we need strpbrk before the initialization happened. */ -#if (defined SHARED || !defined USE_AS_STRPBRK) && !defined NOT_IN_libc +#if (defined SHARED || !defined USE_AS_STRPBRK) && IS_IN (libc) # ifdef SHARED .text ENTRY(STRCSPN) diff --git a/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S index 8f9b149de0..76179464b0 100644 --- a/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S +++ b/sysdeps/i386/i686/multiarch/strlen-sse2-bsf.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) #include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strlen-sse2.S b/sysdeps/i386/i686/multiarch/strlen-sse2.S index 20e82a6104..b2f8973546 100644 --- a/sysdeps/i386/i686/multiarch/strlen-sse2.S +++ b/sysdeps/i386/i686/multiarch/strlen-sse2.S @@ -19,7 +19,7 @@ /* for strlen only SHARED version is optimized, for strcat, strncat, strnlen both STATIC and SHARED are optimized */ -#if (defined USE_AS_STRNLEN || defined USE_AS_STRCAT || defined SHARED) && !defined NOT_IN_libc +#if (defined USE_AS_STRNLEN || defined USE_AS_STRCAT || defined SHARED) && IS_IN (libc) # ifndef USE_AS_STRCAT diff --git a/sysdeps/i386/i686/multiarch/strlen.S b/sysdeps/i386/i686/multiarch/strlen.S index 5b262a2ef2..6d4eb68a73 100644 --- a/sysdeps/i386/i686/multiarch/strlen.S +++ b/sysdeps/i386/i686/multiarch/strlen.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in libc and for the DSO. In static binaries, we need strlen before the initialization happened. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) .text ENTRY(strlen) .type strlen, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/strnlen.S b/sysdeps/i386/i686/multiarch/strnlen.S index 63357d7267..73854d5d8f 100644 --- a/sysdeps/i386/i686/multiarch/strnlen.S +++ b/sysdeps/i386/i686/multiarch/strnlen.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(__strnlen) .type __strnlen, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S b/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S index 622b9f2fe6..09724b5da3 100644 --- a/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S +++ b/sysdeps/i386/i686/multiarch/strrchr-sse2-bsf.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strrchr-sse2.S b/sysdeps/i386/i686/multiarch/strrchr-sse2.S index 1644d5d080..6cfb9a333e 100644 --- a/sysdeps/i386/i686/multiarch/strrchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/strrchr-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/strrchr.S b/sysdeps/i386/i686/multiarch/strrchr.S index 323f3f49ca..24c049336c 100644 --- a/sysdeps/i386/i686/multiarch/strrchr.S +++ b/sysdeps/i386/i686/multiarch/strrchr.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(strrchr) .type strrchr, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/strspn.S b/sysdeps/i386/i686/multiarch/strspn.S index 703fc174b0..e55e224be1 100644 --- a/sysdeps/i386/i686/multiarch/strspn.S +++ b/sysdeps/i386/i686/multiarch/strspn.S @@ -26,7 +26,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(strspn) diff --git a/sysdeps/i386/i686/multiarch/wcschr-c.c b/sysdeps/i386/i686/multiarch/wcschr-c.c index c23af26201..4c5f0f6b25 100644 --- a/sysdeps/i386/i686/multiarch/wcschr-c.c +++ b/sysdeps/i386/i686/multiarch/wcschr-c.c @@ -1,6 +1,6 @@ #include <wchar.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED # undef libc_hidden_def # define libc_hidden_def(name) \ diff --git a/sysdeps/i386/i686/multiarch/wcschr-sse2.S b/sysdeps/i386/i686/multiarch/wcschr-sse2.S index 332bdb00be..f0294bcda2 100644 --- a/sysdeps/i386/i686/multiarch/wcschr-sse2.S +++ b/sysdeps/i386/i686/multiarch/wcschr-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> # define CFI_PUSH(REG) \ diff --git a/sysdeps/i386/i686/multiarch/wcschr.S b/sysdeps/i386/i686/multiarch/wcschr.S index 7622085984..9a80a33618 100644 --- a/sysdeps/i386/i686/multiarch/wcschr.S +++ b/sysdeps/i386/i686/multiarch/wcschr.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(wcschr) .type wcschr, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/wcscmp-sse2.S b/sysdeps/i386/i686/multiarch/wcscmp-sse2.S index 926bdcf876..6e273d2930 100644 --- a/sysdeps/i386/i686/multiarch/wcscmp-sse2.S +++ b/sysdeps/i386/i686/multiarch/wcscmp-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/i386/i686/multiarch/wcscmp.S b/sysdeps/i386/i686/multiarch/wcscmp.S index 37dd07fa9e..ed36d6b58e 100644 --- a/sysdeps/i386/i686/multiarch/wcscmp.S +++ b/sysdeps/i386/i686/multiarch/wcscmp.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in libc and for the DSO. In static binaries, we need wcscmp before the initialization happened. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(wcscmp) .type wcscmp, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/wcscpy-c.c b/sysdeps/i386/i686/multiarch/wcscpy-c.c index a3c4024c01..fb3000392b 100644 --- a/sysdeps/i386/i686/multiarch/wcscpy-c.c +++ b/sysdeps/i386/i686/multiarch/wcscpy-c.c @@ -1,4 +1,4 @@ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define wcscpy __wcscpy_ia32 #endif diff --git a/sysdeps/i386/i686/multiarch/wcscpy-ssse3.S b/sysdeps/i386/i686/multiarch/wcscpy-ssse3.S index f404252a61..8b2f910be8 100644 --- a/sysdeps/i386/i686/multiarch/wcscpy-ssse3.S +++ b/sysdeps/i386/i686/multiarch/wcscpy-ssse3.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> # define CFI_PUSH(REG) \ diff --git a/sysdeps/i386/i686/multiarch/wcscpy.S b/sysdeps/i386/i686/multiarch/wcscpy.S index 54a432599f..b87500c9bb 100644 --- a/sysdeps/i386/i686/multiarch/wcscpy.S +++ b/sysdeps/i386/i686/multiarch/wcscpy.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(wcscpy) .type wcscpy, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/wcslen-c.c b/sysdeps/i386/i686/multiarch/wcslen-c.c index 8cebfea0e4..a335dc0f7e 100644 --- a/sysdeps/i386/i686/multiarch/wcslen-c.c +++ b/sysdeps/i386/i686/multiarch/wcslen-c.c @@ -1,6 +1,6 @@ #include <wchar.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # define WCSLEN __wcslen_ia32 #endif diff --git a/sysdeps/i386/i686/multiarch/wcslen-sse2.S b/sysdeps/i386/i686/multiarch/wcslen-sse2.S index 8e94545c04..70b73b4825 100644 --- a/sysdeps/i386/i686/multiarch/wcslen-sse2.S +++ b/sysdeps/i386/i686/multiarch/wcslen-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> # define STR 4 diff --git a/sysdeps/i386/i686/multiarch/wcslen.S b/sysdeps/i386/i686/multiarch/wcslen.S index ba97cc49d6..d42a419481 100644 --- a/sysdeps/i386/i686/multiarch/wcslen.S +++ b/sysdeps/i386/i686/multiarch/wcslen.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(__wcslen) .type __wcslen, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/wcsrchr-c.c b/sysdeps/i386/i686/multiarch/wcsrchr-c.c index c7444ce89b..8d8a335b5b 100644 --- a/sysdeps/i386/i686/multiarch/wcsrchr-c.c +++ b/sysdeps/i386/i686/multiarch/wcsrchr-c.c @@ -1,4 +1,4 @@ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define wcsrchr __wcsrchr_ia32 #endif diff --git a/sysdeps/i386/i686/multiarch/wcsrchr-sse2.S b/sysdeps/i386/i686/multiarch/wcsrchr-sse2.S index f6abd6b192..0e1b291c19 100644 --- a/sysdeps/i386/i686/multiarch/wcsrchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/wcsrchr-sse2.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> # define CFI_PUSH(REG) \ cfi_adjust_cfa_offset (4); \ diff --git a/sysdeps/i386/i686/multiarch/wcsrchr.S b/sysdeps/i386/i686/multiarch/wcsrchr.S index 4d80b54f2e..3ab1735059 100644 --- a/sysdeps/i386/i686/multiarch/wcsrchr.S +++ b/sysdeps/i386/i686/multiarch/wcsrchr.S @@ -21,7 +21,7 @@ #include <sysdep.h> #include <init-arch.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(wcsrchr) .type wcsrchr, @gnu_indirect_function diff --git a/sysdeps/i386/i686/multiarch/wmemcmp-c.c b/sysdeps/i386/i686/multiarch/wmemcmp-c.c index bd37660fcb..75ab4b94c1 100644 --- a/sysdeps/i386/i686/multiarch/wmemcmp-c.c +++ b/sysdeps/i386/i686/multiarch/wmemcmp-c.c @@ -1,6 +1,6 @@ #include <wchar.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # define WMEMCMP __wmemcmp_ia32 #endif diff --git a/sysdeps/i386/i686/multiarch/wmemcmp.S b/sysdeps/i386/i686/multiarch/wmemcmp.S index 1b5a211982..6790fa448f 100644 --- a/sysdeps/i386/i686/multiarch/wmemcmp.S +++ b/sysdeps/i386/i686/multiarch/wmemcmp.S @@ -23,7 +23,7 @@ /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(wmemcmp) .type wmemcmp, @gnu_indirect_function diff --git a/sysdeps/ia64/fpu/libm-symbols.h b/sysdeps/ia64/fpu/libm-symbols.h index 0df807601c..3cbc6c41b0 100644 --- a/sysdeps/ia64/fpu/libm-symbols.h +++ b/sysdeps/ia64/fpu/libm-symbols.h @@ -53,6 +53,6 @@ ASM_SIZE_DIRECTIVE(__ieee754_##name); \ .type __ieee754_##name, @function -#if defined ASSEMBLER && !defined NOT_IN_libc +#if defined ASSEMBLER && IS_IN (libc) # define __libm_error_support HIDDEN_JUMPTARGET(__libm_error_support) #endif diff --git a/sysdeps/nptl/bits/libc-lock.h b/sysdeps/nptl/bits/libc-lock.h index 2acc6bfcd0..d9a82ad962 100644 --- a/sysdeps/nptl/bits/libc-lock.h +++ b/sysdeps/nptl/bits/libc-lock.h @@ -26,7 +26,7 @@ /* Mutex type. */ #if defined _LIBC || defined _IO_MTSAFE_IO -# if (defined NOT_IN_libc && !IS_IN (libpthread)) || !defined _LIBC +# if (!IS_IN (libc) && !IS_IN (libpthread)) || !defined _LIBC typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t; # else typedef struct { int lock; int cnt; void *owner; } __libc_lock_recursive_t; @@ -47,7 +47,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; /* Define an initialized recursive lock variable NAME with storage class CLASS. */ -#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) +#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) # define __libc_lock_define_initialized_recursive(CLASS, NAME) \ CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER; # define _LIBC_LOCK_RECURSIVE_INITIALIZER \ @@ -60,7 +60,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Initialize a recursive mutex. */ -#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) +#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) # define __libc_lock_init_recursive(NAME) \ ((void) ((NAME) = (__libc_lock_recursive_t) _LIBC_LOCK_RECURSIVE_INITIALIZER)) #else @@ -78,7 +78,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Finalize recursive named lock. */ -#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) +#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) # define __libc_lock_fini_recursive(NAME) ((void) 0) #else # define __libc_lock_fini_recursive(NAME) \ @@ -86,7 +86,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Lock the recursive named lock variable. */ -#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) +#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) # define __libc_lock_lock_recursive(NAME) \ do { \ void *self = THREAD_SELF; \ @@ -103,7 +103,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Try to lock the recursive named lock variable. */ -#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) +#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) # define __libc_lock_trylock_recursive(NAME) \ ({ \ int result = 0; \ @@ -128,7 +128,7 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #endif /* Unlock the recursive named lock variable. */ -#if defined _LIBC && (!defined NOT_IN_libc || IS_IN (libpthread)) +#if defined _LIBC && (IS_IN (libc) || IS_IN (libpthread)) /* We do no error checking here. */ # define __libc_lock_unlock_recursive(NAME) \ do { \ diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h index ae17507c99..78c545382b 100644 --- a/sysdeps/nptl/bits/libc-lockP.h +++ b/sysdeps/nptl/bits/libc-lockP.h @@ -35,7 +35,7 @@ #include <pthread-functions.h> /* Mutex type. */ -#if defined NOT_IN_libc && !IS_IN (libpthread) +#if !IS_IN (libc) && !IS_IN (libpthread) typedef pthread_mutex_t __libc_lock_t; #else typedef int __libc_lock_t; @@ -69,7 +69,7 @@ typedef pthread_key_t __libc_key_t; initialized locks must be set to one due to the lack of normal atomic operations.) */ -#if !defined NOT_IN_libc || IS_IN (libpthread) +#if IS_IN (libc) || IS_IN (libpthread) # if LLL_LOCK_INITIALIZER == 0 # define __libc_lock_define_initialized(CLASS,NAME) \ CLASS __libc_lock_t NAME; @@ -108,7 +108,7 @@ typedef pthread_key_t __libc_key_t; #endif /* Call thread functions through the function pointer table. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # define PTFAVAIL(NAME) __libc_pthread_functions_init # define __libc_ptf_call(FUNC, ARGS, ELSE) \ (__libc_pthread_functions_init ? PTHFCT_CALL (ptr_##FUNC, ARGS) : ELSE) @@ -125,14 +125,14 @@ typedef pthread_key_t __libc_key_t; /* Initialize the named lock variable, leaving it in a consistent, unlocked state. */ -#if !defined NOT_IN_libc || IS_IN (libpthread) +#if IS_IN (libc) || IS_IN (libpthread) # define __libc_lock_init(NAME) \ ((void) ((NAME) = LLL_LOCK_INITIALIZER)) #else # define __libc_lock_init(NAME) \ __libc_maybe_call (__pthread_mutex_init, (&(NAME), NULL), 0) #endif -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) /* ((NAME) = (__libc_rwlock_t) PTHREAD_RWLOCK_INITIALIZER) is inefficient. */ # define __libc_rwlock_init(NAME) \ ((void) __builtin_memset (&(NAME), '\0', sizeof (NAME))) @@ -144,13 +144,13 @@ typedef pthread_key_t __libc_key_t; /* Finalize the named lock variable, which must be locked. It cannot be used again until __libc_lock_init is called again on it. This must be called on a lock variable before the containing storage is reused. */ -#if !defined NOT_IN_libc || IS_IN (libpthread) +#if IS_IN (libc) || IS_IN (libpthread) # define __libc_lock_fini(NAME) ((void) 0) #else # define __libc_lock_fini(NAME) \ __libc_maybe_call (__pthread_mutex_destroy, (&(NAME)), 0) #endif -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # define __libc_rwlock_fini(NAME) ((void) 0) #else # define __libc_rwlock_fini(NAME) \ @@ -158,7 +158,7 @@ typedef pthread_key_t __libc_key_t; #endif /* Lock the named lock variable. */ -#if !defined NOT_IN_libc || IS_IN (libpthread) +#if IS_IN (libc) || IS_IN (libpthread) # ifndef __libc_lock_lock # define __libc_lock_lock(NAME) \ ({ lll_lock (NAME, LLL_PRIVATE); 0; }) @@ -174,7 +174,7 @@ typedef pthread_key_t __libc_key_t; __libc_ptf_call (__pthread_rwlock_wrlock, (&(NAME)), 0) /* Try to lock the named lock variable. */ -#if !defined NOT_IN_libc || IS_IN (libpthread) +#if IS_IN (libc) || IS_IN (libpthread) # ifndef __libc_lock_trylock # define __libc_lock_trylock(NAME) \ lll_trylock (NAME) @@ -193,7 +193,7 @@ typedef pthread_key_t __libc_key_t; __libc_maybe_call (__pthread_mutex_trylock, (&(NAME).mutex), 0) /* Unlock the named lock variable. */ -#if !defined NOT_IN_libc || IS_IN (libpthread) +#if IS_IN (libc) || IS_IN (libpthread) # define __libc_lock_unlock(NAME) \ lll_unlock (NAME, LLL_PRIVATE) #else diff --git a/sysdeps/nptl/bits/stdio-lock.h b/sysdeps/nptl/bits/stdio-lock.h index 269df5e55e..848f417673 100644 --- a/sysdeps/nptl/bits/stdio-lock.h +++ b/sysdeps/nptl/bits/stdio-lock.h @@ -84,7 +84,7 @@ typedef struct { int lock; int cnt; void *owner; } _IO_lock_t; #define _IO_cleanup_region_end(_doit) \ __libc_cleanup_region_end (_doit) -#if defined _LIBC && !defined NOT_IN_libc +#if defined _LIBC && IS_IN (libc) # ifdef __EXCEPTIONS # define _IO_acquire_lock(_fp) \ diff --git a/sysdeps/posix/closedir.c b/sysdeps/posix/closedir.c index 24ba1a5c42..0b57a0dff1 100644 --- a/sysdeps/posix/closedir.c +++ b/sysdeps/posix/closedir.c @@ -43,7 +43,7 @@ __closedir (DIR *dirp) fd = dirp->fd; -#ifndef NOT_IN_libc +#if IS_IN (libc) __libc_lock_fini (dirp->lock); #endif diff --git a/sysdeps/posix/opendir.c b/sysdeps/posix/opendir.c index be234bda8c..1ae5c0dafb 100644 --- a/sysdeps/posix/opendir.c +++ b/sysdeps/posix/opendir.c @@ -224,7 +224,7 @@ __alloc_dir (int fd, bool close_fd, int flags, const struct stat64 *statp) } dirp->fd = fd; -#ifndef NOT_IN_libc +#if IS_IN (libc) __libc_lock_init (dirp->lock); #endif dirp->allocation = allocation; diff --git a/sysdeps/posix/readdir.c b/sysdeps/posix/readdir.c index 7bb956a916..84d7f6ac85 100644 --- a/sysdeps/posix/readdir.c +++ b/sysdeps/posix/readdir.c @@ -40,7 +40,7 @@ __READDIR (DIR *dirp) DIRENT_TYPE *dp; int saved_errno = errno; -#ifndef NOT_IN_libc +#if IS_IN (libc) __libc_lock_lock (dirp->lock); #endif @@ -110,7 +110,7 @@ __READDIR (DIR *dirp) /* Skip deleted files. */ } while (dp->d_ino == 0); -#ifndef NOT_IN_libc +#if IS_IN (libc) __libc_lock_unlock (dirp->lock); #endif diff --git a/sysdeps/posix/rewinddir.c b/sysdeps/posix/rewinddir.c index e9bc78d073..d1d46716ef 100644 --- a/sysdeps/posix/rewinddir.c +++ b/sysdeps/posix/rewinddir.c @@ -26,7 +26,7 @@ void __rewinddir (dirp) DIR *dirp; { -#ifndef NOT_IN_libc +#if IS_IN (libc) __libc_lock_lock (dirp->lock); #endif (void) __lseek (dirp->fd, (off_t) 0, SEEK_SET); @@ -34,7 +34,7 @@ __rewinddir (dirp) dirp->offset = 0; dirp->size = 0; dirp->errcode = 0; -#ifndef NOT_IN_libc +#if IS_IN (libc) __libc_lock_unlock (dirp->lock); #endif } diff --git a/sysdeps/powerpc/novmx-sigjmp.c b/sysdeps/powerpc/novmx-sigjmp.c index c651f4231f..1f370bf476 100644 --- a/sysdeps/powerpc/novmx-sigjmp.c +++ b/sysdeps/powerpc/novmx-sigjmp.c @@ -20,7 +20,7 @@ #include <bits/wordsize.h> #include <shlib-compat.h> -#if !defined NOT_IN_libc && defined SHARED +#if IS_IN (libc) && defined SHARED # if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) # include <stddef.h> # include <novmxsetjmp.h> @@ -41,4 +41,4 @@ __novmx__sigjmp_save (__novmx__sigjmp_buf env, int savemask) } # endif /* SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) */ -#endif /* !NOT_IN_libc && SHARED */ +#endif /* IS_IN (libc) && SHARED */ diff --git a/sysdeps/powerpc/powerpc32/__longjmp.S b/sysdeps/powerpc/powerpc32/__longjmp.S index 3371176112..9a83369f1e 100644 --- a/sysdeps/powerpc/powerpc32/__longjmp.S +++ b/sysdeps/powerpc/powerpc32/__longjmp.S @@ -19,12 +19,12 @@ #include <libc-symbols.h> #include <shlib-compat.h> -#if defined NOT_IN_libc +#if !IS_IN (libc) /* Build a non-versioned object for rtld-*. */ # define __longjmp_symbol __longjmp # include "__longjmp-common.S" -#else /* !NOT_IN_libc */ +#else /* IS_IN (libc) */ strong_alias (__vmx__longjmp, __longjmp); # define __longjmp_symbol __vmx__longjmp # include "__longjmp-common.S" @@ -36,4 +36,4 @@ strong_alias (__vmx__longjmp, __longjmp); # define __longjmp_symbol __novmx__longjmp # include "__longjmp-common.S" # endif -#endif /* !NOT_IN_libc */ +#endif /* IS_IN (libc) */ diff --git a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S index 71b6c71b5d..b9521701cc 100644 --- a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S +++ b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S @@ -19,7 +19,7 @@ #include <libc-symbols.h> #include <sysdep.h> -#if defined NOT_IN_libc +#if !IS_IN (libc) /* Build a non-versioned object for rtld-*. */ ENTRY (_setjmp) li r4,0 /* Set second argument to 0. */ @@ -53,4 +53,4 @@ ENTRY (__vmx_setjmp) b __vmx__sigsetjmp@local END (__vmx_setjmp) libc_hidden_def (__vmx_setjmp) -#endif /* !NOT_IN_libc */ +#endif /* IS_IN (libc) */ diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S index 08bdd54f75..e68eb73fd3 100644 --- a/sysdeps/powerpc/powerpc32/fpu/__longjmp.S +++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp.S @@ -20,12 +20,12 @@ #include <rtld-global-offsets.h> #include <shlib-compat.h> -#if defined NOT_IN_libc +#if !IS_IN (libc) /* Build a non-versioned object for rtld-*. */ # define __longjmp_symbol __longjmp # include "__longjmp-common.S" -#else /* !NOT_IN_libc */ +#else /* IS_IN (libc) */ /* Build a versioned object for libc. */ versioned_symbol (libc, __vmx__longjmp, __longjmp, GLIBC_2_3_4); # define __longjmp_symbol __vmx__longjmp @@ -39,4 +39,4 @@ compat_symbol (libc, __novmx__longjmp, __longjmp, GLIBC_2_0); # define __longjmp_symbol __novmx__longjmp # include "__longjmp-common.S" # endif -#endif /* !NOT_IN_libc */ +#endif /* IS_IN (libc) */ diff --git a/sysdeps/powerpc/powerpc32/fpu/setjmp.S b/sysdeps/powerpc/powerpc32/fpu/setjmp.S index 333f707dad..169704f11a 100644 --- a/sysdeps/powerpc/powerpc32/fpu/setjmp.S +++ b/sysdeps/powerpc/powerpc32/fpu/setjmp.S @@ -20,13 +20,13 @@ #include <rtld-global-offsets.h> #include <shlib-compat.h> -#if defined NOT_IN_libc +#if !IS_IN (libc) /* Build a non-versioned object for rtld-*. */ # define __sigsetjmp_symbol __sigsetjmp # define __sigjmp_save_symbol __sigjmp_save # include "setjmp-common.S" -#else /* !NOT_IN_libc */ +#else /* IS_IN (libc) */ /* Build a versioned object for libc. */ versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4) # define __sigsetjmp_symbol __vmx__sigsetjmp @@ -43,4 +43,4 @@ compat_symbol (libc, __novmx__sigsetjmp, __sigsetjmp, GLIBC_2_0) # define __sigjmp_save_symbol __novmx__sigjmp_save # include "setjmp-common.S" # endif -#endif /* !NOT_IN_libc */ +#endif /* IS_IN (libc) */ diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c b/sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c index baaa6b4bcf..2b54622317 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/bzero.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <strings.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c index 94c22ef4ea..d8c6d4de92 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memchr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # undef memcpy /* Redefine memchr so that the compiler won't make the weak_alias point to internal hidden definition (__GI_memchr), since PPC32 does not diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S index 3b473a354a..03c72269c5 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp-ppc32.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .globl C_SYMBOL_NAME(__memcmp_ppc); \ diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c index 79fec67d66..04ed027743 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcmp.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S index e525c2f6a3..0f1f404b26 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy-ppc32.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .globl C_SYMBOL_NAME(__memcpy_ppc); \ diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c index f263a38687..70b5298a63 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memcpy.c @@ -19,7 +19,7 @@ /* Define multiple versions only for the definition in lib and for DSO. In static binaries we need memcpy before the initialization happened. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c index 10701484ff..8b30143c8b 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memmove.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) /* Redefine memmove so that the compiler won't complain about the type mismatch with the IFUNC selector in strong_alias, below. */ # include <string.h> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c index 89f4912fc9..5d6298229c 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define NO_MEMPCPY_STPCPY_REDIRECT # include <string.h> # include <shlib-compat.h> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c index c30e7d6963..435987a3da 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define MEMRCHR __memrchr_ppc # include <string.h> extern void *__memrchr_ppc (const void *, int, size_t); diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c index 610a9570c9..353a18609b 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S index a907eb1e18..6da001aa1a 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memset-ppc32.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .globl C_SYMBOL_NAME(__memset_ppc); \ diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memset.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memset.c index e4e798254a..eb1c0b1542 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memset.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memset.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c index 3f53cd5725..063f12ef36 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/rawmemchr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c index 6d1edf981b..f7ef822779 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # define strcasecmp __strcasecmp_ppc @@ -27,7 +27,7 @@ extern __typeof (__strcasecmp) __strcasecmp_power7 attribute_hidden; #include <string/strcasecmp.c> #undef strcasecmp -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c index 6359bf4eb9..6291233cc1 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strcasecmp_l.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # define strcasecmp_l __strcasecmp_l_ppc @@ -27,7 +27,7 @@ extern __typeof (__strcasecmp_l) __strcasecmp_l_power7 attribute_hidden; #include <string/strcasecmp_l.c> #undef strcasecmp_l -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c index 74a9d54bb9..99e4e456db 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strchr.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c index dab1cbf9ed..db0aab48c2 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strchrnul.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S index 3ee9f93e23..663d4fa2f7 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strlen-ppc32.S @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) #include <sysdep.h> diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c index 1b61ba00a0..cb81f5ddd3 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strlen.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c index a2227d80bd..a5d4ab7cf5 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strncase.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # define strncasecmp __strncasecmp_ppc extern __typeof (__strncasecmp) __strncasecmp_ppc attribute_hidden; @@ -26,7 +26,7 @@ extern __typeof (__strncasecmp) __strncasecmp_power7 attribute_hidden; #include <string/strncase.c> #undef strncasecmp -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c index 9fe3aa0914..65309b302b 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strncase_l.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # define strncasecmp_l __strncasecmp_l_ppc extern __typeof (__strncasecmp_l) __strncasecmp_l_ppc attribute_hidden; @@ -26,7 +26,7 @@ extern __typeof (__strncasecmp_l) __strncasecmp_l_power7 attribute_hidden; #include <string/strncase_l.c> #undef strncasecmp_l -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S index 9a857c7f35..f53ab94eb6 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp-ppc32.S @@ -17,7 +17,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .globl C_SYMBOL_NAME(__strncmp_ppc); \ diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c index a329f77b84..9faad6d23e 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strncmp.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c b/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c index 62d4918e41..aca4c537e8 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/strnlen.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c index a42f70c3b3..9a067afacd 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c @@ -17,7 +17,7 @@ #include <wchar.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED # undef libc_hidden_def # define libc_hidden_def(name) \ diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c index 216d2bc61c..6b8cd9c528 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <wchar.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c index c135835599..148913a469 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy-ppc32.c @@ -17,7 +17,7 @@ #include <wchar.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # define WCSCPY __wcscpy_ppc #endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c index 251660a617..7c6edd83be 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <wchar.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c index 9c7fe2da74..7b7edfb8cc 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr-ppc32.c @@ -17,7 +17,7 @@ #include <wchar.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) # define WCSRCHR __wcsrchr_ppc #endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c index 42e2d8eb93..deec86f7ca 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcsrchr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <wchar.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c index 889be2555f..54ca039263 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wordcopy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <stddef.h> # include <memcopy.h> # include <shlib-compat.h> diff --git a/sysdeps/powerpc/powerpc32/power6/memset.S b/sysdeps/powerpc/powerpc32/power6/memset.S index 445fa44b1a..811a7efded 100644 --- a/sysdeps/powerpc/powerpc32/power6/memset.S +++ b/sysdeps/powerpc/powerpc32/power6/memset.S @@ -228,7 +228,7 @@ L(nzCacheAligned128): ori r1,r1,0 stw rCHR,60(rMEMP3) blt cr6,L(cacheAligned1) -#ifndef NOT_IN_libc +#if IS_IN (libc) lfd 0,-128(rMEMP) #endif b L(nzCacheAligned256) @@ -236,7 +236,7 @@ L(nzCacheAligned128): L(nzCacheAligned256): cmplwi cr1,rLEN,256 addi rMEMP3,rMEMP,64 -#ifdef NOT_IN_libc +#if !IS_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/setjmp.S b/sysdeps/powerpc/powerpc32/setjmp.S index 9b587e0477..c73e65cee7 100644 --- a/sysdeps/powerpc/powerpc32/setjmp.S +++ b/sysdeps/powerpc/powerpc32/setjmp.S @@ -19,13 +19,13 @@ #include <shlib-compat.h> #include <libc-symbols.h> -#if defined NOT_IN_libc +#if !IS_IN (libc) /* Build a non-versioned object for rtld-*. */ # define __sigsetjmp_symbol __sigsetjmp # define __sigjmp_save_symbol __sigjmp_save # include "setjmp-common.S" -#else /* !NOT_IN_libc */ +#else /* IS_IN (libc) */ /* Build a versioned object for libc. */ versioned_symbol (libc, __vmx__sigsetjmp, __sigsetjmp, GLIBC_2_3_4) # define __sigsetjmp_symbol __vmx__sigsetjmp @@ -42,4 +42,4 @@ compat_symbol (libc, __novmx__sigsetjmp, __sigsetjmp, GLIBC_2_0) # define __sigjmp_save_symbol __novmx__sigjmp_save # include "setjmp-common.S" # endif -#endif /* !NOT_IN_libc */ +#endif /* IS_IN (libc) */ diff --git a/sysdeps/powerpc/powerpc64/__longjmp.S b/sysdeps/powerpc/powerpc64/__longjmp.S index 0f446817bf..9313eab567 100644 --- a/sysdeps/powerpc/powerpc64/__longjmp.S +++ b/sysdeps/powerpc/powerpc64/__longjmp.S @@ -20,11 +20,11 @@ #include <rtld-global-offsets.h> #include <shlib-compat.h> -#if defined NOT_IN_libc +#if !IS_IN (libc) /* Build a non-versioned object for rtld-*. */ # include "__longjmp-common.S" -#else /* !NOT_IN_libc */ +#else /* IS_IN (libc) */ strong_alias (__vmx__longjmp, __longjmp) # define __longjmp __vmx__longjmp # include "__longjmp-common.S" @@ -36,4 +36,4 @@ strong_alias (__vmx__longjmp, __longjmp) # define __longjmp __novmx__longjmp # include "__longjmp-common.S" # endif -#endif /* !NOT_IN_libc */ +#endif /* IS_IN (libc) */ diff --git a/sysdeps/powerpc/powerpc64/multiarch/bzero.c b/sysdeps/powerpc/powerpc64/multiarch/bzero.c index 298cf005a1..bf67e463c7 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/bzero.c +++ b/sysdeps/powerpc/powerpc64/multiarch/bzero.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <strings.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr.c b/sysdeps/powerpc/powerpc64/multiarch/memchr.c index ca0f714385..1d763a6736 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memchr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memchr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c index 1a39d4aed0..74626f561e 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c @@ -22,7 +22,7 @@ #define weak_alias(name, aliasname) \ extern __typeof (__memcmp_ppc) aliasname \ __attribute__ ((weak, alias ("__memcmp_ppc"))); -#if !defined(NOT_IN_libc) && defined(SHARED) +#if IS_IN (libc) && defined(SHARED) # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ __hidden_ver1(__memcmp_ppc, __GI_memcmp, __memcmp_ppc); diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp.c b/sysdeps/powerpc/powerpc64/multiarch/memcmp.c index af90f0ab98..b0325de499 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcmp.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memcmp.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S index c63065439f..8365c27119 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .section ".text"; \ diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy.c b/sysdeps/powerpc/powerpc64/multiarch/memcpy.c index 305e963e63..22bca62a5e 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memcpy.c @@ -19,7 +19,7 @@ /* Define multiple versions only for the definition in lib and for DSO. In static binaries we need memcpy before the initialization happened. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) /* Redefine memcpy so that the compiler won't complain about the type mismatch with the IFUNC selector in strong_alias, below. */ # undef memcpy diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c index ff78fe6257..fab0312c93 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c @@ -18,7 +18,7 @@ #include <string.h> #define MEMMOVE __memmove_ppc -#if !defined(NOT_IN_libc) && defined(SHARED) +#if IS_IN (libc) && defined(SHARED) # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) #endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove.c b/sysdeps/powerpc/powerpc64/multiarch/memmove.c index 9a1ce8f688..20a3a9e576 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memmove.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memmove.c @@ -19,7 +19,7 @@ /* Define multiple versions only for the definition in lib and for DSO. In static binaries we need memmove before the initialization happened. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) /* Redefine memmove so that the compiler won't complain about the type mismatch with the IFUNC selector in strong_alias, below. */ # undef memmove diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c index 89f4912fc9..5d6298229c 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define NO_MEMPCPY_STPCPY_REDIRECT # include <string.h> # include <shlib-compat.h> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c index 610a9570c9..353a18609b 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S index 3601a77cd4..ff88f48e1d 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S @@ -29,7 +29,7 @@ ENTRY (__bzero_ppc) END_GEN_TB (__bzero_ppc,TB_TOCLESS) -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .section ".text"; \ diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset.c b/sysdeps/powerpc/powerpc64/multiarch/memset.c index 9c7ed10c87..5c077738b4 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memset.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) /* Redefine memset so that the compiler won't complain about the type mismatch with the IFUNC selector in strong_alias, below. */ # undef memset diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c b/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c index 3f53cd5725..063f12ef36 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S index d80c82fb11..b2213a8629 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .section ".text"; \ diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c index 28153b7266..11458cb2a3 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # define NO_MEMPCPY_STPCPY_REDIRECT # include <string.h> # include <shlib-compat.h> diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c b/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c index dbf85214a2..5c3551be38 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c index 7f02a25207..3e440b5e93 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # define strcasecmp __strcasecmp_ppc extern __typeof (__strcasecmp) __strcasecmp_ppc attribute_hidden; @@ -26,7 +26,7 @@ extern __typeof (__strcasecmp) __strcasecmp_power7 attribute_hidden; #include <string/strcasecmp.c> #undef strcasecmp -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c index a3374c3286..623d844532 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # define strcasecmp_l __strcasecmp_l_ppc extern __typeof (__strcasecmp_l) __strcasecmp_l_ppc attribute_hidden; @@ -26,7 +26,7 @@ extern __typeof (__strcasecmp_l) __strcasecmp_l_power7 attribute_hidden; #include <string/strcasecmp_l.c> #undef strcasecmp_l -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat.c b/sysdeps/powerpc/powerpc64/multiarch/strcat.c index 847a62de52..ec210629d7 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcat.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strcat.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr.c b/sysdeps/powerpc/powerpc64/multiarch/strchr.c index 74a9d54bb9..99e4e456db 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strchr.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c index dab1cbf9ed..db0aab48c2 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S index 93d12771f0..e65c11b750 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .section ".text"; \ diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c b/sysdeps/powerpc/powerpc64/multiarch/strcmp.c index 2013301aa1..4d72a4b9ba 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strcmp.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S index 33a8b1c92e..fb38a3aa51 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef EALIGN # define EALIGN(name, alignt, words) \ .section ".text"; \ diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy.c b/sysdeps/powerpc/powerpc64/multiarch/strcpy.c index 1b6e9e0665..8efebcd321 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strcpy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn.c b/sysdeps/powerpc/powerpc64/multiarch/strcspn.c index 3609d93ad2..156fa6aa71 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcspn.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strcspn.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S index a195e9a0c1..c9bfed0b0c 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # undef ENTRY # define ENTRY(name) \ .section ".text"; \ diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen.c b/sysdeps/powerpc/powerpc64/multiarch/strlen.c index d2c26e9a9c..bffb0390e6 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strlen.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strlen.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) /* Redefine strlen so that the compiler won't complain about the type mismatch with the IFUNC selector in strong_alias, below. */ # undef strlen diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase.c b/sysdeps/powerpc/powerpc64/multiarch/strncase.c index 05eba7c364..8956c70c6c 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncase.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strncase.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # define strncasecmp __strncasecmp_ppc extern __typeof (__strncasecmp) __strncasecmp_ppc attribute_hidden; @@ -26,7 +26,7 @@ extern __typeof (__strncasecmp) __strncasecmp_power7 attribute_hidden; #include <string/strncase.c> #undef strncasecmp -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c b/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c index 4014269ba9..1b4bc68e05 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # define strncasecmp_l __strncasecmp_l_ppc extern __typeof (__strncasecmp_l) __strncasecmp_l_ppc attribute_hidden; @@ -26,7 +26,7 @@ extern __typeof (__strncasecmp_l) __strncasecmp_l_power7 attribute_hidden; #include <string/strncase_l.c> #undef strncasecmp_l -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat.c b/sysdeps/powerpc/powerpc64/multiarch/strncat.c index db98ec1a00..cdf892665f 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncat.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strncat.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S index 14a2bec648..c404977e8f 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S @@ -17,7 +17,7 @@ #include <sysdep.h> -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) #undef EALIGN #define EALIGN(name,alignt,words) \ .section ".text"; \ diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c b/sysdeps/powerpc/powerpc64/multiarch/strncmp.c index 9829d69395..7830ebaf56 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strncmp.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c index e3111d259c..79ae3820e3 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c @@ -22,7 +22,7 @@ #define weak_alias(name, aliasname) \ extern __typeof (__strncpy_ppc) aliasname \ __attribute__ ((weak, alias ("__strncpy_ppc"))); -#if !defined(NOT_IN_libc) && defined(SHARED) +#if IS_IN (libc) && defined(SHARED) # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ __hidden_ver1(__strncpy_ppc, __GI_strncpy, __strncpy_ppc); diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy.c b/sysdeps/powerpc/powerpc64/multiarch/strncpy.c index 8fd5e4b0c8..771b731c5a 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strncpy.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/ >. */ /* Define multiple versions only for definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen.c b/sysdeps/powerpc/powerpc64/multiarch/strnlen.c index 392603117f..02b654fac3 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strnlen.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strnlen.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strpbrk.c b/sysdeps/powerpc/powerpc64/multiarch/strpbrk.c index 8b05536ae1..47ab6d3525 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strpbrk.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strpbrk.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c index 5633a9f003..ef7cc65aed 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c @@ -22,7 +22,7 @@ #define weak_alias(name, aliasname) \ extern __typeof (__strrchr_ppc) aliasname \ __attribute__ ((weak, alias ("__strrchr_ppc"))); -#if !defined(NOT_IN_libc) && defined(SHARED) +#if IS_IN (libc) && defined(SHARED) # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ __hidden_ver1(__strrchr_ppc, __GI_strrchr, __strrchr_ppc); diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr.c b/sysdeps/powerpc/powerpc64/multiarch/strrchr.c index 046162f2d7..11d3f625de 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strrchr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strrchr.c @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ /* Define multiple versions only for definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c index d543772a97..b35af3e016 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c @@ -22,7 +22,7 @@ #define weak_alias(name, aliasname) \ extern __typeof (__strspn_ppc) aliasname \ __attribute__ ((weak, alias ("__strspn_ppc"))); -#if !defined(NOT_IN_libc) && defined(SHARED) +#if IS_IN (libc) && defined(SHARED) # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ __hidden_ver1(__strspn_ppc, __GI_strspn, __strspn_ppc); diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn.c b/sysdeps/powerpc/powerpc64/multiarch/strspn.c index bf8c877ec2..dd9ec18ba3 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strspn.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strspn.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <string.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c b/sysdeps/powerpc/powerpc64/multiarch/wcschr.c index 216d2bc61c..6b8cd9c528 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/wcschr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <wchar.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c index 5c0a6d339c..aadf490332 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <wchar.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c b/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c index 3d0ab422e9..91ba389ccb 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <wchar.h> # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c index 889be2555f..54ca039263 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <stddef.h> # include <memcopy.h> # include <shlib-compat.h> diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64/setjmp.S index c15908c126..a8de3bbbcd 100644 --- a/sysdeps/powerpc/powerpc64/setjmp.S +++ b/sysdeps/powerpc/powerpc64/setjmp.S @@ -20,7 +20,7 @@ #include <rtld-global-offsets.h> #include <shlib-compat.h> -#if defined NOT_IN_libc +#if !IS_IN (libc) /* Build a non-versioned object for rtld-*. */ # define setjmp_symbol setjmp # define _setjmp_symbol _setjmp @@ -28,7 +28,7 @@ # define __sigjmp_save_symbol __sigjmp_save # include "setjmp-common.S" -#else /* !NOT_IN_libc */ +#else /* IS_IN (libc) */ /* Build a versioned object for libc. */ versioned_symbol (libc, __vmxsetjmp, setjmp, GLIBC_2_3_4) versioned_symbol (libc, __vmx_setjmp, _setjmp, GLIBC_2_3_4) @@ -58,4 +58,4 @@ compat_symbol (libc, __novmx__sigsetjmp,__sigsetjmp, GLIBC_2_3) # include "setjmp-common.S" strong_alias (__novmxsetjmp, __novmx__setjmp) # endif -#endif /* !NOT_IN_libc */ +#endif /* IS_IN (libc) */ diff --git a/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c index 2ccfc9c105..a46c9a1140 100644 --- a/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c +++ b/sysdeps/s390/s390-32/multiarch/ifunc-resolve.c @@ -23,7 +23,7 @@ #define STFLE_BITS_Z10 34 /* General instructions extension */ #define STFLE_BITS_Z196 45 /* Distinct operands, pop ... */ -#ifndef NOT_IN_libc +#if IS_IN (libc) #define IFUNC_RESOLVE(FUNC) \ asm (".globl " #FUNC "\n\t" \ diff --git a/sysdeps/s390/s390-32/multiarch/memcmp.S b/sysdeps/s390/s390-32/multiarch/memcmp.S index f298baa2ac..32f08ef94a 100644 --- a/sysdeps/s390/s390-32/multiarch/memcmp.S +++ b/sysdeps/s390/s390-32/multiarch/memcmp.S @@ -27,7 +27,7 @@ .text -#ifndef NOT_IN_libc +#if IS_IN (libc) ENTRY(memcmp_z196) .machine "z196" @@ -96,7 +96,7 @@ END(memcmp_z10) #include "../memcmp.S" -#ifdef NOT_IN_libc +#if !IS_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 78ed7379cd..bc65bd8119 100644 --- a/sysdeps/s390/s390-32/multiarch/memcpy.S +++ b/sysdeps/s390/s390-32/multiarch/memcpy.S @@ -27,7 +27,7 @@ .text -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) ENTRY(memcpy_z196) .machine "z196" @@ -92,7 +92,7 @@ END(memcpy_z10) #include "../memcpy.S" -#if !defined SHARED || defined NOT_IN_libc +#if !defined SHARED || !IS_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 99d7df0dd2..971c593dfe 100644 --- a/sysdeps/s390/s390-32/multiarch/memset.S +++ b/sysdeps/s390/s390-32/multiarch/memset.S @@ -27,7 +27,7 @@ .text -#ifndef NOT_IN_libc +#if IS_IN (libc) ENTRY(memset_z196) .machine "z196" @@ -107,7 +107,7 @@ END(memset_mvcle) #include "../memset.S" -#ifdef NOT_IN_libc +#if !IS_IN (libc) .globl memset .set memset,memset_g5 #endif diff --git a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c index f8c69ffbb8..f8b9040109 100644 --- a/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c +++ b/sysdeps/s390/s390-64/multiarch/ifunc-resolve.c @@ -23,7 +23,7 @@ #define STFLE_BITS_Z10 34 /* General instructions extension */ #define STFLE_BITS_Z196 45 /* Distinct operands, pop ... */ -#ifndef NOT_IN_libc +#if IS_IN (libc) #define IFUNC_RESOLVE(FUNC) \ asm (".globl " #FUNC "\n\t" \ diff --git a/sysdeps/s390/s390-64/multiarch/memcmp.S b/sysdeps/s390/s390-64/multiarch/memcmp.S index c31d7c446c..8e4eca2255 100644 --- a/sysdeps/s390/s390-64/multiarch/memcmp.S +++ b/sysdeps/s390/s390-64/multiarch/memcmp.S @@ -27,7 +27,7 @@ .text -#ifndef NOT_IN_libc +#if IS_IN (libc) ENTRY(memcmp_z196) .machine "z196" @@ -93,7 +93,7 @@ END(memcmp_z10) #include "../memcmp.S" -#ifdef NOT_IN_libc +#if !IS_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 6590f43f27..2536ef4773 100644 --- a/sysdeps/s390/s390-64/multiarch/memcpy.S +++ b/sysdeps/s390/s390-64/multiarch/memcpy.S @@ -27,7 +27,7 @@ .text -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) ENTRY(memcpy_z196) .machine "z196" @@ -88,7 +88,7 @@ END(memcpy_z10) #include "../memcpy.S" -#if !defined SHARED || defined NOT_IN_libc +#if !defined SHARED || !IS_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 3b962696dd..4d52051ac7 100644 --- a/sysdeps/s390/s390-64/multiarch/memset.S +++ b/sysdeps/s390/s390-64/multiarch/memset.S @@ -27,7 +27,7 @@ .text -#ifndef NOT_IN_libc +#if IS_IN (libc) ENTRY(memset_z196) .machine "z196" @@ -103,7 +103,7 @@ END(memset_mvcle) #include "../memset.S" -#ifdef NOT_IN_libc +#if !IS_IN (libc) .globl memset .set memset,memset_z900 #endif diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S index 4b7b22d030..a1c558840a 100644 --- a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S +++ b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara1.S @@ -35,7 +35,7 @@ #define XCC xcc #endif -#if !defined NOT_IN_libc +#if IS_IN (libc) .register %g2,#scratch .register %g3,#scratch diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S index a1a9642bd8..a77618b2d9 100644 --- a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S +++ b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara2.S @@ -137,7 +137,7 @@ LOAD(ldd, base + 0x28, %x5); \ LOAD(ldd, base + 0x30, %x6); -#if !defined NOT_IN_libc +#if IS_IN (libc) .register %g2,#scratch .register %g3,#scratch diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S index 63e0d8333e..24c6c6db33 100644 --- a/sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S +++ b/sysdeps/sparc/sparc64/multiarch/memcpy-niagara4.S @@ -46,7 +46,7 @@ #define STORE(type,src,addr) type src, [addr] #define STORE_INIT(src,addr) stxa src, [addr] STORE_ASI -#if !defined NOT_IN_libc +#if IS_IN (libc) .register %g2,#scratch .register %g3,#scratch diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S b/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S index ffb36468de..88a58d6143 100644 --- a/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S +++ b/sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S @@ -30,7 +30,7 @@ #define XCC xcc #endif -#if !defined NOT_IN_libc +#if IS_IN (libc) .register %g2,#scratch .register %g3,#scratch diff --git a/sysdeps/sparc/sparc64/multiarch/memcpy.S b/sysdeps/sparc/sparc64/multiarch/memcpy.S index 62977a4d3c..dad39eca2c 100644 --- a/sysdeps/sparc/sparc64/multiarch/memcpy.S +++ b/sysdeps/sparc/sparc64/multiarch/memcpy.S @@ -20,7 +20,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc +#if IS_IN (libc) .text ENTRY(memcpy) .type memcpy, @gnu_indirect_function diff --git a/sysdeps/sparc/sparc64/multiarch/memset-niagara1.S b/sysdeps/sparc/sparc64/multiarch/memset-niagara1.S index ed53522c14..ae45f5ddc1 100644 --- a/sysdeps/sparc/sparc64/multiarch/memset-niagara1.S +++ b/sysdeps/sparc/sparc64/multiarch/memset-niagara1.S @@ -28,7 +28,7 @@ #define XCC xcc #endif -#if !defined NOT_IN_libc +#if IS_IN (libc) .register %g2,#scratch diff --git a/sysdeps/sparc/sparc64/multiarch/memset-niagara4.S b/sysdeps/sparc/sparc64/multiarch/memset-niagara4.S index c090c50e9d..dc17e89744 100644 --- a/sysdeps/sparc/sparc64/multiarch/memset-niagara4.S +++ b/sysdeps/sparc/sparc64/multiarch/memset-niagara4.S @@ -21,7 +21,7 @@ #define ASI_BLK_INIT_QUAD_LDD_P 0xe2 -#if !defined NOT_IN_libc +#if IS_IN (libc) .register %g2, #scratch .register %g3, #scratch diff --git a/sysdeps/sparc/sparc64/multiarch/memset.S b/sysdeps/sparc/sparc64/multiarch/memset.S index 96c75e0d06..2f63fe9343 100644 --- a/sysdeps/sparc/sparc64/multiarch/memset.S +++ b/sysdeps/sparc/sparc64/multiarch/memset.S @@ -20,7 +20,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc +#if IS_IN (libc) .text ENTRY(memset) .type memset, @gnu_indirect_function diff --git a/sysdeps/unix/alpha/sysdep.S b/sysdeps/unix/alpha/sysdep.S index a39ee617ce..22b8b6cbb4 100644 --- a/sysdeps/unix/alpha/sysdep.S +++ b/sysdeps/unix/alpha/sysdep.S @@ -28,7 +28,7 @@ .text #endif -#ifndef NOT_IN_libc +#if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno #else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h index 0b5ff20229..4a280cd67e 100644 --- a/sysdeps/unix/alpha/sysdep.h +++ b/sysdeps/unix/alpha/sysdep.h @@ -372,7 +372,7 @@ __LABEL(name) \ #else # include <stdint.h> # if (IS_IN (rtld) \ - || (!defined SHARED && (!defined NOT_IN_libc \ + || (!defined SHARED && (IS_IN (libc) \ || IS_IN (libpthread)))) extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden; # define PTR_MANGLE(var) \ diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh index fd6ebb4dbc..567081a624 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -96,7 +96,7 @@ emit_weak_aliases() *@@*) base=`echo $name | sed 's/@@.*//'` ver=`echo $name | sed 's/.*@@//;s/\./_/g'` - echo " echo '#ifndef NOT_IN_libc'; \\" + echo " echo '#if IS_IN (libc)'; \\" if test -z "$vcount" ; then source=$strong vcount=1 @@ -113,7 +113,7 @@ emit_weak_aliases() *@*) base=`echo $name | sed 's/@.*//'` ver=`echo $name | sed 's/.*@//;s/\./_/g'` - echo " echo '#if defined SHARED && !defined NOT_IN_libc'; \\" + echo " echo '#if defined SHARED && IS_IN (libc)'; \\" if test -z "$vcount" ; then source=$strong vcount=1 diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 2d6d8bbc73..72754b76cc 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -179,7 +179,6 @@ sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \ dl-fxstatat64 libof-lddlibc4 = lddlibc4 -CPPFLAGS-lddlibc4 += -DNOT_IN_libc others += pldd install-bin += pldd diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h index f2f8009b3c..de88ad2170 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -85,7 +85,7 @@ ENTRY (name); \ # define CENABLE bl __pthread_enable_asynccancel # define CDISABLE bl __pthread_disable_asynccancel # define __local_multiple_threads __pthread_multiple_threads -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE bl __libc_enable_asynccancel # define CDISABLE bl __libc_disable_asynccancel # define __local_multiple_threads __libc_multiple_threads @@ -96,7 +96,7 @@ ENTRY (name); \ # error Unsupported library # endif -# if IS_IN (libpthread) || !defined NOT_IN_libc +# if IS_IN (libpthread) || IS_IN (libc) # ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index 3fb6742759..45a86365cd 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 NOT_IN_libc +# if !IS_IN (libc) # define SYSCALL_ERROR .Lsyscall_error # if RTLD_PRIVATE_ERRNO # define SYSCALL_ERROR_HANDLER \ @@ -310,7 +310,7 @@ /* Pointer mangling is supported for AArch64. */ #if (IS_IN (rtld) || \ - (!defined SHARED && (!defined NOT_IN_libc \ + (!defined SHARED && (IS_IN (libc) \ || IS_IN (libpthread)))) # ifdef __ASSEMBLER__ # define PTR_MANGLE(dst, src, guard, tmp) \ diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h index 5479556c91..d8439bf09f 100644 --- a/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h @@ -21,7 +21,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) /* ??? Assumes that nothing comes between PSEUDO and PSEUDO_END besides "ret". */ @@ -117,7 +117,7 @@ __LABEL($multi_error) \ # define __local_enable_asynccancel __pthread_enable_asynccancel # define __local_disable_asynccancel __pthread_disable_asynccancel # define __local_multiple_threads __pthread_multiple_threads -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define __local_enable_asynccancel __libc_enable_asynccancel # define __local_disable_asynccancel __libc_disable_asynccancel # define __local_multiple_threads __libc_multiple_threads @@ -136,7 +136,7 @@ __LABEL($multi_error) \ # define CDISABLE jsr ra, __local_disable_asynccancel; ldgp ra, 0(gp) # endif -# if IS_IN (libpthread) || !defined NOT_IN_libc +# if IS_IN (libpthread) || IS_IN (libc) # ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P \ diff --git a/sysdeps/unix/sysv/linux/alpha/vfork.S b/sysdeps/unix/sysv/linux/alpha/vfork.S index befcd78e60..d18ae27834 100644 --- a/sysdeps/unix/sysv/linux/alpha/vfork.S +++ b/sysdeps/unix/sysv/linux/alpha/vfork.S @@ -49,7 +49,7 @@ ENTRY(__libc_vfork) PSEUDO_END (__libc_vfork) -#if !NOT_IN_libc +#if IS_IN (libc) weak_alias (__libc_vfork, vfork) strong_alias (__libc_vfork, __vfork) libc_hidden_def (__vfork) diff --git a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h index 9211d049a4..f966e9564d 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h @@ -21,7 +21,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) /* NOTE: We do mark syscalls with unwind annotations, for the benefit of cancellation; but they're really only accurate at the point of the @@ -185,7 +185,7 @@ # define CENABLE bl PLTJMP(__pthread_enable_asynccancel) # define CDISABLE bl PLTJMP(__pthread_disable_asynccancel) # define __local_multiple_threads __pthread_multiple_threads -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE bl PLTJMP(__libc_enable_asynccancel) # define CDISABLE bl PLTJMP(__libc_disable_asynccancel) # define __local_multiple_threads __libc_multiple_threads @@ -196,7 +196,7 @@ # error Unsupported library # endif -# if IS_IN (libpthread) || !defined NOT_IN_libc +# if IS_IN (libpthread) || IS_IN (libc) # ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h index 91bdca5226..f2d334329d 100644 --- a/sysdeps/unix/sysv/linux/arm/sysdep.h +++ b/sysdeps/unix/sysv/linux/arm/sysdep.h @@ -136,7 +136,7 @@ #define ret_ERRVAL PSEUDO_RET_NOERRNO -#if NOT_IN_libc +#if !IS_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 937b1d4e11..af5db449c3 100644 --- a/sysdeps/unix/sysv/linux/getpid.c +++ b/sysdeps/unix/sysv/linux/getpid.c @@ -21,7 +21,7 @@ #include <sysdep.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) static inline __attribute__((always_inline)) pid_t really_getpid (pid_t oldval); static inline __attribute__((always_inline)) pid_t @@ -48,7 +48,7 @@ really_getpid (pid_t oldval) pid_t __getpid (void) { -#ifdef NOT_IN_libc +#if !IS_IN (libc) INTERNAL_SYSCALL_DECL (err); pid_t result = INTERNAL_SYSCALL (getpid, err, 0); #else diff --git a/sysdeps/unix/sysv/linux/hppa/lowlevellock.h b/sysdeps/unix/sysv/linux/hppa/lowlevellock.h index 9a60492479..2a4d273e73 100644 --- a/sysdeps/unix/sysv/linux/hppa/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/hppa/lowlevellock.h @@ -58,7 +58,7 @@ /* Initialize locks to zero. */ #define LLL_MUTEX_LOCK_INITIALIZER (0) -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ diff --git a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h index 5d4ff342d4..aec3f37afd 100644 --- a/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # ifndef NO_ERROR # define NO_ERROR -0x1000 @@ -216,7 +216,7 @@ L(pre_end): ASM_LINE_SEP \ # define CDISABLE .import __pthread_disable_asynccancel,code ASM_LINE_SEP \ bl __pthread_disable_asynccancel,%r2 ASM_LINE_SEP # endif -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # ifdef PIC # define CENABLE .import __libc_enable_asynccancel,code ASM_LINE_SEP \ bl __libc_enable_asynccancel,%r2 ASM_LINE_SEP @@ -246,7 +246,7 @@ L(pre_end): ASM_LINE_SEP \ # if IS_IN (libpthread) # define __local_multiple_threads __pthread_multiple_threads -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define __local_multiple_threads __libc_multiple_threads # elif IS_IN (librt) # define __local_multiple_threads __librt_multiple_threads @@ -271,7 +271,7 @@ L(pre_end): ASM_LINE_SEP \ # define NO_CANCELLATION 1 #endif -/* !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) */ +/* IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) */ #ifndef __ASSEMBLER__ # define RTLD_SINGLE_THREAD_P \ diff --git a/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S index 4ed46fc63e..13596f11ac 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 -#ifdef NOT_IN_libc +#if !IS_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 -#ifdef NOT_IN_libc +#if !IS_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 ffae477160..1032f4b666 100644 --- a/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -71,7 +71,7 @@ #define LLL_SHARED FUTEX_PRIVATE_FLAG -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ @@ -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 defined NOT_IN_libc || defined UP +#if !IS_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 defined NOT_IN_libc || defined UP +#if !IS_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 defined NOT_IN_libc || defined UP +#if !IS_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/i386/sysdep-cancel.h b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index c17ff6c586..ab15b9d3ef 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -111,7 +111,7 @@ # if IS_IN (libpthread) # define CENABLE call __pthread_enable_asynccancel; # define CDISABLE call __pthread_disable_asynccancel -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE call __libc_enable_asynccancel; # define CDISABLE call __libc_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index b5380043a8..d751c58e3e 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -34,7 +34,7 @@ #define SYS_ify(syscall_name) __NR_##syscall_name #if defined USE_DL_SYSINFO \ - && (!defined NOT_IN_libc || IS_IN (libpthread)) + && (IS_IN (libc) || IS_IN (libpthread)) # define I386_USE_SYSENTER 1 #else # undef I386_USE_SYSENTER @@ -115,7 +115,7 @@ # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/ia64/lowlevellock.h b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h index fe4a90e7bb..b586731cfb 100644 --- a/sysdeps/unix/sysv/linux/ia64/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/ia64/lowlevellock.h @@ -52,7 +52,7 @@ #define LLL_SHARED FUTEX_PRIVATE_FLAG -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h index 0458fcea64..c402dca60f 100644 --- a/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h @@ -22,11 +22,11 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSDEP_CANCEL_ERRNO __libc_errno # else # define SYSDEP_CANCEL_ERRNO errno @@ -182,7 +182,7 @@ __GC_##name: \ # if IS_IN (libpthread) # define CENABLE br.call.sptk.many b0 = __pthread_enable_asynccancel # define CDISABLE br.call.sptk.many b0 = __pthread_disable_asynccancel -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE br.call.sptk.many b0 = __libc_enable_asynccancel # define CDISABLE br.call.sptk.many b0 = __libc_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.S b/sysdeps/unix/sysv/linux/ia64/sysdep.S index 004ade1627..9ec89513d1 100644 --- a/sysdeps/unix/sysv/linux/ia64/sysdep.S +++ b/sysdeps/unix/sysv/linux/ia64/sysdep.S @@ -34,7 +34,7 @@ ENTRY(__syscall_error) st4 [r2]=r8 mov r8=-1 #else -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h index 094385256a..49684f8296 100644 --- a/sysdeps/unix/sysv/linux/ia64/sysdep.h +++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h @@ -61,7 +61,7 @@ #endif #if defined USE_DL_SYSINFO \ - && (!defined NOT_IN_libc \ + && (IS_IN (libc) \ || IS_IN (libpthread) || IS_IN (librt)) # define IA64_USE_NEW_STUB #else diff --git a/sysdeps/unix/sysv/linux/lowlevellock-futex.h b/sysdeps/unix/sysv/linux/lowlevellock-futex.h index 11150b33ba..8927661544 100644 --- a/sysdeps/unix/sysv/linux/lowlevellock-futex.h +++ b/sysdeps/unix/sysv/linux/lowlevellock-futex.h @@ -49,7 +49,7 @@ #define LLL_SHARED FUTEX_PRIVATE_FLAG -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ diff --git a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h index b75bf17549..aa116c4c7e 100644 --- a/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h +++ b/sysdeps/unix/sysv/linux/m68k/bits/m68k-vdso.h @@ -35,7 +35,7 @@ /* We define __rtld_* copies for rtld. We need them visible in libc to initialize. */ -# if IS_IN (rtld) || !defined NOT_IN_libc +# if IS_IN (rtld) || IS_IN (libc) extern void *__rtld___vdso_read_tp; extern void *__rtld___vdso_atomic_cmpxchg_32; extern void *__rtld___vdso_atomic_barrier; @@ -44,7 +44,7 @@ extern void *__rtld___vdso_atomic_barrier; extern void __vdso_read_tp_stub (void); extern void __vdso_atomic_cmpxchg_32_stub (void); extern void __vdso_atomic_barrier_stub (void); -# endif /* IS_IN (rtld) || !NOT_IN_libc */ +# endif /* IS_IN (rtld) || IS_IN (libc) */ /* RTLD should only use its own copies. */ # if !IS_IN (rtld) diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h index 33ce922b2f..d5b8445a41 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -103,7 +103,7 @@ # if IS_IN (libpthread) # define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel) -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE PSEUDO_JMP (__libc_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__libc_disable_asynccancel) # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h index 3a91e867f3..97090884e0 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.h +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h @@ -101,7 +101,7 @@ SYSCALL_ERROR_LABEL: \ move.l %d0, %a0; \ rts; # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h b/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h index 9c21eeb96c..659248428f 100644 --- a/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/microblaze/lowlevellock.h @@ -52,7 +52,7 @@ #define LLL_SHARED FUTEX_PRIVATE_FLAG -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h index 0fe5b1208a..5e185a34e4 100644 --- a/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/microblaze/sysdep-cancel.h @@ -21,7 +21,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # if !IS_IN (librt) || !defined(PIC) # define AC_STACK_SIZE 16 /* space for r15, async_cancel arg and 2 temp words */ @@ -106,7 +106,7 @@ L(pseudo_cancel): \ # define CENABLE PSEUDO_JMP (__pthread_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__pthread_disable_asynccancel) # define __local_multiple_threads __pthread_multiple_threads -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE PSEUDO_JMP (__libc_enable_asynccancel) # define CDISABLE PSEUDO_JMP (__libc_disable_asynccancel) # define __local_multiple_threads __libc_multiple_threads @@ -118,7 +118,7 @@ L(pseudo_cancel): \ # endif -# if IS_IN (libpthread) || !defined NOT_IN_libc +# if IS_IN (libpthread) || IS_IN (libc) # ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) diff --git a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h index 6f79b14f62..40e4225ed5 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h @@ -27,7 +27,7 @@ happen before any instructions. So we use cfi_same_value instead of cfi_restore. */ -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) #ifdef __PIC__ # undef PSEUDO diff --git a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h index 1d711f784a..e12eea71be 100644 --- a/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # ifdef __PIC__ # define PSEUDO_CPLOAD .cpload t9; diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index 1d65f20404..0858ce845a 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -19,7 +19,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) extern int __open_nocancel (const char *, int, ...) attribute_hidden; extern int __close_nocancel (int) attribute_hidden; extern int __read_nocancel (int, void *, size_t) attribute_hidden; diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h index 25bf797f7c..db1dfb8c5a 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h @@ -23,7 +23,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -84,7 +84,7 @@ # if IS_IN (libpthread) # define CENABLE bl __pthread_enable_asynccancel@local # define CDISABLE bl __pthread_disable_asynccancel@local -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE bl __libc_enable_asynccancel@local # define CDISABLE bl __libc_disable_asynccancel@local # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h index 8683b6bf77..9fff7505fd 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h @@ -23,7 +23,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # ifdef HAVE_ASM_GLOBAL_DOT_NAME # define DASHDASHPFX(str) .__##str @@ -107,7 +107,7 @@ # define CENABLE bl JUMPTARGET(__pthread_enable_asynccancel); nop # define CDISABLE bl JUMPTARGET(__pthread_disable_asynccancel); nop # endif -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # ifdef SHARED # define CENABLE bl JUMPTARGET(__libc_enable_asynccancel) # define CDISABLE bl JUMPTARGET(__libc_disable_asynccancel) diff --git a/sysdeps/unix/sysv/linux/s390/longjmp_chk.c b/sysdeps/unix/sysv/linux/s390/longjmp_chk.c index 02c96c289a..d18fbdf0a3 100644 --- a/sysdeps/unix/sysv/linux/s390/longjmp_chk.c +++ b/sysdeps/unix/sysv/linux/s390/longjmp_chk.c @@ -20,7 +20,7 @@ #include <shlib-compat.h> -#if !defined NOT_IN_libc && defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) +#if IS_IN (libc) && defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) /* this is a copy from debug/longjmp_chk.c because we need an unique name for __longjmp_chk, but it is already named via a define for __libc_siglongjmp in debug/longjmp_chk.c. */ diff --git a/sysdeps/unix/sysv/linux/s390/lowlevellock.h b/sysdeps/unix/sysv/linux/s390/lowlevellock.h index 2c17b2cab5..14fb4a87ed 100644 --- a/sysdeps/unix/sysv/linux/s390/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/s390/lowlevellock.h @@ -51,7 +51,7 @@ #define LLL_SHARED FUTEX_PRIVATE_FLAG -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h index d19500ded1..3b027e01f1 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -78,7 +78,7 @@ L(pseudo_end): # if IS_IN (libpthread) # define CENABLE __pthread_enable_asynccancel # define CDISABLE __pthread_disable_asynccancel -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE __libc_enable_asynccancel # define CDISABLE __libc_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S index de3f8a4e84..aca7e22a9c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S @@ -31,7 +31,7 @@ .text ENTRY(__syscall_error) #ifndef PIC -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno @@ -54,7 +54,7 @@ ENTRY(__syscall_error) br %r14 1: .long rtld_errno - 0b # else -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h index e6fd96a334..f0ef41cef4 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h @@ -105,7 +105,7 @@ br %r14; \ 2: .long rtld_errno-1b # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S index 290e464089..3a368c8d5c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S @@ -52,7 +52,7 @@ ENTRY (__libc_vfork) br %r14 PSEUDO_END (__libc_vfork) -#if !NOT_IN_libc +#if IS_IN (libc) weak_alias (__libc_vfork, vfork) strong_alias (__libc_vfork, __vfork) libc_hidden_def (__vfork) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h index 9622d5a9ab..4955ec1cbd 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -73,7 +73,7 @@ L(pseudo_end): # define CENABLE __pthread_enable_asynccancel # define CDISABLE __pthread_disable_asynccancel # define __local_multiple_threads __pthread_multiple_threads -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE __libc_enable_asynccancel # define CDISABLE __libc_disable_asynccancel # define __local_multiple_threads __libc_multiple_threads @@ -111,7 +111,7 @@ L(pseudo_end): #define LR7_6 lg %r7,56+160(%r15); \ cfi_restore (%r7); -# if IS_IN (libpthread) || !defined NOT_IN_libc +# if IS_IN (libpthread) || IS_IN (libc) # ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P \ diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S index 0fbfe9c9e0..6b4a613a6a 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S @@ -32,7 +32,7 @@ .text ENTRY(__syscall_error) #ifndef PIC -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno @@ -55,7 +55,7 @@ ENTRY(__syscall_error) lghi %r2,-1 br %r14 # else -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h index 917a636ee2..696e4b3c04 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h @@ -113,7 +113,7 @@ lghi %r2,-1; \ br %r14 # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S index 7de1bb07ad..54bb2724c8 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S @@ -53,7 +53,7 @@ ENTRY (__libc_vfork) br %r14 PSEUDO_END (__libc_vfork) -#if !NOT_IN_libc +#if IS_IN (libc) weak_alias (__libc_vfork, vfork) strong_alias (__libc_vfork, __vfork) libc_hidden_def (__vfork) diff --git a/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/sysdeps/unix/sysv/linux/sh/lowlevellock.S index 84b8edb86c..3fab373b03 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 -#ifdef NOT_IN_libc +#if !IS_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 -#ifdef NOT_IN_libc +#if !IS_IN (libc) .globl __lll_unlock_wake .type __lll_unlock_wake,@function .hidden __lll_unlock_wake diff --git a/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/sysdeps/unix/sysv/linux/sh/lowlevellock.h index 328446c094..e6dbab248d 100644 --- a/sysdeps/unix/sysv/linux/sh/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/sh/lowlevellock.h @@ -49,7 +49,7 @@ #define LLL_SHARED FUTEX_PRIVATE_FLAG -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ diff --git a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index 131f42b49f..9b5911c0a2 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -21,7 +21,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # define _IMM12 #-12 # define _IMM16 #-16 @@ -108,7 +108,7 @@ # if IS_IN (libpthread) # define __local_enable_asynccancel __pthread_enable_asynccancel # define __local_disable_asynccancel __pthread_disable_asynccancel -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define __local_enable_asynccancel __libc_enable_asynccancel # define __local_disable_asynccancel __libc_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.h b/sysdeps/unix/sysv/linux/sh/sysdep.h index 4fc5dd7775..6f57854466 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep.h +++ b/sysdeps/unix/sysv/linux/sh/sysdep.h @@ -116,7 +116,7 @@ # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/sh/vfork.S b/sysdeps/unix/sysv/linux/sh/vfork.S index 76326f5048..63ca02386a 100644 --- a/sysdeps/unix/sysv/linux/sh/vfork.S +++ b/sysdeps/unix/sysv/linux/sh/vfork.S @@ -66,7 +66,7 @@ ENTRY (__libc_vfork) .align 2 PSEUDO_END (__libc_vfork) -#if !NOT_IN_libc +#if IS_IN (libc) weak_alias (__libc_vfork, vfork) strong_alias (__libc_vfork, __vfork) libc_hidden_def (__vfork) diff --git a/sysdeps/unix/sysv/linux/sparc/lowlevellock.h b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h index eebf406eae..5c8c3f4588 100644 --- a/sysdeps/unix/sysv/linux/sparc/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/sparc/lowlevellock.h @@ -57,7 +57,7 @@ extern void __cpu_relax (void); #define BUSY_WAIT_NOP __cpu_relax () #endif -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h index cc7adfcdeb..526e87554f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -71,7 +71,7 @@ __##syscall_name##_nocancel: \ # if IS_IN (libpthread) # define CENABLE call __pthread_enable_asynccancel # define CDISABLE call __pthread_disable_asynccancel -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE call __libc_enable_asynccancel # define CDISABLE call __libc_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h index e5bb3b5501..c9f38f4e4e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h @@ -79,7 +79,7 @@ ENTRY(name); \ mov -1, %o0; # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S index 567163f907..875ee3d301 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/brk.S @@ -89,7 +89,7 @@ ENTRY (__brk) #endif st %o0, [%g1] #else -#ifndef NOT_IN_libc +#if IS_IN (libc) call HIDDEN_JUMPTARGET(__errno_location) #else call __errno_location diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h index aee3deecbc..e11f7c18c2 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ @@ -69,7 +69,7 @@ __##syscall_name##_nocancel: \ # if IS_IN (libpthread) # define CENABLE call __pthread_enable_asynccancel # define CDISABLE call __pthread_disable_asynccancel -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE call __libc_enable_asynccancel # define CDISABLE call __libc_disable_asynccancel # elif IS_IN (librt) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h index e9aedcee0f..52b07c2791 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h @@ -89,7 +89,7 @@ ENTRY(name); \ mov -1, %o0; # elif defined _LIBC_REENTRANT -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h index 028c3930e1..6c10552b14 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) /* Allow hacking in some extra code if desired. */ #ifndef PSEUDO_EXTRA diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h index b521351887..d3b98bd359 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep.h @@ -45,7 +45,7 @@ #ifndef PIC /* For static code, on error jump to __syscall_error directly. */ # define SYSCALL_ERROR_NAME __syscall_error -#elif !defined NOT_IN_libc || IS_IN (libpthread) +#elif IS_IN (libc) || IS_IN (libpthread) /* Use the internal name for libc/libpthread shared objects. */ # define SYSCALL_ERROR_NAME __GI___syscall_error #else diff --git a/sysdeps/unix/sysv/linux/tile/waitpid.S b/sysdeps/unix/sysv/linux/tile/waitpid.S index 7fa1cca660..dee1b0cce1 100644 --- a/sysdeps/unix/sysv/linux/tile/waitpid.S +++ b/sysdeps/unix/sysv/linux/tile/waitpid.S @@ -1,7 +1,7 @@ /* extern pid_t __waitpid_nocancel (pid_t, int *, int) attribute_hidden; */ -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) /* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */ #define PSEUDO_EXTRA move r3, zero; diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S index f2dca070f3..5d8e77c1a7 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 -#ifdef NOT_IN_libc +#if !IS_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 -#ifdef NOT_IN_libc +#if !IS_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 37c0faf25a..2f0cf5cb6d 100644 --- a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -72,7 +72,7 @@ #ifndef __ASSEMBLER__ -#if !defined NOT_IN_libc || IS_IN (rtld) +#if IS_IN (libc) || IS_IN (rtld) /* In libc.so or ld.so all futexes are private. */ # ifdef __ASSUME_PRIVATE_FUTEX # define __lll_private_flag(fl, private) \ @@ -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 defined NOT_IN_libc || defined UP +#if !IS_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 defined NOT_IN_libc || defined UP +#if !IS_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 defined NOT_IN_libc || defined UP +#if !IS_IN (libc) || defined UP # define __lll_unlock_asm_start LOCK_INSTR "decl %0\n\t" \ "je 24f\n\t" #else diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h index 2667292155..cecaec1619 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h @@ -22,7 +22,7 @@ # include <nptl/pthreadP.h> #endif -#if !defined NOT_IN_libc || IS_IN (libpthread) || IS_IN (librt) +#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt) /* The code to disable cancellation depends on the fact that the called functions are special. They don't modify registers other than %rax @@ -63,7 +63,7 @@ # define CENABLE call __pthread_enable_asynccancel; # define CDISABLE call __pthread_disable_asynccancel; # define __local_multiple_threads __pthread_multiple_threads -# elif !defined NOT_IN_libc +# elif IS_IN (libc) # define CENABLE call __libc_enable_asynccancel; # define CDISABLE call __libc_disable_asynccancel; # define __local_multiple_threads __libc_multiple_threads @@ -74,7 +74,7 @@ # error Unsupported library # endif -# if IS_IN (libpthread) || !defined NOT_IN_libc +# if IS_IN (libpthread) || IS_IN (libc) # ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P \ diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h index 6377183d54..16c497bcb4 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h @@ -115,7 +115,7 @@ neg %eax; \ movl %eax, (%rcx) # else -# ifndef NOT_IN_libc +# if IS_IN (libc) # define SYSCALL_ERROR_ERRNO __libc_errno # else # define SYSCALL_ERROR_ERRNO errno diff --git a/sysdeps/wordsize-32/symbol-hacks.h b/sysdeps/wordsize-32/symbol-hacks.h index 11e4701c50..38b2b74347 100644 --- a/sysdeps/wordsize-32/symbol-hacks.h +++ b/sysdeps/wordsize-32/symbol-hacks.h @@ -23,7 +23,7 @@ therefore we get PLTs. Unnecessarily so. Changing gcc is a big task which might not be worth it so we play tricks with the assembler. */ -#if !defined __ASSEMBLER__ && !defined in_divdi3_c && !defined NOT_IN_libc && defined SHARED +#if !defined __ASSEMBLER__ && !defined in_divdi3_c && IS_IN (libc) && defined SHARED asm ("__divdi3 = __divdi3_internal"); asm ("__udivdi3 = __udivdi3_internal"); asm ("__moddi3 = __moddi3_internal"); diff --git a/sysdeps/x86_64/memcpy.S b/sysdeps/x86_64/memcpy.S index 60f3c65183..2c9aa5a160 100644 --- a/sysdeps/x86_64/memcpy.S +++ b/sysdeps/x86_64/memcpy.S @@ -30,7 +30,7 @@ # define RETVAL (0) #else # define RETVAL (-8) -# if defined SHARED && !defined USE_MULTIARCH && !defined NOT_IN_libc +# if defined SHARED && !defined USE_MULTIARCH && IS_IN (libc) # define memcpy __memcpy # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ @@ -44,7 +44,7 @@ .text -#if defined PIC && !defined NOT_IN_libc +#if defined PIC && IS_IN (libc) ENTRY_CHK (__memcpy_chk) cmpq %rdx, %rcx @@ -253,14 +253,14 @@ L(32after): /* Handle blocks smaller than 1/2 L1. */ L(fasttry): /* first 1/2 L1 */ -#ifndef NOT_IN_libc /* only up to this algorithm outside of libc.so */ +#if IS_IN (libc) /* only up to this algorithm outside of libc.so */ mov __x86_data_cache_size_half(%rip), %R11_LP cmpq %rdx, %r11 /* calculate the smaller of */ cmovaq %rdx, %r11 /* remaining bytes and 1/2 L1 */ #endif L(fast): /* good ol' MOVS */ -#ifndef NOT_IN_libc +#if IS_IN (libc) movq %r11, %rcx andq $-8, %r11 #else @@ -275,7 +275,7 @@ L(fast): /* good ol' MOVS */ .p2align 4,, 4 L(fastskip): -#ifndef NOT_IN_libc +#if IS_IN (libc) subq %r11, %rdx /* check for more */ testq $-8, %rdx jnz L(fastafter) @@ -294,7 +294,7 @@ L(fastskip): #endif retq /* exit */ -#ifndef NOT_IN_libc /* none of the algorithms below for RTLD */ +#if IS_IN (libc) /* none of the algorithms below for RTLD */ .p2align 4 @@ -570,13 +570,13 @@ L(NTskip): #endif retq /* exit */ -#endif /* !NOT_IN_libc */ +#endif /* IS_IN (libc) */ END(memcpy) #ifndef USE_AS_MEMPCPY libc_hidden_builtin_def (memcpy) -# if defined SHARED && !defined USE_MULTIARCH && !defined NOT_IN_libc +# if defined SHARED && !defined USE_MULTIARCH && IS_IN (libc) # undef memcpy # include <shlib-compat.h> versioned_symbol (libc, __memcpy, memcpy, GLIBC_2_14); diff --git a/sysdeps/x86_64/memmove.c b/sysdeps/x86_64/memmove.c index 202f5b861e..d538ebaf74 100644 --- a/sysdeps/x86_64/memmove.c +++ b/sysdeps/x86_64/memmove.c @@ -17,7 +17,7 @@ #include "string/memmove.c" -#if !defined memmove && !defined NOT_IN_libc +#if !defined memmove && IS_IN (libc) #include <shlib-compat.h> #if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14) diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S index db4fb842ef..7fec5779b5 100644 --- a/sysdeps/x86_64/memset.S +++ b/sysdeps/x86_64/memset.S @@ -20,7 +20,7 @@ #include <sysdep.h> .text -#if !defined NOT_IN_libc +#if IS_IN (libc) ENTRY(__bzero) movq %rdi, %rax /* Set return value. */ movq %rsi, %rdx /* Set n. */ @@ -42,7 +42,7 @@ ENTRY(__memset_tail) END(__memset_tail) #endif -#if defined PIC && !defined NOT_IN_libc +#if defined PIC && IS_IN (libc) ENTRY_CHK (__memset_chk) cmpq %rdx, %rcx jb HIDDEN_JUMPTARGET (__chk_fail) @@ -125,7 +125,7 @@ L(between8_16bytes): END (memset) libc_hidden_builtin_def (memset) -#if defined PIC && !defined NOT_IN_libc && !defined USE_MULTIARCH +#if defined PIC && IS_IN (libc) && !defined USE_MULTIARCH strong_alias (__memset_chk, __memset_zero_constant_len_parameter) .section .gnu.warning.__memset_zero_constant_len_parameter .string "memset used with constant zero length parameter; this could be due to transposed parameters" diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h index ef0abbd226..c701edd185 100644 --- a/sysdeps/x86_64/multiarch/init-arch.h +++ b/sysdeps/x86_64/multiarch/init-arch.h @@ -122,7 +122,7 @@ extern void __init_cpu_features (void) attribute_hidden; extern const struct cpu_features *__get_cpu_features (void) __attribute__ ((const)); -# ifndef NOT_IN_libc +# if IS_IN (libc) # define __get_cpu_features() (&__cpu_features) # endif diff --git a/sysdeps/x86_64/multiarch/memcmp-sse4.S b/sysdeps/x86_64/multiarch/memcmp-sse4.S index e753d62bf4..e747e97de4 100644 --- a/sysdeps/x86_64/multiarch/memcmp-sse4.S +++ b/sysdeps/x86_64/multiarch/memcmp-sse4.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/x86_64/multiarch/memcmp-ssse3.S b/sysdeps/x86_64/multiarch/memcmp-ssse3.S index 5f7572fbab..82297edaaf 100644 --- a/sysdeps/x86_64/multiarch/memcmp-ssse3.S +++ b/sysdeps/x86_64/multiarch/memcmp-ssse3.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/x86_64/multiarch/memcmp.S b/sysdeps/x86_64/multiarch/memcmp.S index 627d8d05cf..f0beaebdf3 100644 --- a/sysdeps/x86_64/multiarch/memcmp.S +++ b/sysdeps/x86_64/multiarch/memcmp.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(memcmp) .type memcmp, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S b/sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S index 3cac1e33cd..eb5de254e2 100644 --- a/sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S +++ b/sysdeps/x86_64/multiarch/memcpy-avx-unaligned.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc \ +#if IS_IN (libc) \ && (defined SHARED \ || defined USE_AS_MEMMOVE \ || !defined USE_MULTIARCH) diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S index 899ccbc34b..2fa465bc69 100644 --- a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S +++ b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S @@ -19,7 +19,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc \ +#if IS_IN (libc) \ && (defined SHARED \ || defined USE_AS_MEMMOVE \ || !defined USE_MULTIARCH) diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3.S b/sysdeps/x86_64/multiarch/memcpy-ssse3.S index 0ad9a0008a..7d0755e258 100644 --- a/sysdeps/x86_64/multiarch/memcpy-ssse3.S +++ b/sysdeps/x86_64/multiarch/memcpy-ssse3.S @@ -19,7 +19,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc \ +#if IS_IN (libc) \ && (defined SHARED \ || defined USE_AS_MEMMOVE \ || !defined USE_MULTIARCH) diff --git a/sysdeps/x86_64/multiarch/memcpy.S b/sysdeps/x86_64/multiarch/memcpy.S index e666695407..1523313f24 100644 --- a/sysdeps/x86_64/multiarch/memcpy.S +++ b/sysdeps/x86_64/multiarch/memcpy.S @@ -25,7 +25,7 @@ /* Define multiple versions only for the definition in lib and for DSO. In static binaries we need memcpy before the initialization happened. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) .text ENTRY(__new_memcpy) .type __new_memcpy, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/memcpy_chk.S b/sysdeps/x86_64/multiarch/memcpy_chk.S index 076b19a9ea..ded14abc58 100644 --- a/sysdeps/x86_64/multiarch/memcpy_chk.S +++ b/sysdeps/x86_64/multiarch/memcpy_chk.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in lib and for DSO. There are no multiarch memcpy functions for static binaries. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(__memcpy_chk) diff --git a/sysdeps/x86_64/multiarch/memmove.c b/sysdeps/x86_64/multiarch/memmove.c index 0c9af7e4df..31d00f8e82 100644 --- a/sysdeps/x86_64/multiarch/memmove.c +++ b/sysdeps/x86_64/multiarch/memmove.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define MEMMOVE __memmove_sse2 # ifdef SHARED # undef libc_hidden_builtin_def @@ -41,7 +41,7 @@ extern __typeof (__redirect_memmove) __memmove_avx_unaligned attribute_hidden; #include "string/memmove.c" -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <shlib-compat.h> # include "init-arch.h" diff --git a/sysdeps/x86_64/multiarch/mempcpy.S b/sysdeps/x86_64/multiarch/mempcpy.S index 7589d8c1ec..3b7bdb0579 100644 --- a/sysdeps/x86_64/multiarch/mempcpy.S +++ b/sysdeps/x86_64/multiarch/mempcpy.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in lib and for DSO. In static binaries we need mempcpy before the initialization happened. */ -#if defined SHARED && !defined NOT_IN_libc +#if defined SHARED && IS_IN (libc) ENTRY(__mempcpy) .type __mempcpy, @gnu_indirect_function cmpl $0, KIND_OFFSET+__cpu_features(%rip) diff --git a/sysdeps/x86_64/multiarch/mempcpy_chk.S b/sysdeps/x86_64/multiarch/mempcpy_chk.S index 88e0b74e83..c0d33fecd2 100644 --- a/sysdeps/x86_64/multiarch/mempcpy_chk.S +++ b/sysdeps/x86_64/multiarch/mempcpy_chk.S @@ -24,7 +24,7 @@ /* Define multiple versions only for the definition in lib and for DSO. There are no multiarch mempcpy functions for static binaries. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifdef SHARED .text ENTRY(__mempcpy_chk) diff --git a/sysdeps/x86_64/multiarch/memset-avx2.S b/sysdeps/x86_64/multiarch/memset-avx2.S index b45f8a0d53..0de08002d7 100644 --- a/sysdeps/x86_64/multiarch/memset-avx2.S +++ b/sysdeps/x86_64/multiarch/memset-avx2.S @@ -18,7 +18,7 @@ #include <sysdep.h> -#if !defined NOT_IN_libc +#if IS_IN (libc) #include "asm-syntax.h" #ifndef MEMSET diff --git a/sysdeps/x86_64/multiarch/memset.S b/sysdeps/x86_64/multiarch/memset.S index 00d46d12d0..61868c7012 100644 --- a/sysdeps/x86_64/multiarch/memset.S +++ b/sysdeps/x86_64/multiarch/memset.S @@ -23,7 +23,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in lib. */ -# ifndef NOT_IN_libc +# if IS_IN (libc) ENTRY(memset) .type memset, @gnu_indirect_function cmpl $0, __cpu_features+KIND_OFFSET(%rip) @@ -37,7 +37,7 @@ ENTRY(memset) END(memset) # endif -# if !defined NOT_IN_libc +# if IS_IN (libc) # undef memset # define memset __memset_sse2 diff --git a/sysdeps/x86_64/multiarch/memset_chk.S b/sysdeps/x86_64/multiarch/memset_chk.S index 8a607bd6b7..7528a422d8 100644 --- a/sysdeps/x86_64/multiarch/memset_chk.S +++ b/sysdeps/x86_64/multiarch/memset_chk.S @@ -21,7 +21,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in lib. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # if defined SHARED && defined HAVE_AVX2_SUPPORT ENTRY(__memset_chk) .type __memset_chk, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S b/sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S index dc782f2c23..9b8db7a786 100644 --- a/sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S +++ b/sysdeps/x86_64/multiarch/strcat-sse2-unaligned.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/x86_64/multiarch/strcat-ssse3.S b/sysdeps/x86_64/multiarch/strcat-ssse3.S index fde7b90822..9448125acb 100644 --- a/sysdeps/x86_64/multiarch/strcat-ssse3.S +++ b/sysdeps/x86_64/multiarch/strcat-ssse3.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> diff --git a/sysdeps/x86_64/multiarch/strcat.S b/sysdeps/x86_64/multiarch/strcat.S index d5c9d847d4..531878016f 100644 --- a/sysdeps/x86_64/multiarch/strcat.S +++ b/sysdeps/x86_64/multiarch/strcat.S @@ -43,7 +43,7 @@ /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(STRCAT) .type STRCAT, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S b/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S index 0b3f0961c3..7870494b6e 100644 --- a/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S +++ b/sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> # include "asm-syntax.h" diff --git a/sysdeps/x86_64/multiarch/strchr.S b/sysdeps/x86_64/multiarch/strchr.S index 63a35fa62f..3f247b6169 100644 --- a/sysdeps/x86_64/multiarch/strchr.S +++ b/sysdeps/x86_64/multiarch/strchr.S @@ -21,7 +21,7 @@ /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(strchr) .type strchr, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/strcmp-ssse3.S b/sysdeps/x86_64/multiarch/strcmp-ssse3.S index 43b3f300b4..1b7fa33c91 100644 --- a/sysdeps/x86_64/multiarch/strcmp-ssse3.S +++ b/sysdeps/x86_64/multiarch/strcmp-ssse3.S @@ -1,4 +1,4 @@ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define USE_SSSE3 1 # define STRCMP __strcmp_ssse3 # include "../strcmp.S" diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S index bd71714e0b..45b2186086 100644 --- a/sysdeps/x86_64/multiarch/strcmp.S +++ b/sysdeps/x86_64/multiarch/strcmp.S @@ -80,7 +80,7 @@ /* Define multiple versions only for the definition in libc. Don't define multiple versions for strncmp in static library since we need strncmp before the initialization happened. */ -#if (defined SHARED || !defined USE_AS_STRNCMP) && !defined NOT_IN_libc +#if (defined SHARED || !defined USE_AS_STRNCMP) && IS_IN (libc) .text ENTRY(STRCMP) .type STRCMP, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S b/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S index be7513d480..d616d1a7e5 100644 --- a/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S +++ b/sysdeps/x86_64/multiarch/strcpy-sse2-unaligned.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifndef USE_AS_STRCAT # include <sysdep.h> diff --git a/sysdeps/x86_64/multiarch/strcpy-ssse3.S b/sysdeps/x86_64/multiarch/strcpy-ssse3.S index 86569ff54a..7ca044d3be 100644 --- a/sysdeps/x86_64/multiarch/strcpy-ssse3.S +++ b/sysdeps/x86_64/multiarch/strcpy-ssse3.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # ifndef USE_AS_STRCAT # include <sysdep.h> diff --git a/sysdeps/x86_64/multiarch/strcpy.S b/sysdeps/x86_64/multiarch/strcpy.S index 80ed98b30a..0467b216ce 100644 --- a/sysdeps/x86_64/multiarch/strcpy.S +++ b/sysdeps/x86_64/multiarch/strcpy.S @@ -57,7 +57,7 @@ /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(STRCPY) .type STRCPY, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/strcspn.S b/sysdeps/x86_64/multiarch/strcspn.S index 24f55e9579..1250dc8fb5 100644 --- a/sysdeps/x86_64/multiarch/strcspn.S +++ b/sysdeps/x86_64/multiarch/strcspn.S @@ -41,7 +41,7 @@ /* Define multiple versions only for the definition in libc. Don't define multiple versions for strpbrk in static library since we need strpbrk before the initialization happened. */ -#if (defined SHARED || !defined USE_AS_STRPBRK) && !defined NOT_IN_libc +#if (defined SHARED || !defined USE_AS_STRPBRK) && IS_IN (libc) .text ENTRY(STRCSPN) .type STRCSPN, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/strspn.S b/sysdeps/x86_64/multiarch/strspn.S index bf7308eade..66309266e3 100644 --- a/sysdeps/x86_64/multiarch/strspn.S +++ b/sysdeps/x86_64/multiarch/strspn.S @@ -26,7 +26,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(strspn) .type strspn, @gnu_indirect_function diff --git a/sysdeps/x86_64/multiarch/wcscpy-c.c b/sysdeps/x86_64/multiarch/wcscpy-c.c index f27c069198..a51a83a9be 100644 --- a/sysdeps/x86_64/multiarch/wcscpy-c.c +++ b/sysdeps/x86_64/multiarch/wcscpy-c.c @@ -1,4 +1,4 @@ -#ifndef NOT_IN_libc +#if IS_IN (libc) # define wcscpy __wcscpy_sse2 #endif diff --git a/sysdeps/x86_64/multiarch/wcscpy-ssse3.S b/sysdeps/x86_64/multiarch/wcscpy-ssse3.S index c79389ec3b..5b188ac46e 100644 --- a/sysdeps/x86_64/multiarch/wcscpy-ssse3.S +++ b/sysdeps/x86_64/multiarch/wcscpy-ssse3.S @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <sysdep.h> .section .text.ssse3,"ax",@progbits diff --git a/sysdeps/x86_64/multiarch/wcscpy.S b/sysdeps/x86_64/multiarch/wcscpy.S index f12ba27d60..43ffe6df00 100644 --- a/sysdeps/x86_64/multiarch/wcscpy.S +++ b/sysdeps/x86_64/multiarch/wcscpy.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(wcscpy) diff --git a/sysdeps/x86_64/multiarch/wmemcmp-c.c b/sysdeps/x86_64/multiarch/wmemcmp-c.c index 1074238daf..46b6715e18 100644 --- a/sysdeps/x86_64/multiarch/wmemcmp-c.c +++ b/sysdeps/x86_64/multiarch/wmemcmp-c.c @@ -1,4 +1,4 @@ -#ifndef NOT_IN_libc +#if IS_IN (libc) # include <wchar.h> # define WMEMCMP __wmemcmp_sse2 diff --git a/sysdeps/x86_64/multiarch/wmemcmp.S b/sysdeps/x86_64/multiarch/wmemcmp.S index 37b9bbaeea..c5b211d786 100644 --- a/sysdeps/x86_64/multiarch/wmemcmp.S +++ b/sysdeps/x86_64/multiarch/wmemcmp.S @@ -22,7 +22,7 @@ #include <init-arch.h> /* Define multiple versions only for the definition in libc. */ -#ifndef NOT_IN_libc +#if IS_IN (libc) .text ENTRY(wmemcmp) .type wmemcmp, @gnu_indirect_function diff --git a/sysdeps/x86_64/strcmp.S b/sysdeps/x86_64/strcmp.S index fc45a620ac..b022a04ff7 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. */ -# ifdef NOT_IN_libc +# if !IS_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. */ -# ifdef NOT_IN_libc +# if !IS_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. */ -# ifdef NOT_IN_libc +# if !IS_IN (libc) # error "strncasecmp_l not implemented so far" # endif @@ -126,7 +126,7 @@ libc_hidden_def (__strncasecmp) #endif ENTRY (STRCMP) -#ifdef NOT_IN_libc +#if !IS_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 /* NOT_IN_libc */ +#else /* !IS_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 /* NOT_IN_libc */ +#endif /* !IS_IN (libc) */ libc_hidden_builtin_def (STRCMP) |