Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove NOT_IN_libc
Replace with !IS_IN (libc).  This completes the transition from
the IS_IN/NOT_IN macros to the IN_MODULE macro set.

The generated code is unchanged on x86_64.

	* 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.
  • Loading branch information
Siddhesh Poyarekar committed Nov 24, 2014
1 parent 76ca86a commit 4f41c68
Show file tree
Hide file tree
Showing 317 changed files with 751 additions and 447 deletions.
324 changes: 324 additions & 0 deletions ChangeLog

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions Makerules
Expand Up @@ -1228,9 +1228,6 @@ lib := nonlib
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif endif


# The include magic above causes those files to use this variable for flags.
CPPFLAGS-nonlib = -DNOT_IN_libc=1



ifeq ($(build-shared),yes) ifeq ($(build-shared),yes)
# Generate normalized lists of symbols, versions, and data sizes. # Generate normalized lists of symbols, versions, and data sizes.
Expand Down
2 changes: 1 addition & 1 deletion bits/stdio-lock.h
Expand Up @@ -44,7 +44,7 @@ __libc_lock_define_recursive (typedef, _IO_lock_t)
#define _IO_cleanup_region_end(_doit) \ #define _IO_cleanup_region_end(_doit) \
__libc_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) \ # define _IO_acquire_lock(_fp) \
_IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \
_IO_flockfile (_fp) _IO_flockfile (_fp)
Expand Down
6 changes: 1 addition & 5 deletions elf/Makefile
Expand Up @@ -97,7 +97,6 @@ install-others += $(inst_auditdir)/sotruss-lib.so
install-bin-script += sotruss install-bin-script += sotruss
generated += sotruss generated += sotruss
libof-sotruss-lib = extramodules libof-sotruss-lib = extramodules
CPPFLAGS-sotruss-lib = -DNOT_IN_libc
$(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os $(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os
$(build-module-asneeded) $(build-module-asneeded)
$(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
Expand Down Expand Up @@ -437,15 +436,12 @@ $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)


SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
-D'SLIBDIR="$(slibdir)"' -DNOT_IN_libc -D'SLIBDIR="$(slibdir)"'
libof-ldconfig = ldconfig libof-ldconfig = ldconfig
CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
CFLAGS-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS)
CFLAGS-rtld.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) cpp-srcs-left := $(all-rtld-routines:=.os)
lib := rtld lib := rtld
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
Expand Down
4 changes: 1 addition & 3 deletions elf/rtld-Rules
Expand Up @@ -138,12 +138,10 @@ ifdef rtld-depfiles
-include $(rtld-depfiles) -include $(rtld-depfiles)
endif endif


# This here is the whole point of all the shenanigans.
# Set libof-* for each routine. # Set libof-* for each routine.
cpp-srcs-left := $(rtld-modules:%.os=%) cpp-srcs-left := $(rtld-modules:%.os=%)
lib := rtld lib := rtld
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) 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 endif
2 changes: 0 additions & 2 deletions extra-lib.mk
Expand Up @@ -105,5 +105,3 @@ cpp-srcs-left := $($(lib)-routines) $($(lib)-sysdep_routines)
ifneq (,$(cpp-srcs-left)) ifneq (,$(cpp-srcs-left))
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
endif endif

CPPFLAGS-$(lib) := -DNOT_IN_libc=1
1 change: 0 additions & 1 deletion extra-modules.mk
Expand Up @@ -7,4 +7,3 @@ module := $(firstword $(extra-modules-left))
extra-modules-left := $(filter-out $(module),$(extra-modules-left)) extra-modules-left := $(filter-out $(module),$(extra-modules-left))


libof-$(notdir $(module)) := extramodules libof-$(notdir $(module)) := extramodules
CPPFLAGS-$(module).c += -DNOT_IN_libc
2 changes: 0 additions & 2 deletions iconv/Makefile
Expand Up @@ -52,8 +52,6 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"'
CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"' CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"'
CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"' CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"'


CPPFLAGS-iconvprogs = -DNOT_IN_libc

# Set libof-* for each routine. # Set libof-* for each routine.
cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules) cpp-srcs-left := $(iconv_prog-modules) $(iconvconfig-modules)
lib := iconvprogs lib := iconvprogs
Expand Down
7 changes: 3 additions & 4 deletions iconvdata/Makefile
Expand Up @@ -75,9 +75,6 @@ endif
test-srcs := tst-table-from tst-table-to test-srcs := tst-table-from tst-table-to
endif endif


# No code here is in libc.so.
CPPFLAGS += -DNOT_IN_libc

libJIS-routines := jis0201 jis0208 jis0212 libJIS-routines := jis0201 jis0208 jis0212
libKSC-routines := ksc5601 libKSC-routines := ksc5601
libGB-routines := gb2312 libGB-routines := gb2312
Expand Down Expand Up @@ -275,7 +272,9 @@ endif
include ../Rules include ../Rules


# Set libof-* for each routine. # 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 lib := iconvdata
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))


Expand Down
2 changes: 1 addition & 1 deletion include/assert.h
Expand Up @@ -20,7 +20,7 @@ extern void __assert_fail_base (const char *fmt, const char *assertion,
const char *function) const char *function)
__THROW __attribute__ ((__noreturn__)); __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_fail)
hidden_proto (__assert_perror_fail) hidden_proto (__assert_perror_fail)
# endif # endif
Expand Down
4 changes: 2 additions & 2 deletions include/ctype.h
Expand Up @@ -11,7 +11,7 @@ libc_hidden_proto (__ctype_init)
So defeat macro expansion with parens for this declaration. */ So defeat macro expansion with parens for this declaration. */
extern int (__isctype) (int __c, int __mask); 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 /* These accessors are used by the optimized macros to find the
thread-local cache of ctype information from the current thread's thread-local cache of ctype information from the current thread's
Expand Down Expand Up @@ -61,7 +61,7 @@ __ctype_tolower_loc (void)
# define __isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; }) # define __isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; })
# endif /* Not __NO_CTYPE. */ # endif /* Not __NO_CTYPE. */


# endif /* Not NOT_IN_libc. */ # endif /* IS_IN (libc). */
#endif /* Not _ISOMAC. */ #endif /* Not _ISOMAC. */


#endif /* ctype.h */ #endif /* ctype.h */
6 changes: 3 additions & 3 deletions include/errno.h
Expand Up @@ -22,19 +22,19 @@
# define errno rtld_errno # define errno rtld_errno
extern int rtld_errno attribute_hidden; extern int rtld_errno attribute_hidden;


# elif !defined NOT_IN_libc || IS_IN_LIB # elif IS_IN_LIB


# include <tls.h> # include <tls.h>


# undef errno # undef errno
# ifndef NOT_IN_libc # if IS_IN (libc)
# define errno __libc_errno # define errno __libc_errno
# else # else
# define errno errno /* For #ifndef errno tests. */ # define errno errno /* For #ifndef errno tests. */
# endif # endif
extern __thread int errno attribute_tls_model_ie; 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)) # define __set_errno(val) (errno = (val))


Expand Down
2 changes: 1 addition & 1 deletion include/libc-symbols.h
Expand Up @@ -549,7 +549,7 @@ for linking")
# define hidden_nolink(name, lib, version) # define hidden_nolink(name, lib, version)
#endif #endif


#if !defined NOT_IN_libc #if IS_IN (libc)
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # 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_tls_proto(name, attrs...) hidden_tls_proto (name, ##attrs)
# define libc_hidden_def(name) hidden_def (name) # define libc_hidden_def(name) hidden_def (name)
Expand Down
2 changes: 1 addition & 1 deletion include/math.h
Expand Up @@ -6,7 +6,7 @@
/* Now define the internal interfaces. */ /* Now define the internal interfaces. */
extern int __matherr (struct exception *__exc); 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 (__finite)
hidden_proto (__isinf) hidden_proto (__isinf)
hidden_proto (__isnan) hidden_proto (__isnan)
Expand Down
6 changes: 3 additions & 3 deletions include/netdb.h
Expand Up @@ -4,15 +4,15 @@


#ifndef _ISOMAC #ifndef _ISOMAC
/* Macros for accessing h_errno from inside libc. */ /* Macros for accessing h_errno from inside libc. */
# if !defined NOT_IN_libc || IS_IN_LIB # if IS_IN_LIB
# undef h_errno # undef h_errno
# ifndef NOT_IN_libc # if IS_IN (libc)
# define h_errno __libc_h_errno # define h_errno __libc_h_errno
# else # else
# define h_errno h_errno /* For #ifndef h_errno tests. */ # define h_errno h_errno /* For #ifndef h_errno tests. */
# endif # endif
extern __thread int h_errno attribute_tls_model_ie; 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)) # define __set_h_errno(x) (h_errno = (x))


libc_hidden_proto (hstrerror) libc_hidden_proto (hstrerror)
Expand Down
2 changes: 1 addition & 1 deletion include/resolv.h
Expand Up @@ -13,7 +13,7 @@


#ifdef _RESOLV_H_ #ifdef _RESOLV_H_


# ifndef NOT_IN_libc # if IS_IN (libc)
# define __resp __libc_resp # define __resp __libc_resp
# endif # endif
extern __thread struct __res_state *__resp attribute_tls_model_ie; extern __thread struct __res_state *__resp attribute_tls_model_ie;
Expand Down
2 changes: 1 addition & 1 deletion include/stdio.h
Expand Up @@ -117,7 +117,7 @@ extern const char *const _sys_errlist_internal[] attribute_hidden;
extern int _sys_nerr_internal attribute_hidden; extern int _sys_nerr_internal attribute_hidden;


libc_hidden_proto (__asprintf) libc_hidden_proto (__asprintf)
# if !defined NOT_IN_libc # if IS_IN (libc)
extern _IO_FILE *_IO_new_fopen (const char*, const char*); extern _IO_FILE *_IO_new_fopen (const char*, const char*);
# define fopen(fname, mode) _IO_new_fopen (fname, mode) # define fopen(fname, mode) _IO_new_fopen (fname, mode)
extern _IO_FILE *_IO_new_fdopen (int, const char*); extern _IO_FILE *_IO_new_fdopen (int, const char*);
Expand Down
2 changes: 1 addition & 1 deletion include/stdlib.h
Expand Up @@ -226,7 +226,7 @@ extern int __qfcvt_r (long double __value, int __ndigit,
int *__restrict __decpt, int *__restrict __sign, int *__restrict __decpt, int *__restrict __sign,
char *__restrict __buf, size_t __len); char *__restrict __buf, size_t __len);


# ifndef NOT_IN_libc # if IS_IN (libc)
# undef MB_CUR_MAX # undef MB_CUR_MAX
# define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX)) # define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX))
# endif # endif
Expand Down
4 changes: 2 additions & 2 deletions include/string.h
Expand Up @@ -57,7 +57,7 @@ extern __typeof (strcasecmp_l) __strcasecmp_l;
extern __typeof (strncasecmp_l) __strncasecmp_l; extern __typeof (strncasecmp_l) __strncasecmp_l;


/* Alternative version which doesn't pollute glibc's namespace. */ /* Alternative version which doesn't pollute glibc's namespace. */
#ifndef NOT_IN_libc #if IS_IN (libc)
# undef strndupa # undef strndupa
# define strndupa(s, n) \ # define strndupa(s, n) \
(__extension__ \ (__extension__ \
Expand Down Expand Up @@ -115,7 +115,7 @@ libc_hidden_builtin_proto (strspn)
libc_hidden_builtin_proto (strstr) libc_hidden_builtin_proto (strstr)
libc_hidden_builtin_proto (ffs) libc_hidden_builtin_proto (ffs)


#if (defined NOT_IN_libc || !defined SHARED) \ #if (!IS_IN (libc) || !defined SHARED) \
&& !defined NO_MEMPCPY_STPCPY_REDIRECT && !defined NO_MEMPCPY_STPCPY_REDIRECT
/* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call /* Redirect calls to __builtin_mempcpy and __builtin_stpcpy to call
__mempcpy and __stpcpy if not inlined. */ __mempcpy and __stpcpy if not inlined. */
Expand Down
2 changes: 1 addition & 1 deletion include/sys/stat.h
Expand Up @@ -12,7 +12,7 @@ extern __mode_t __umask (__mode_t __mask);
extern int __mkdir (const char *__path, __mode_t __mode); extern int __mkdir (const char *__path, __mode_t __mode);
extern int __mknod (const char *__path, extern int __mknod (const char *__path,
__mode_t __mode, __dev_t __dev); __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 (__fxstat)
hidden_proto (__fxstat64) hidden_proto (__fxstat64)
hidden_proto (__lxstat) hidden_proto (__lxstat)
Expand Down
2 changes: 1 addition & 1 deletion include/wctype.h
Expand Up @@ -80,7 +80,7 @@ libc_hidden_proto (__towupper_l)


/* The spec says that isdigit must only match the decimal digits. We /* The spec says that isdigit must only match the decimal digits. We
can check this without a memory access. */ can check this without a memory access. */
# ifndef NOT_IN_libc # if IS_IN (libc)
# undef iswdigit # undef iswdigit
# define iswdigit(c) ({ wint_t __c = (c); __c >= L'0' && __c <= L'9'; }) # define iswdigit(c) ({ wint_t __c = (c); __c >= L'0' && __c <= L'9'; })
# undef iswdigit_l # undef iswdigit_l
Expand Down
2 changes: 1 addition & 1 deletion intl/l10nflist.c
Expand Up @@ -324,7 +324,7 @@ _nl_normalize_codeset (codeset, name_len)
char *retval; char *retval;
char *wp; char *wp;
size_t cnt; size_t cnt;
#ifdef NOT_IN_libc #if !IS_IN (libc)
locale_t locale = newlocale (0, "C", NULL); locale_t locale = newlocale (0, "C", NULL);
#else #else
# define locale _nl_C_locobj_ptr # define locale _nl_C_locobj_ptr
Expand Down
2 changes: 1 addition & 1 deletion libidn/idn-stub.c
Expand Up @@ -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) libc_freeres_fn (unload_libidn)
{ {
if (h != NULL && h != (void *) 1l) if (h != NULL && h != (void *) 1l)
Expand Down
2 changes: 1 addition & 1 deletion libio/libioP.h
Expand Up @@ -902,7 +902,7 @@ _IO_acquire_lock_clear_flags2_fct (_IO_FILE **p)
_IO_funlockfile (fp); _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) \ # define _IO_acquire_lock(_fp) \
do { \ do { \
_IO_FILE *_IO_acquire_lock_file = NULL _IO_FILE *_IO_acquire_lock_file = NULL
Expand Down
5 changes: 2 additions & 3 deletions locale/Makefile
Expand Up @@ -88,14 +88,13 @@ locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \ CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \ -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \ -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
-DLOCSRCDIR='"$(i18ndir)/locales"' \ -DLOCSRCDIR='"$(i18ndir)/locales"'
-DNOT_IN_libc


CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
CFLAGS-charmap-dir.c = -Wno-write-strings 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) \ cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \
$(lib-modules) $(lib-modules)
lib := locale-programs lib := locale-programs
Expand Down
2 changes: 0 additions & 2 deletions malloc/Makefile
Expand Up @@ -48,8 +48,6 @@ extra-objs = mcheck-init.o libmcheck.a
# Include the cleanup handler. # Include the cleanup handler.
aux := set-freeres thread-freeres aux := set-freeres thread-freeres


CPPFLAGS-memusagestat = -DNOT_IN_libc

# The Perl script to analyze the output of the mtrace functions. # The Perl script to analyze the output of the mtrace functions.
ifneq ($(PERL),no) ifneq ($(PERL),no)
install-bin-script = mtrace install-bin-script = mtrace
Expand Down
2 changes: 1 addition & 1 deletion nptl/libc_multiple_threads.c
Expand Up @@ -18,7 +18,7 @@


#include <pthreadP.h> #include <pthreadP.h>


#ifndef NOT_IN_libc #if IS_IN (libc)
# ifndef TLS_MULTIPLE_THREADS_IN_TCB # ifndef TLS_MULTIPLE_THREADS_IN_TCB
/* Variable set to a nonzero value either if more than one thread runs or ran, /* 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 or if a single-threaded process is trying to cancel itself. See
Expand Down
2 changes: 1 addition & 1 deletion nptl/pthreadP.h
Expand Up @@ -292,7 +292,7 @@ __do_cancel (void)
#define CANCEL_RESET(oldtype) \ #define CANCEL_RESET(oldtype) \
__pthread_disable_asynccancel (oldtype) __pthread_disable_asynccancel (oldtype)


#if !defined NOT_IN_libc #if IS_IN (libc)
/* Same as CANCEL_ASYNC, but for use in libc.so. */ /* Same as CANCEL_ASYNC, but for use in libc.so. */
# define LIBC_CANCEL_ASYNC() \ # define LIBC_CANCEL_ASYNC() \
__libc_enable_asynccancel () __libc_enable_asynccancel ()
Expand Down
2 changes: 1 addition & 1 deletion nscd/Makefile
Expand Up @@ -79,7 +79,7 @@ CFLAGS-nscd_gethst_r.c = -fexceptions
CFLAGS-nscd_getai.c = -fexceptions CFLAGS-nscd_getai.c = -fexceptions
CFLAGS-nscd_initgroups.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)) ifeq (yesyes,$(have-fpie)$(build-shared))
CFLAGS-nscd += $(pie-ccflag) CFLAGS-nscd += $(pie-ccflag)
Expand Down
1 change: 0 additions & 1 deletion nss/Makefile
Expand Up @@ -106,7 +106,6 @@ $(inst_vardbdir)/Makefile: db-Makefile $(+force)
$(do-install) $(do-install)


libof-nss_test1 = extramodules libof-nss_test1 = extramodules
CPPFLAGS-nss_test1 = -DNOT_IN_libc=1
$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps) $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
$(build-module) $(build-module)
ifdef libnss_test1.so-version ifdef libnss_test1.so-version
Expand Down
4 changes: 2 additions & 2 deletions posix/regex_internal.h
Expand Up @@ -381,7 +381,7 @@ typedef struct re_dfa_t re_dfa_t;
# endif # endif
#endif #endif


#ifndef NOT_IN_libc #if IS_IN (libc)
static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr, static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
int new_buf_len) int new_buf_len)
internal_function; internal_function;
Expand Down Expand Up @@ -731,7 +731,7 @@ re_string_wchar_at (const re_string_t *pstr, int idx)
return (wint_t) pstr->wcs[idx]; return (wint_t) pstr->wcs[idx];
} }


# ifndef NOT_IN_libc # if IS_IN (libc)
# ifdef _LIBC # ifdef _LIBC
# include <locale/weight.h> # include <locale/weight.h>
# endif # endif
Expand Down
2 changes: 1 addition & 1 deletion resolv/res_hconf.c
Expand Up @@ -358,7 +358,7 @@ _res_hconf_init (void)
} }




#ifndef NOT_IN_libc #if IS_IN (libc)
# if defined SIOCGIFCONF && defined SIOCGIFNETMASK # if defined SIOCGIFCONF && defined SIOCGIFNETMASK
/* List of known interfaces. */ /* List of known interfaces. */
libc_freeres_ptr ( libc_freeres_ptr (
Expand Down
1 change: 0 additions & 1 deletion stdlib/Makefile
Expand Up @@ -146,7 +146,6 @@ LDFLAGS-tst-putenv = $(no-as-needed)
$(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps) $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os $(link-libc-deps)
$(build-module) $(build-module)
libof-tst-putenvmod = extramodules libof-tst-putenvmod = extramodules
CFLAGS-tst-putenvmod.c = -DNOT_IN_libc=1


$(objpfx)bug-getcontext: $(libm) $(objpfx)bug-getcontext: $(libm)
$(objpfx)tst-strtod-round: $(libm) $(objpfx)tst-strtod-round: $(libm)
Expand Down
5 changes: 3 additions & 2 deletions stdlib/isomac.c
Expand Up @@ -176,7 +176,8 @@ static char *macros[] =
/* Format string to build command to invoke compiler. */ /* Format string to build command to invoke compiler. */
static const char fmt[] = "\ static const char fmt[] = "\
echo \"#include <%s>\" |\ 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"; -isystem `%s --print-prog-name=include` - 2> /dev/null > %s";




Expand Down Expand Up @@ -305,7 +306,7 @@ get_null_defines (void)
; ;
result[result_len] = xstrndup (start, end - start); 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) if (first)
{ {
Expand Down
2 changes: 1 addition & 1 deletion sunrpc/Makefile
Expand Up @@ -166,7 +166,7 @@ $(cross-rpcgen-objs): $(objpfx)cross-%.o: %.c $(before-compile)
$(objpfx)cross-rpcgen: $(cross-rpcgen-objs) $(objpfx)cross-rpcgen: $(cross-rpcgen-objs)
$(BUILD_CC) $^ $(BUILD_LDFLAGS) -o $@ $(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) cpp-srcs-left := $(rpcgen-objs:.o=.c)
lib := nonlib lib := nonlib
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
Expand Down

0 comments on commit 4f41c68

Please sign in to comment.