[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r24630 - in /fsf/trunk/libc: ./ benchtests/ nptl/ nptl/sysdeps/i386/ nptl/sysdeps/x86_64/ ports/ ports/sysdeps/aarch64/ port...



Author: eglibc
Date: Wed Nov 27 00:01:55 2013
New Revision: 24630

Log:
Import glibc-mainline for 2013-11-27

Removed:
    fsf/trunk/libc/benchtests/bench-bcopy-ifunc.c
    fsf/trunk/libc/benchtests/bench-bzero-ifunc.c
    fsf/trunk/libc/benchtests/bench-memccpy-ifunc.c
    fsf/trunk/libc/benchtests/bench-memchr-ifunc.c
    fsf/trunk/libc/benchtests/bench-memcmp-ifunc.c
    fsf/trunk/libc/benchtests/bench-memcpy-ifunc.c
    fsf/trunk/libc/benchtests/bench-memmem-ifunc.c
    fsf/trunk/libc/benchtests/bench-memmove-ifunc.c
    fsf/trunk/libc/benchtests/bench-mempcpy-ifunc.c
    fsf/trunk/libc/benchtests/bench-memrchr-ifunc.c
    fsf/trunk/libc/benchtests/bench-memset-ifunc.c
    fsf/trunk/libc/benchtests/bench-rawmemchr-ifunc.c
    fsf/trunk/libc/benchtests/bench-stpcpy-ifunc.c
    fsf/trunk/libc/benchtests/bench-stpcpy_chk-ifunc.c
    fsf/trunk/libc/benchtests/bench-stpncpy-ifunc.c
    fsf/trunk/libc/benchtests/bench-strcasecmp-ifunc.c
    fsf/trunk/libc/benchtests/bench-strcasestr-ifunc.c
    fsf/trunk/libc/benchtests/bench-strcat-ifunc.c
    fsf/trunk/libc/benchtests/bench-strchr-ifunc.c
    fsf/trunk/libc/benchtests/bench-strchrnul-ifunc.c
    fsf/trunk/libc/benchtests/bench-strcmp-ifunc.c
    fsf/trunk/libc/benchtests/bench-strcpy-ifunc.c
    fsf/trunk/libc/benchtests/bench-strcpy_chk-ifunc.c
    fsf/trunk/libc/benchtests/bench-strcspn-ifunc.c
    fsf/trunk/libc/benchtests/bench-strlen-ifunc.c
    fsf/trunk/libc/benchtests/bench-strncasecmp-ifunc.c
    fsf/trunk/libc/benchtests/bench-strncat-ifunc.c
    fsf/trunk/libc/benchtests/bench-strncmp-ifunc.c
    fsf/trunk/libc/benchtests/bench-strncpy-ifunc.c
    fsf/trunk/libc/benchtests/bench-strnlen-ifunc.c
    fsf/trunk/libc/benchtests/bench-strpbrk-ifunc.c
    fsf/trunk/libc/benchtests/bench-strrchr-ifunc.c
    fsf/trunk/libc/benchtests/bench-strsep-ifunc.c
    fsf/trunk/libc/benchtests/bench-strspn-ifunc.c
    fsf/trunk/libc/benchtests/bench-strstr-ifunc.c
    fsf/trunk/libc/string/test-bcopy-ifunc.c
    fsf/trunk/libc/string/test-bzero-ifunc.c
    fsf/trunk/libc/string/test-memccpy-ifunc.c
    fsf/trunk/libc/string/test-memchr-ifunc.c
    fsf/trunk/libc/string/test-memcmp-ifunc.c
    fsf/trunk/libc/string/test-memcpy-ifunc.c
    fsf/trunk/libc/string/test-memmem-ifunc.c
    fsf/trunk/libc/string/test-memmove-ifunc.c
    fsf/trunk/libc/string/test-mempcpy-ifunc.c
    fsf/trunk/libc/string/test-memrchr-ifunc.c
    fsf/trunk/libc/string/test-memset-ifunc.c
    fsf/trunk/libc/string/test-rawmemchr-ifunc.c
    fsf/trunk/libc/string/test-stpcpy-ifunc.c
    fsf/trunk/libc/string/test-stpncpy-ifunc.c
    fsf/trunk/libc/string/test-strcasecmp-ifunc.c
    fsf/trunk/libc/string/test-strcasestr-ifunc.c
    fsf/trunk/libc/string/test-strcat-ifunc.c
    fsf/trunk/libc/string/test-strchr-ifunc.c
    fsf/trunk/libc/string/test-strchrnul-ifunc.c
    fsf/trunk/libc/string/test-strcmp-ifunc.c
    fsf/trunk/libc/string/test-strcpy-ifunc.c
    fsf/trunk/libc/string/test-strcspn-ifunc.c
    fsf/trunk/libc/string/test-strlen-ifunc.c
    fsf/trunk/libc/string/test-strncasecmp-ifunc.c
    fsf/trunk/libc/string/test-strncat-ifunc.c
    fsf/trunk/libc/string/test-strncmp-ifunc.c
    fsf/trunk/libc/string/test-strncpy-ifunc.c
    fsf/trunk/libc/string/test-strnlen-ifunc.c
    fsf/trunk/libc/string/test-strpbrk-ifunc.c
    fsf/trunk/libc/string/test-strrchr-ifunc.c
    fsf/trunk/libc/string/test-strspn-ifunc.c
    fsf/trunk/libc/string/test-strstr-ifunc.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/benchtests/Makefile
    fsf/trunk/libc/benchtests/bench-string.h
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/i386/tls.h
    fsf/trunk/libc/nptl/sysdeps/x86_64/tls.h
    fsf/trunk/libc/ports/ChangeLog.aarch64
    fsf/trunk/libc/ports/ChangeLog.alpha
    fsf/trunk/libc/ports/ChangeLog.arm
    fsf/trunk/libc/ports/ChangeLog.hppa
    fsf/trunk/libc/ports/ChangeLog.ia64
    fsf/trunk/libc/ports/ChangeLog.m68k
    fsf/trunk/libc/ports/ChangeLog.microblaze
    fsf/trunk/libc/ports/ChangeLog.mips
    fsf/trunk/libc/ports/sysdeps/aarch64/dl-irel.h
    fsf/trunk/libc/ports/sysdeps/aarch64/dl-machine.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
    fsf/trunk/libc/resolv/netdb.h
    fsf/trunk/libc/rt/aio.h
    fsf/trunk/libc/soft-fp/op-4.h
    fsf/trunk/libc/string/Makefile
    fsf/trunk/libc/string/test-string.h
    fsf/trunk/libc/sysdeps/gnu/bits/utmp.h
    fsf/trunk/libc/sysdeps/gnu/bits/utmpx.h
    fsf/trunk/libc/sysdeps/gnu/netinet/ip_icmp.h
    fsf/trunk/libc/sysdeps/powerpc/fpu/fe_nomask.c
    fsf/trunk/libc/sysdeps/powerpc/fpu/feenablxcpt.c
    fsf/trunk/libc/sysdeps/powerpc/fpu/fenv_libc.h
    fsf/trunk/libc/sysdeps/powerpc/fpu/fenv_private.h
    fsf/trunk/libc/sysdeps/powerpc/fpu/fesetenv.c
    fsf/trunk/libc/sysdeps/powerpc/fpu/feupdateenv.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/ipc.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/msq.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/sem.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/shm.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/bits/stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel_stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/ntp_gettimex.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/fe_nomask.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/ipc.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/msq.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/sem.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/shm.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/utmp.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sh/bits/shm.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/msq.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/sem.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/shm.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/bits/stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sys/procfs.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/timex.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/bits/msq.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/bits/sem.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/bits/shm.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/x86/bits/stat.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/xstatconv.c
    fsf/trunk/libc/sysdeps/x86/fpu/bits/fenv.h
    fsf/trunk/libc/sysdeps/x86_64/dl-tlsdesc.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Nov 27 00:01:55 2013
@@ -1,3 +1,157 @@
+2013-11-26  Uros Bizjak  <ubizjak@xxxxxxxxx>
+
+	* soft-fp/op-4.h (_FP_FRAC_ASSEMBLE_4): Check rsize against
+	_FP_W_TYPE_SIZE to avoid "left shift count >= width of type"
+	warning.
+
+2013-11-26  Adhemerval Zanella  <azanella@xxxxxxxxxxxxxxxxxx>
+
+	* sysdeps/powerpc/fpu/feenablxcpt.c (feenableexcept): Use
+	__fe_nomask_env_priv instead of __fe_nomask_env to avoid a PLT call.
+	* sysdeps/powerpc/fpu/fesetenv.c (__fesetenv): Likewise.
+	* sysdeps/powerpc/fpu/feupdateenv.c (__feupdateenv): Likewise.
+	* sysdeps/powerpc/fpu/fenv_libc.h (__fe_nomask_env): Rename to
+	__fe_nomask_env_priv and attribute_hidden.
+	* sysdeps/powerpc/fpu/fenv_private.h (libc_fesetenv_ppc): Likewise.
+	(libc_feupdateenv_test_ppc): Likewise.
+	(libc_feresetround_ppc): Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c
+	(__fe_nomask_env): Rename to __fe_nomask_env_priv and adjust
+	compat_symbol macro.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/fe_nomask.c
+	(__fe_nomask_env): Likewise.
+	* sysdeps/powerpc/fpu/fe_nomask.c (__fe_nomask_env): Likewise.
+
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+
+	* string/Makefile: Remove ifunc tests.
+	* string/test-string.h: Define TEST_IFUNC.
+	* string/test-bcopy-ifunc.c: Remove.
+	* string/test-bzero-ifunc.c: Likewise.
+	* string/test-memccpy-ifunc.c: Likewise.
+	* string/test-memchr-ifunc.c: Likewise.
+	* string/test-memcmp-ifunc.c: Likewise.
+	* string/test-memcpy-ifunc.c: Likewise.
+	* string/test-memmem-ifunc.c: Likewise.
+	* string/test-memmove-ifunc.c: Likewise.
+	* string/test-mempcpy-ifunc.c: Likewise.
+	* string/test-memrchr-ifunc.c: Likewise.
+	* string/test-memset-ifunc.c: Likewise.
+	* string/test-rawmemchr-ifunc.c: Likewise.
+	* string/test-stpcpy-ifunc.c: Likewise.
+	* string/test-stpncpy-ifunc.c: Likewise.
+	* string/test-strcasecmp-ifunc.c: Likewise.
+	* string/test-strcasestr-ifunc.c: Likewise.
+	* string/test-strcat-ifunc.c: Likewise.
+	* string/test-strchr-ifunc.c: Likewise.
+	* string/test-strchrnul-ifunc.c: Likewise.
+	* string/test-strcmp-ifunc.c: Likewise.
+	* string/test-strcpy-ifunc.c: Likewise.
+	* string/test-strcspn-ifunc.c: Likewise.
+	* string/test-strlen-ifunc.c: Likewise.
+	* string/test-strncasecmp-ifunc.c: Likewise.
+	* string/test-strncat-ifunc.c: Likewise.
+	* string/test-strncmp-ifunc.c: Likewise.
+	* string/test-strncpy-ifunc.c: Likewise.
+	* string/test-strnlen-ifunc.c: Likewise.
+	* string/test-strpbrk-ifunc.c: Likewise.
+	* string/test-strrchr-ifunc.c: Likewise.
+	* string/test-strspn-ifunc.c: Likewise.
+	* string/test-strstr-ifunc.c: Likewise.
+
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+
+	* benchtests/Makefile: Remove ifunc tests.
+	* benchtests/bench-string.h: Define TEST_IFUNC.
+	* benchtests/bench-bcopy-ifunc.c: Remove.
+	* benchtests/bench-bzero-ifunc.c: Likewise.
+	* benchtests/bench-memccpy-ifunc.c: Likewise.
+	* benchtests/bench-memchr-ifunc.c: Likewise.
+	* benchtests/bench-memcmp-ifunc.c: Likewise.
+	* benchtests/bench-memcpy-ifunc.c: Likewise.
+	* benchtests/bench-memmem-ifunc.c: Likewise.
+	* benchtests/bench-memmove-ifunc.c: Likewise.
+	* benchtests/bench-mempcpy-ifunc.c: Likewise.
+	* benchtests/bench-memrchr-ifunc.c: Likewise.
+	* benchtests/bench-memset-ifunc.c: Likewise.
+	* benchtests/bench-rawmemchr-ifunc.c: Likewise.
+	* benchtests/bench-stpcpy_chk-ifunc.c: Likewise.
+	* benchtests/bench-stpcpy-ifunc.c: Likewise.
+	* benchtests/bench-stpncpy-ifunc.c: Likewise.
+	* benchtests/bench-strcasecmp-ifunc.c: Likewise.
+	* benchtests/bench-strcasestr-ifunc.c: Likewise.
+	* benchtests/bench-strcat-ifunc.c: Likewise.
+	* benchtests/bench-strchr-ifunc.c: Likewise.
+	* benchtests/bench-strchrnul-ifunc.c: Likewise.
+	* benchtests/bench-strcmp-ifunc.c: Likewise.
+	* benchtests/bench-strcpy_chk-ifunc.c: Likewise.
+	* benchtests/bench-strcpy-ifunc.c: Likewise.
+	* benchtests/bench-strcspn-ifunc.c: Likewise.
+	* benchtests/bench-strlen-ifunc.c: Likewise.
+	* benchtests/bench-strncasecmp-ifunc.c: Likewise.
+	* benchtests/bench-strncat-ifunc.c: Likewise.
+	* benchtests/bench-strncmp-ifunc.c: Likewise.
+	* benchtests/bench-strncpy-ifunc.c: Likewise.
+	* benchtests/bench-strnlen-ifunc.c: Likewise.
+	* benchtests/bench-strpbrk-ifunc.c: Likewise.
+	* benchtests/bench-strrchr-ifunc.c: Likewise.
+	* benchtests/bench-strsep-ifunc.c: Likewise.
+	* benchtests/bench-strspn-ifunc.c: Likewise.
+	* benchtests/bench-strstr-ifunc.c: Likewise.
+
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+
+	* sysdeps/x86_64/dl-tlsdesc.S (_dl_tlsdesc_resolve_hold): Fix typo.
+
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+
+	* resolv/netdb.h: Use __glibc_reserved instead __unused.
+	* rt/aio.h: Likewise.
+	* sysdeps/gnu/bits/utmp.h: Likewise.
+	* sysdeps/gnu/bits/utmpx.h: Likewise.
+	* sysdeps/gnu/netinet/ip_icmp.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/ntp_gettimex.c: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/utmp.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/utmpx.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h: Likewise.
+	* sysdeps/unix/sysv/linux/sh/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sys/procfs.h: Likewise.
+	* sysdeps/unix/sysv/linux/sys/timex.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/xstatconv.c: Likewise.
+	* sysdeps/x86/fpu/bits/fenv.h: Likewise.
+
 2013-11-25  Carlos O'Donell  <carlos@xxxxxxxxxx>
 
 	[BZ #16245]

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Wed Nov 27 00:01:55 2013
@@ -20,6 +20,11 @@
   15966, 15985, 15988, 15997, 16032, 16034, 16036, 16037, 16041, 16055,
   16071, 16072, 16074, 16078, 16103, 16112, 16143, 16144, 16146, 16150,
   16151, 16153, 16167, 16172, 16245.
+
+* The public headers no longer use __unused nor __block.  This change is to
+  support compiling programs that are derived from BSD sources and use
+  __unused internally, and to support compiling with Clang's -fblock
+  extension which uses __block.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache

Modified: fsf/trunk/libc/benchtests/Makefile
==============================================================================
--- fsf/trunk/libc/benchtests/Makefile (original)
+++ fsf/trunk/libc/benchtests/Makefile Wed Nov 27 00:01:55 2013
@@ -29,8 +29,7 @@
 		strcat strchr strchrnul strcmp strcpy strcspn strlen \
 		strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \
 		strspn strstr strcpy_chk stpcpy_chk memrchr strsep
-string-bench-ifunc := $(addsuffix -ifunc, $(string-bench))
-string-bench-all := $(string-bench) $(string-bench-ifunc)
+string-bench-all := $(string-bench)
 
 stdlib-bench := strtod
 

Removed: fsf/trunk/libc/benchtests/bench-bcopy-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-bcopy-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-bcopy-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of bcopy function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-bcopy.c"

Removed: fsf/trunk/libc/benchtests/bench-bzero-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-bzero-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-bzero-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of bzero function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-bzero.c"

Removed: fsf/trunk/libc/benchtests/bench-memccpy-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-memccpy-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-memccpy-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of memccpy function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-memccpy.c"

Removed: fsf/trunk/libc/benchtests/bench-memchr-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-memchr-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-memchr-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of memchr function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-memchr.c"

Removed: fsf/trunk/libc/benchtests/bench-memcmp-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-memcmp-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-memcmp-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of memcmp function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-memcmp.c"

Removed: fsf/trunk/libc/benchtests/bench-memcpy-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-memcpy-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-memcpy-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of memcpy function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-memcpy.c"

Removed: fsf/trunk/libc/benchtests/bench-memmem-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-memmem-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-memmem-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of memmem function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-memmem.c"

Removed: fsf/trunk/libc/benchtests/bench-memmove-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-memmove-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-memmove-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of memmove function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-memmove.c"

Removed: fsf/trunk/libc/benchtests/bench-mempcpy-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-mempcpy-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-mempcpy-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of mempcpy function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-mempcpy.c"

Removed: fsf/trunk/libc/benchtests/bench-memrchr-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-memrchr-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-memrchr-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of memrchr function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-memrchr.c"

Removed: fsf/trunk/libc/benchtests/bench-memset-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-memset-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-memset-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of memset function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-memset.c"

Removed: fsf/trunk/libc/benchtests/bench-rawmemchr-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-rawmemchr-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-rawmemchr-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of rawmemchr function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-rawmemchr.c"

Removed: fsf/trunk/libc/benchtests/bench-stpcpy-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-stpcpy-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-stpcpy-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of stpcpy function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-stpcpy.c"

Removed: fsf/trunk/libc/benchtests/bench-stpcpy_chk-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-stpcpy_chk-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-stpcpy_chk-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of stpcpy checking function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-stpcpy_chk.c"

Removed: fsf/trunk/libc/benchtests/bench-stpncpy-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-stpncpy-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-stpncpy-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of stpncpy function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-stpncpy.c"

Removed: fsf/trunk/libc/benchtests/bench-strcasecmp-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strcasecmp-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strcasecmp-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strcasecmp function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strcasecmp.c"

Removed: fsf/trunk/libc/benchtests/bench-strcasestr-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strcasestr-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strcasestr-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strcasestr function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strcasestr.c"

Removed: fsf/trunk/libc/benchtests/bench-strcat-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strcat-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strcat-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strcat function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strcat.c"

Removed: fsf/trunk/libc/benchtests/bench-strchr-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strchr-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strchr-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strchr function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strchr.c"

Removed: fsf/trunk/libc/benchtests/bench-strchrnul-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strchrnul-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strchrnul-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strchrnul function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strchrnul.c"

Removed: fsf/trunk/libc/benchtests/bench-strcmp-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strcmp-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strcmp-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strcmp function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strcmp.c"

Removed: fsf/trunk/libc/benchtests/bench-strcpy-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strcpy-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strcpy-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strcpy function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strcpy.c"

Removed: fsf/trunk/libc/benchtests/bench-strcpy_chk-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strcpy_chk-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strcpy_chk-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strcpy checking function.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strcpy_chk.c"

Removed: fsf/trunk/libc/benchtests/bench-strcspn-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strcspn-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strcspn-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strcspn function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strcspn.c"

Modified: fsf/trunk/libc/benchtests/bench-string.h
==============================================================================
--- fsf/trunk/libc/benchtests/bench-string.h (original)
+++ fsf/trunk/libc/benchtests/bench-string.h Wed Nov 27 00:01:55 2013
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/cdefs.h>
+#define TEST_IFUNC 1
 
 typedef struct
 {

Removed: fsf/trunk/libc/benchtests/bench-strlen-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strlen-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strlen-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strlen function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strlen.c"

Removed: fsf/trunk/libc/benchtests/bench-strncasecmp-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strncasecmp-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strncasecmp-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strncasecmp function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strncasecmp.c"

Removed: fsf/trunk/libc/benchtests/bench-strncat-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strncat-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strncat-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strncat function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strncat.c"

Removed: fsf/trunk/libc/benchtests/bench-strncmp-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strncmp-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strncmp-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strncmp function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strncmp.c"

Removed: fsf/trunk/libc/benchtests/bench-strncpy-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strncpy-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strncpy-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strncpy function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strncpy.c"

Removed: fsf/trunk/libc/benchtests/bench-strnlen-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strnlen-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strnlen-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strnlen function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strnlen.c"

Removed: fsf/trunk/libc/benchtests/bench-strpbrk-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strpbrk-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strpbrk-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strpbrk function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strpbrk.c"

Removed: fsf/trunk/libc/benchtests/bench-strrchr-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strrchr-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strrchr-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strrchr function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strrchr.c"

Removed: fsf/trunk/libc/benchtests/bench-strsep-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strsep-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strsep-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strsep function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strsep.c"

Removed: fsf/trunk/libc/benchtests/bench-strspn-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strspn-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strspn-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strspn function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strspn.c"

Removed: fsf/trunk/libc/benchtests/bench-strstr-ifunc.c
==============================================================================
--- fsf/trunk/libc/benchtests/bench-strstr-ifunc.c (original)
+++ fsf/trunk/libc/benchtests/bench-strstr-ifunc.c (removed)
@@ -1,20 +1,0 @@
-/* Measure IFUNC implementations of strstr function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   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/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strstr.c"

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Nov 27 00:01:55 2013
@@ -1,3 +1,7 @@
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+	* sysdeps/i386/tls.h: Use __glibc_reserved instead __unused.
+	* sysdeps/x86_64/tls.h: Likewise.
+
 2013-11-25  Paul Pluzhnikov  <ppluzhnikov@xxxxxxxxxx>
 
 	[BZ #11214]

Modified: fsf/trunk/libc/nptl/sysdeps/i386/tls.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/i386/tls.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/i386/tls.h Wed Nov 27 00:01:55 2013
@@ -56,7 +56,7 @@
 #ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
 #else
-  int __unused1;
+  int __glibc_reserved1;
 #endif
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[4];

Modified: fsf/trunk/libc/nptl/sysdeps/x86_64/tls.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/x86_64/tls.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/x86_64/tls.h Wed Nov 27 00:01:55 2013
@@ -65,14 +65,14 @@
 # ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
 # else
-  int __unused1;
+  int __glibc_reserved1;
 # endif
   int rtld_must_xmm_save;
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[4];
   /* GCC split stack support.  */
   void *__private_ss;
-  long int __unused2;
+  long int __glibc_reserved2;
   /* Have space for the post-AVX register size.  */
   __128bits rtld_savespace_sse[8][4] __attribute__ ((aligned (32)));
 

Modified: fsf/trunk/libc/ports/ChangeLog.aarch64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.aarch64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.aarch64 Wed Nov 27 00:01:55 2013
@@ -1,3 +1,13 @@
+2013-11-26  Will Newton  <will.newton@xxxxxxxxxx>
+
+	* sysdeps/aarch64/dl-irel.h: Include ldsodefs.h.
+	(ELF_MACHINE_IRELA): Define.  (elf_ifunc_invoke): Pass
+	hwcap to ifunc resolver function.  (elf_irela): New function.
+	* sysdeps/aarch64/dl-machine.h: Include dl-irel.h.
+	(elf_machine_rela) Handle STT_GNU_IFUNC symbols and
+	R_AARCH64_IRELATIVE relocations.  (elf_machine_lazy_rel):
+	Handle R_AARCH64_IRELATIVE relocations.
+
 2013-10-30  Mike Frysinger  <vapier@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/aarch64/configure.in: Moved to ...

Modified: fsf/trunk/libc/ports/ChangeLog.alpha
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.alpha (original)
+++ fsf/trunk/libc/ports/ChangeLog.alpha Wed Nov 27 00:01:55 2013
@@ -1,3 +1,12 @@
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+	* sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/alpha/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/kernel_stat.h: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/xstatconv.c: Likewise.
+
 2013-11-16  Richard Henderson  <rth@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/alpha/rt_sigaction.S: Include a nop

Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Wed Nov 27 00:01:55 2013
@@ -1,3 +1,6 @@
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+	* sysdeps/unix/sysv/linux/arm/bits/shm.h: Use __glibc_reserved instead __unused.
+
 2013-11-22  Roland McGrath  <roland@xxxxxxxxxxxxx>
 
 	* sysdeps/arm/armv7/multiarch/memcpy_impl.S

Modified: fsf/trunk/libc/ports/ChangeLog.hppa
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.hppa (original)
+++ fsf/trunk/libc/ports/ChangeLog.hppa Wed Nov 27 00:01:55 2013
@@ -1,3 +1,10 @@
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+	* sysdeps/unix/sysv/linux/hppa/bits/ipc.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/hppa/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Likewise.
+
 2013-11-21  Guy Martin  <gmsoft@xxxxxxxxxxxx>
 
 	* sysdeps/hppa/dl-lookupcfg.h: Remove obsolete

Modified: fsf/trunk/libc/ports/ChangeLog.ia64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.ia64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.ia64 Wed Nov 27 00:01:55 2013
@@ -1,3 +1,10 @@
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+	* sysdeps/unix/sysv/linux/ia64/bits/ipc.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/ia64/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/shm.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
+
 2013-11-21  Guy Martin  <gmsoft@xxxxxxxxxxxx>
 
 	* sysdeps/ia64/dl-lookupcfg.h: Remove obsolete

Modified: fsf/trunk/libc/ports/ChangeLog.m68k
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.m68k (original)
+++ fsf/trunk/libc/ports/ChangeLog.m68k Wed Nov 27 00:01:55 2013
@@ -1,3 +1,6 @@
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+	* sysdeps/unix/sysv/linux/m68k/bits/stat.h: Use __glibc_reserved instead __unused.
+
 2013-10-30  Mike Frysinger  <vapier@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/m68k/configure.in: Moved to ...

Modified: fsf/trunk/libc/ports/ChangeLog.microblaze
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.microblaze (original)
+++ fsf/trunk/libc/ports/ChangeLog.microblaze Wed Nov 27 00:01:55 2013
@@ -1,3 +1,7 @@
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+	* sysdeps/unix/sysv/linux/microblaze/bits/stat.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/microblaze/kernel_stat.h: Likewise.
+
 2013-10-30  Mike Frysinger  <vapier@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/microblaze/configure.in: Moved to ...

Modified: fsf/trunk/libc/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.mips (original)
+++ fsf/trunk/libc/ports/ChangeLog.mips Wed Nov 27 00:01:55 2013
@@ -1,3 +1,9 @@
+2013-11-26  OndÃÂej BÃÂlka  <neleai@xxxxxxxxx>
+	* sysdeps/unix/sysv/linux/mips/bits/ipc.h: Use __glibc_reserved instead __unused.
+	* sysdeps/unix/sysv/linux/mips/bits/msq.h: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/sem.h: Likewise.
+	* sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.
+
 2013-10-30  Mike Frysinger  <vapier@xxxxxxxxxx>
 
 	* sysdeps/mips/configure.in: Moved to ...

Modified: fsf/trunk/libc/ports/sysdeps/aarch64/dl-irel.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/dl-irel.h (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/dl-irel.h Wed Nov 27 00:01:55 2013
@@ -22,15 +22,31 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <ldsodefs.h>
 
-/* AArch64 does not yet implement IFUNC support.  However since
-   2011-06-20 provision of a elf_ifunc_invoke has been mandatory.  */
+#define ELF_MACHINE_IRELA	1
 
 static inline ElfW(Addr)
 __attribute ((always_inline))
 elf_ifunc_invoke (ElfW(Addr) addr)
 {
-  return ((ElfW(Addr) (*) (void)) (addr)) ();
+  return ((ElfW(Addr) (*) (unsigned long int)) (addr)) (GLRO(dl_hwcap));
+}
+
+static inline void
+__attribute ((always_inline))
+elf_irela (const ElfW(Rela) *reloc)
+{
+  ElfW(Addr) *const reloc_addr = (void *) reloc->r_offset;
+  const unsigned long int r_type = ELFW(R_TYPE) (reloc->r_info);
+
+  if (__glibc_likely (r_type == R_AARCH64_IRELATIVE))
+    {
+      ElfW(Addr) value = elf_ifunc_invoke (reloc->r_addend);
+      *reloc_addr = value;
+    }
+  else
+    __libc_fatal ("unexpected reloc type in static binary");
 }
 
 #endif

Modified: fsf/trunk/libc/ports/sysdeps/aarch64/dl-machine.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/aarch64/dl-machine.h (original)
+++ fsf/trunk/libc/ports/sysdeps/aarch64/dl-machine.h Wed Nov 27 00:01:55 2013
@@ -23,6 +23,7 @@
 
 #include <tls.h>
 #include <dl-tlsdesc.h>
+#include <dl-irel.h>
 
 /* Return nonzero iff ELF header is compatible with the running host.  */
 static inline int __attribute__ ((unused))
@@ -243,6 +244,12 @@
       struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
       ElfW(Addr) value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;
 
+      if (sym != NULL
+	  && __glibc_unlikely (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC)
+	  && __glibc_likely (sym->st_shndx != SHN_UNDEF)
+	  && __glibc_likely (!skip_ifunc))
+	value = elf_ifunc_invoke (value);
+
       switch (r_type)
 	{
 	case R_AARCH64_COPY:
@@ -331,6 +338,12 @@
 	    }
 	  break;
 
+	case R_AARCH64_IRELATIVE:
+	  value = map->l_addr + reloc->r_addend;
+	  value = elf_ifunc_invoke (value);
+	  *reloc_addr = value;
+	  break;
+
 	default:
 	  _dl_reloc_bad_type (map, r_type, 0);
 	  break;
@@ -374,6 +387,13 @@
       td->entry = (void*)(D_PTR (map, l_info[ADDRIDX (DT_TLSDESC_PLT)])
 			  + map->l_addr);
     }
+  else if (__glibc_unlikely (r_type == R_AARCH64_IRELATIVE))
+    {
+      ElfW(Addr) value = map->l_addr + reloc->r_addend;
+      if (__glibc_likely (!skip_ifunc))
+	value = elf_ifunc_invoke (value);
+      *reloc_addr = value;
+    }
   else
     _dl_reloc_bad_type (map, r_type, 1);
 }

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h Wed Nov 27 00:01:55 2013
@@ -49,6 +49,6 @@
     unsigned int mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h Wed Nov 27 00:01:55 2013
@@ -46,8 +46,8 @@
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 #ifdef __USE_MISC

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h Wed Nov 27 00:01:55 2013
@@ -41,8 +41,8 @@
   __time_t sem_otime;			/* last semop() time */
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h Wed Nov 27 00:01:55 2013
@@ -56,8 +56,8 @@
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -79,10 +79,10 @@
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h Wed Nov 27 00:01:55 2013
@@ -92,7 +92,7 @@
     __ST_TIME(a);		/* Time of last access.  */
     __ST_TIME(m);		/* Time of last modification.  */
     __ST_TIME(c);		/* Time of last status change.  */
-    long __unused[3];
+    long __glibc_reserved[3];
   };
 
 #ifdef __USE_LARGEFILE64
@@ -113,7 +113,7 @@
     __ST_TIME(a);		/* Time of last access.  */
     __ST_TIME(m);		/* Time of last modification.  */
     __ST_TIME(c);		/* Time of last status change.  */
-    long __unused[3];
+    long __glibc_reserved[3];
   };
 #endif
 

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h Wed Nov 27 00:01:55 2013
@@ -40,7 +40,7 @@
     unsigned long   st_mtimensec;
     unsigned long   st_ctime;
     unsigned long   st_ctimensec;
-    long            __unused[3];
+    long            __glibc_reserved[3];
   };
 
 /* Definition of `struct stat' used by glibc 2.0.  */
@@ -82,7 +82,7 @@
     unsigned int st_flags;
     unsigned int st_gen;
     int __pad3;
-    long __unused[4];
+    long __glibc_reserved[4];
   };
 
 #define XSTAT_IS_XSTAT64 1

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c Wed Nov 27 00:01:55 2013
@@ -74,10 +74,10 @@
 	buf->st_flags = kbuf->st_flags;
 	buf->st_gen = kbuf->st_gen;
 	buf->__pad3 = 0;
-	buf->__unused[0] = 0;
-	buf->__unused[1] = 0;
-	buf->__unused[2] = 0;
-	buf->__unused[3] = 0;
+	buf->__glibc_reserved[0] = 0;
+	buf->__glibc_reserved[1] = 0;
+	buf->__glibc_reserved[2] = 0;
+	buf->__glibc_reserved[3] = 0;
       }
       break;
 
@@ -105,9 +105,9 @@
 	buf->st_ctime = kbuf->st_ctime;
 	buf->st_ctimensec = 0;
 
-	buf->__unused[0] = 0;
-	buf->__unused[1] = 0;
-	buf->__unused[2] = 0;
+	buf->__glibc_reserved[0] = 0;
+	buf->__glibc_reserved[1] = 0;
+	buf->__glibc_reserved[2] = 0;
       }
       break;
 

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h Wed Nov 27 00:01:55 2013
@@ -51,16 +51,16 @@
     struct ipc_perm shm_perm;		/* operation permission struct */
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
-    unsigned long int __unused1;
+    unsigned long int __glibc_reserved1;
     __time_t shm_dtime;			/* time of last shmdt() */
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved2;
     __time_t shm_ctime;			/* time of last change by shmctl() */
-    unsigned long int __unused3;
+    unsigned long int __glibc_reserved3;
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -82,10 +82,10 @@
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h Wed Nov 27 00:01:55 2013
@@ -41,23 +41,23 @@
   struct ipc_perm msg_perm;	/* structure describing operation permission */
   __time_t msg_stime;		/* time of last msgsnd command */
 #if __WORDSIZE == 32
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t msg_rtime;		/* time of last msgrcv command */
 #if __WORDSIZE == 32
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   __time_t msg_ctime;		/* time of last change */
 #if __WORDSIZE == 32
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
   unsigned long int __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused4;
-  unsigned long int __unused5;
+  unsigned long int __glibc_reserved4;
+  unsigned long int __glibc_reserved5;
 };
 
 #ifdef __USE_MISC

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h Wed Nov 27 00:01:55 2013
@@ -42,15 +42,15 @@
   struct ipc_perm sem_perm;		/* operation permission struct */
   __time_t sem_otime;			/* last semop() time */
 #if __WORDSIZE == 32
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t sem_ctime;			/* last time changed by semctl() */
 #if __WORDSIZE == 32
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused3;
-  unsigned long int __unused4;
+  unsigned long int __glibc_reserved3;
+  unsigned long int __glibc_reserved4;
 };
 
 /* The user should define a union like the following to use it for arguments

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h Wed Nov 27 00:01:55 2013
@@ -54,21 +54,21 @@
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
 #if __WORDSIZE == 32
-    unsigned long int __unused1;
+    unsigned long int __glibc_reserved1;
 #endif
     __time_t shm_dtime;			/* time of last shmdt() */
 #if __WORDSIZE == 32
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved2;
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #if __WORDSIZE == 32
-    unsigned long int __unused3;
+    unsigned long int __glibc_reserved3;
 #endif
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -90,10 +90,10 @@
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h Wed Nov 27 00:01:55 2013
@@ -87,7 +87,7 @@
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
-    int __unused[2];
+    int __glibc_reserved[2];
   };
 
 #undef __field64
@@ -125,7 +125,7 @@
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
-    int __unused[2];
+    int __glibc_reserved[2];
   };
 #endif
 

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h Wed Nov 27 00:01:55 2013
@@ -57,6 +57,6 @@
 #endif
     unsigned short int __seq;		/* Sequence number.  */
     unsigned int __pad3;
-    __extension__ unsigned long long int __unused1;
-    __extension__ unsigned long long int __unused2;
+    __extension__ unsigned long long int __glibc_reserved1;
+    __extension__ unsigned long long int __glibc_reserved2;
   };

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h Wed Nov 27 00:01:55 2013
@@ -56,8 +56,8 @@
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 #ifdef __USE_MISC

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h Wed Nov 27 00:01:55 2013
@@ -48,8 +48,8 @@
 #endif
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h Wed Nov 27 00:01:55 2013
@@ -64,8 +64,8 @@
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -87,10 +87,10 @@
     unsigned long shmmni;
     unsigned long shmseg;
     unsigned long shmall;
-    unsigned long __unused1;
-    unsigned long __unused2;
-    unsigned long __unused3;
-    unsigned long __unused4;
+    unsigned long __glibc_reserved1;
+    unsigned long __glibc_reserved2;
+    unsigned long __glibc_reserved3;
+    unsigned long __glibc_reserved4;
   };
 
 struct shm_info

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h Wed Nov 27 00:01:55 2013
@@ -13,11 +13,11 @@
 	struct timespec st_ctim;
 	long		st_blksize;
 	long		st_blocks;
-	unsigned long	__unused1;	/* ACL stuff */
-	unsigned long	__unused2;	/* network */
-	unsigned long	__unused3;	/* network */
-	unsigned long	__unused4;	/* cnodes */
-	unsigned short	__unused5;	/* netsite */
+	unsigned long	__glibc_reserved1;	/* ACL stuff */
+	unsigned long	__glibc_reserved2;	/* network */
+	unsigned long	__glibc_reserved3;	/* network */
+	unsigned long	__glibc_reserved4;	/* cnodes */
+	unsigned short	__glibc_reserved5;	/* netsite */
 	short		st_fstype;
 	unsigned long	st_realdev;
 	unsigned short	st_basemode;

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h Wed Nov 27 00:01:55 2013
@@ -48,6 +48,6 @@
     __mode_t mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h Wed Nov 27 00:01:55 2013
@@ -42,8 +42,8 @@
   unsigned long int msg_qbytes;	/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 #ifdef __USE_MISC

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h Wed Nov 27 00:01:55 2013
@@ -42,8 +42,8 @@
   __time_t sem_otime;			/* last semop() time */
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h Wed Nov 27 00:01:55 2013
@@ -52,8 +52,8 @@
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -75,10 +75,10 @@
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h Wed Nov 27 00:01:55 2013
@@ -64,7 +64,7 @@
 #endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
     __blkcnt_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    long int __unused[3];
+    long int __glibc_reserved[3];
   };
 
 #ifdef __USE_LARGEFILE64
@@ -103,7 +103,7 @@
 #endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
     __blkcnt64_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    long int __unused[3];
+    long int __glibc_reserved[3];
   };
 #endif
 

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h Wed Nov 27 00:01:55 2013
@@ -84,8 +84,8 @@
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
 #ifndef __USE_FILE_OFFSET64
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
 #else
     __ino64_t st_ino;			/* File serial number.	*/
 #endif

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h Wed Nov 27 00:01:55 2013
@@ -71,8 +71,8 @@
         __time_t                st_ctime;     /* Time of last status change.  */
         unsigned long int       st_ctimensec; /* Nsecs of last status change.  */
 #endif
-        unsigned int            __unused4;
-        unsigned int            __unused5;
+        unsigned int            __glibc_reserved4;
+        unsigned int            __glibc_reserved5;
 };
 #else /* __USE_FILE_OFFSET64 */
 /* MS: If __USE_FILE_OFFSET64 is setup then struct stat should match stat64
@@ -115,8 +115,8 @@
         __time_t                st_ctime;     /* Time of last status change.  */
         unsigned long int       st_ctimensec; /* Nsecs of last status change.  */
 #endif
-        unsigned int            __unused4;
-        unsigned int            __unused5;
+        unsigned int            __glibc_reserved4;
+        unsigned int            __glibc_reserved5;
 };
 #endif /* __USE_FILE_OFFSET64 */
 
@@ -156,8 +156,8 @@
         __time_t                st_ctime;     /* Time of last status change.  */
         unsigned long int       st_ctimensec; /* Nsecs of last status change.  */
 #endif
-        unsigned int            __unused4;
-        unsigned int            __unused5;
+        unsigned int            __glibc_reserved4;
+        unsigned int            __glibc_reserved5;
 };
 #endif
 

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h Wed Nov 27 00:01:55 2013
@@ -40,10 +40,10 @@
         struct timespec st_ctim;
 #define _HAVE_STAT_NSEC
 #define _HAVE_STAT64_NSEC
-        unsigned int    __unused4;
+        unsigned int    __glibc_reserved4;
 #define _HAVE_STAT___UNUSED4
 #define _HAVE_STAT64___UNUSED4
-        unsigned int    __unused5;
+        unsigned int    __glibc_reserved5;
 #define _HAVE_STAT___UNUSED5
 #define _HAVE_STAT64___UNUSED5
 };

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h Wed Nov 27 00:01:55 2013
@@ -49,6 +49,6 @@
     unsigned int mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
 };

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h Wed Nov 27 00:01:55 2013
@@ -39,33 +39,33 @@
 {
   struct ipc_perm msg_perm;	/* structure describing operation permission */
 #if __WORDSIZE == 32 && defined (__MIPSEB__)
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t msg_stime;		/* time of last msgsnd command */
 #if __WORDSIZE == 32 && defined (__MIPSEL__)
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
 #if __WORDSIZE == 32 && defined (__MIPSEB__)
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   __time_t msg_rtime;		/* time of last msgrcv command */
 #if __WORDSIZE == 32 && defined (__MIPSEL__)
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
 #if __WORDSIZE == 32 && defined (__MIPSEB__)
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
   __time_t msg_ctime;		/* time of last change */
 #if __WORDSIZE == 32 && defined (__MIPSEL__)
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #endif
   unsigned long int __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   msglen_t msg_qbytes;		/* max number of bytes allowed on queue */
   __pid_t msg_lspid;		/* pid of last msgsnd() */
   __pid_t msg_lrpid;		/* pid of last msgrcv() */
-  unsigned long int __unused4;
-  unsigned long int __unused5;
+  unsigned long int __glibc_reserved4;
+  unsigned long int __glibc_reserved5;
 };
 
 #ifdef __USE_MISC

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h Wed Nov 27 00:01:55 2013
@@ -41,8 +41,8 @@
   __time_t sem_otime;			/* last semop() time */
   __time_t sem_ctime;			/* last time changed by semctl() */
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused1;
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved1;
+  unsigned long int __glibc_reserved2;
 };
 
 /* The user should define a union like the following to use it for arguments

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h Wed Nov 27 00:01:55 2013
@@ -53,8 +53,8 @@
     __pid_t shm_cpid;			/* pid of creator */
     __pid_t shm_lpid;			/* pid of last shmop */
     shmatt_t shm_nattch;		/* number of current attaches */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
 
 #ifdef __USE_MISC
@@ -75,10 +75,10 @@
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
-    unsigned long int __unused3;
-    unsigned long int __unused4;
+    unsigned long int __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info

Modified: fsf/trunk/libc/resolv/netdb.h
==============================================================================
--- fsf/trunk/libc/resolv/netdb.h (original)
+++ fsf/trunk/libc/resolv/netdb.h Wed Nov 27 00:01:55 2013
@@ -586,7 +586,7 @@
   struct addrinfo *ar_result;	/* Pointer to result.  */
   /* The following are internal elements.  */
   int __return;
-  int __unused[5];
+  int __glibc_reserved[5];
 };
 
 /* Lookup mode.  */

Modified: fsf/trunk/libc/rt/aio.h
==============================================================================
--- fsf/trunk/libc/rt/aio.h (original)
+++ fsf/trunk/libc/rt/aio.h Wed Nov 27 00:01:55 2013
@@ -54,7 +54,7 @@
 #else
   __off64_t aio_offset;		/* File offset.  */
 #endif
-  char __unused[32];
+  char __glibc_reserved[32];
 };
 
 /* The same for the 64bit offsets.  Please note that the members aio_fildes
@@ -77,7 +77,7 @@
   __ssize_t __return_value;
 
   __off64_t aio_offset;		/* File offset.  */
-  char __unused[32];
+  char __glibc_reserved[32];
 };
 #endif
 

Modified: fsf/trunk/libc/soft-fp/op-4.h
==============================================================================
--- fsf/trunk/libc/soft-fp/op-4.h (original)
+++ fsf/trunk/libc/soft-fp/op-4.h Wed Nov 27 00:01:55 2013
@@ -709,7 +709,7 @@
       else if (rsize <= 2*_FP_W_TYPE_SIZE)				\
 	{								\
 	  r = X##_f[1];							\
-	  r <<= _FP_W_TYPE_SIZE;					\
+	  r = (rsize <= _FP_W_TYPE_SIZE ? 0 : r << _FP_W_TYPE_SIZE);	\
 	  r += X##_f[0];						\
 	}								\
       else								\
@@ -717,11 +717,11 @@
 	  /* I'm feeling lazy so we deal with int == 3words (implausible)*/ \
 	  /* and int == 4words as a single case.			 */ \
 	  r = X##_f[3];							\
-	  r <<= _FP_W_TYPE_SIZE;					\
+	  r = (rsize <= _FP_W_TYPE_SIZE ? 0 : r << _FP_W_TYPE_SIZE);	\
 	  r += X##_f[2];						\
-	  r <<= _FP_W_TYPE_SIZE;					\
+	  r = (rsize <= _FP_W_TYPE_SIZE ? 0 : r << _FP_W_TYPE_SIZE);	\
 	  r += X##_f[1];						\
-	  r <<= _FP_W_TYPE_SIZE;					\
+	  r = (rsize <= _FP_W_TYPE_SIZE ? 0 : r << _FP_W_TYPE_SIZE);	\
 	  r += X##_f[0];						\
 	}								\
     }									\

Modified: fsf/trunk/libc/string/Makefile
==============================================================================
--- fsf/trunk/libc/string/Makefile (original)
+++ fsf/trunk/libc/string/Makefile Wed Nov 27 00:01:55 2013
@@ -54,9 +54,6 @@
 		   bug-envz1 tst-strxfrm2 tst-endian tst-svc2		\
 		   tst-strtok_r
 
-tests-ifunc := $(strop-tests:%=test-%-ifunc)
-tests += $(tests-ifunc)
-

[... 2165 lines stripped ...]
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits