mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
4f41c682f3
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.
380 lines
9.5 KiB
C
380 lines
9.5 KiB
C
/* Copyright (C) 1995-2014 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
|
||
|
||
The GNU C Library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Lesser General Public
|
||
License as published by the Free Software Foundation; either
|
||
version 2.1 of the License, or (at your option) any later version.
|
||
|
||
The GNU C Library is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Lesser General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser General Public
|
||
License along with the GNU C Library; if not, see
|
||
<http://www.gnu.org/licenses/>. */
|
||
|
||
/* Tell glibc's <string.h> to provide a prototype for stpcpy().
|
||
This must come before <config.h> because <config.h> may include
|
||
<features.h>, and once <features.h> has been included, it's too late. */
|
||
#ifndef _GNU_SOURCE
|
||
# define _GNU_SOURCE 1
|
||
#endif
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#include <string.h>
|
||
|
||
#if defined _LIBC || defined HAVE_ARGZ_H
|
||
# include <argz.h>
|
||
#endif
|
||
#include <ctype.h>
|
||
#include <sys/types.h>
|
||
#include <stdlib.h>
|
||
|
||
#include "loadinfo.h"
|
||
|
||
/* On some strange systems still no definition of NULL is found. Sigh! */
|
||
#ifndef NULL
|
||
# if defined __STDC__ && __STDC__
|
||
# define NULL ((void *) 0)
|
||
# else
|
||
# define NULL 0
|
||
# endif
|
||
#endif
|
||
|
||
/* @@ end of prolog @@ */
|
||
|
||
#ifdef _LIBC
|
||
/* Rename the non ANSI C functions. This is required by the standard
|
||
because some ANSI C functions will require linking with this object
|
||
file and the name space must not be polluted. */
|
||
# ifndef stpcpy
|
||
# define stpcpy(dest, src) __stpcpy(dest, src)
|
||
# endif
|
||
#else
|
||
# ifndef HAVE_STPCPY
|
||
static char *stpcpy PARAMS ((char *dest, const char *src));
|
||
# endif
|
||
#endif
|
||
|
||
/* Define function which are usually not available. */
|
||
|
||
#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
|
||
/* Returns the number of strings in ARGZ. */
|
||
static size_t argz_count__ PARAMS ((const char *argz, size_t len));
|
||
|
||
static size_t
|
||
argz_count__ (argz, len)
|
||
const char *argz;
|
||
size_t len;
|
||
{
|
||
size_t count = 0;
|
||
while (len > 0)
|
||
{
|
||
size_t part_len = strlen (argz);
|
||
argz += part_len + 1;
|
||
len -= part_len + 1;
|
||
count++;
|
||
}
|
||
return count;
|
||
}
|
||
# undef __argz_count
|
||
# define __argz_count(argz, len) argz_count__ (argz, len)
|
||
#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
|
||
|
||
#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
|
||
/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
|
||
except the last into the character SEP. */
|
||
static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
|
||
|
||
static void
|
||
argz_stringify__ (argz, len, sep)
|
||
char *argz;
|
||
size_t len;
|
||
int sep;
|
||
{
|
||
while (len > 0)
|
||
{
|
||
size_t part_len = strlen (argz);
|
||
argz += part_len;
|
||
len -= part_len + 1;
|
||
if (len > 0)
|
||
*argz++ = sep;
|
||
}
|
||
}
|
||
# undef __argz_stringify
|
||
# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
|
||
#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
|
||
|
||
#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
|
||
static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
|
||
const char *entry));
|
||
|
||
static char *
|
||
argz_next__ (argz, argz_len, entry)
|
||
char *argz;
|
||
size_t argz_len;
|
||
const char *entry;
|
||
{
|
||
if (entry)
|
||
{
|
||
if (entry < argz + argz_len)
|
||
entry = strchr (entry, '\0') + 1;
|
||
|
||
return entry >= argz + argz_len ? NULL : (char *) entry;
|
||
}
|
||
else
|
||
if (argz_len > 0)
|
||
return argz;
|
||
else
|
||
return 0;
|
||
}
|
||
# undef __argz_next
|
||
# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
|
||
#endif /* !_LIBC && !HAVE___ARGZ_NEXT */
|
||
|
||
|
||
/* Return number of bits set in X. */
|
||
#ifndef ARCH_POP
|
||
static int pop PARAMS ((int x));
|
||
|
||
static inline int
|
||
pop (x)
|
||
int x;
|
||
{
|
||
/* We assume that no more than 16 bits are used. */
|
||
x = ((x & ~0x5555) >> 1) + (x & 0x5555);
|
||
x = ((x & ~0x3333) >> 2) + (x & 0x3333);
|
||
x = ((x >> 4) + x) & 0x0f0f;
|
||
x = ((x >> 8) + x) & 0xff;
|
||
|
||
return x;
|
||
}
|
||
#endif
|
||
|
||
|
||
struct loaded_l10nfile *
|
||
_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
|
||
territory, codeset, normalized_codeset, modifier,
|
||
filename, do_allocate)
|
||
struct loaded_l10nfile **l10nfile_list;
|
||
const char *dirlist;
|
||
size_t dirlist_len;
|
||
int mask;
|
||
const char *language;
|
||
const char *territory;
|
||
const char *codeset;
|
||
const char *normalized_codeset;
|
||
const char *modifier;
|
||
const char *filename;
|
||
int do_allocate;
|
||
{
|
||
char *abs_filename;
|
||
struct loaded_l10nfile *last = NULL;
|
||
struct loaded_l10nfile *retval;
|
||
char *cp;
|
||
size_t entries;
|
||
int cnt;
|
||
|
||
/* Allocate room for the full file name. */
|
||
abs_filename = (char *) malloc (dirlist_len
|
||
+ strlen (language)
|
||
+ ((mask & XPG_TERRITORY) != 0
|
||
? strlen (territory) + 1 : 0)
|
||
+ ((mask & XPG_CODESET) != 0
|
||
? strlen (codeset) + 1 : 0)
|
||
+ ((mask & XPG_NORM_CODESET) != 0
|
||
? strlen (normalized_codeset) + 1 : 0)
|
||
+ ((mask & XPG_MODIFIER) != 0
|
||
? strlen (modifier) + 1 : 0)
|
||
+ 1 + strlen (filename) + 1);
|
||
|
||
if (abs_filename == NULL)
|
||
return NULL;
|
||
|
||
retval = NULL;
|
||
last = NULL;
|
||
|
||
/* Construct file name. */
|
||
memcpy (abs_filename, dirlist, dirlist_len);
|
||
__argz_stringify (abs_filename, dirlist_len, ':');
|
||
cp = abs_filename + (dirlist_len - 1);
|
||
*cp++ = '/';
|
||
cp = stpcpy (cp, language);
|
||
|
||
if ((mask & XPG_TERRITORY) != 0)
|
||
{
|
||
*cp++ = '_';
|
||
cp = stpcpy (cp, territory);
|
||
}
|
||
if ((mask & XPG_CODESET) != 0)
|
||
{
|
||
*cp++ = '.';
|
||
cp = stpcpy (cp, codeset);
|
||
}
|
||
if ((mask & XPG_NORM_CODESET) != 0)
|
||
{
|
||
*cp++ = '.';
|
||
cp = stpcpy (cp, normalized_codeset);
|
||
}
|
||
if ((mask & XPG_MODIFIER) != 0)
|
||
{
|
||
*cp++ = '@';
|
||
cp = stpcpy (cp, modifier);
|
||
}
|
||
|
||
*cp++ = '/';
|
||
stpcpy (cp, filename);
|
||
|
||
/* Look in list of already loaded domains whether it is already
|
||
available. */
|
||
last = NULL;
|
||
for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
|
||
if (retval->filename != NULL)
|
||
{
|
||
int compare = strcmp (retval->filename, abs_filename);
|
||
if (compare == 0)
|
||
/* We found it! */
|
||
break;
|
||
if (compare < 0)
|
||
{
|
||
/* It's not in the list. */
|
||
retval = NULL;
|
||
break;
|
||
}
|
||
|
||
last = retval;
|
||
}
|
||
|
||
if (retval != NULL || do_allocate == 0)
|
||
{
|
||
free (abs_filename);
|
||
return retval;
|
||
}
|
||
|
||
retval = (struct loaded_l10nfile *)
|
||
malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
|
||
* (1 << pop (mask))
|
||
* sizeof (struct loaded_l10nfile *)));
|
||
if (retval == NULL)
|
||
{
|
||
free (abs_filename);
|
||
return NULL;
|
||
}
|
||
|
||
retval->filename = abs_filename;
|
||
/* If more than one directory is in the list this is a pseudo-entry
|
||
which just references others. We do not try to load data for it,
|
||
ever. */
|
||
retval->decided = (__argz_count (dirlist, dirlist_len) != 1
|
||
|| ((mask & XPG_CODESET) != 0
|
||
&& (mask & XPG_NORM_CODESET) != 0));
|
||
retval->data = NULL;
|
||
|
||
if (last == NULL)
|
||
{
|
||
retval->next = *l10nfile_list;
|
||
*l10nfile_list = retval;
|
||
}
|
||
else
|
||
{
|
||
retval->next = last->next;
|
||
last->next = retval;
|
||
}
|
||
|
||
entries = 0;
|
||
/* If the DIRLIST is a real list the RETVAL entry corresponds not to
|
||
a real file. So we have to use the DIRLIST separation mechanism
|
||
of the inner loop. */
|
||
cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
|
||
for (; cnt >= 0; --cnt)
|
||
if ((cnt & ~mask) == 0)
|
||
{
|
||
/* Iterate over all elements of the DIRLIST. */
|
||
char *dir = NULL;
|
||
|
||
while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
|
||
!= NULL)
|
||
retval->successor[entries++]
|
||
= _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
|
||
language, territory, codeset,
|
||
normalized_codeset, modifier, filename, 1);
|
||
}
|
||
retval->successor[entries] = NULL;
|
||
|
||
return retval;
|
||
}
|
||
|
||
/* Normalize codeset name. There is no standard for the codeset
|
||
names. Normalization allows the user to use any of the common
|
||
names. The return value is dynamically allocated and has to be
|
||
freed by the caller. */
|
||
const char *
|
||
_nl_normalize_codeset (codeset, name_len)
|
||
const char *codeset;
|
||
size_t name_len;
|
||
{
|
||
int len = 0;
|
||
int only_digit = 1;
|
||
char *retval;
|
||
char *wp;
|
||
size_t cnt;
|
||
#if !IS_IN (libc)
|
||
locale_t locale = newlocale (0, "C", NULL);
|
||
#else
|
||
# define locale _nl_C_locobj_ptr
|
||
#endif
|
||
|
||
for (cnt = 0; cnt < name_len; ++cnt)
|
||
if (__isalnum_l ((unsigned char) codeset[cnt], locale))
|
||
{
|
||
++len;
|
||
|
||
if (! __isdigit_l ((unsigned char) codeset[cnt], locale))
|
||
only_digit = 0;
|
||
}
|
||
|
||
retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
|
||
|
||
if (retval != NULL)
|
||
{
|
||
wp = retval;
|
||
if (only_digit)
|
||
wp = stpcpy (wp, "iso");
|
||
|
||
for (cnt = 0; cnt < name_len; ++cnt)
|
||
if (__isalpha_l ((unsigned char) codeset[cnt], locale))
|
||
*wp++ = __tolower_l ((unsigned char) codeset[cnt], locale);
|
||
else if (__isdigit_l ((unsigned char) codeset[cnt], locale))
|
||
*wp++ = codeset[cnt];
|
||
|
||
*wp = '\0';
|
||
}
|
||
|
||
return (const char *) retval;
|
||
}
|
||
|
||
|
||
/* @@ begin of epilog @@ */
|
||
|
||
/* We don't want libintl.a to depend on any other library. So we
|
||
avoid the non-standard function stpcpy. In GNU C Library this
|
||
function is available, though. Also allow the symbol HAVE_STPCPY
|
||
to be defined. */
|
||
#if !_LIBC && !HAVE_STPCPY
|
||
static char *
|
||
stpcpy (dest, src)
|
||
char *dest;
|
||
const char *src;
|
||
{
|
||
while ((*dest++ = *src++) != '\0')
|
||
/* Do nothing. */ ;
|
||
return dest - 1;
|
||
}
|
||
#endif
|