diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2016-05-30 15:33:13 -0700 |
|---|---|---|
| committer | Paul Pluzhnikov <ppluzhnikov@google.com> | 2016-05-30 15:33:13 -0700 |
| commit | 7838d298d895f65247fb6b498db03a4336fc0506 (patch) | |
| tree | c1f3f6d050e042f8388b917d6b93ed6658d8f311 | |
| parent | ca7e8dda67490749c38581497f7ec7ffca1c3ba8 (diff) | |
| parent | 600c13bf7233b9612e772a94411b8d688b859142 (diff) | |
| download | glibc-7838d298d895f65247fb6b498db03a4336fc0506.tar.gz glibc-7838d298d895f65247fb6b498db03a4336fc0506.tar.xz glibc-7838d298d895f65247fb6b498db03a4336fc0506.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | scripts/check-local-headers.sh | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/configure | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/configure.ac | 6 |
4 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e17b2ca2e5..d1a3489658 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,15 @@ * inet/if_index.c (__protocol_available): Delete #if 0'd code. * inet/ruserpass.c (ruserpass): Delete #if 0'd code. +2016-05-30 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * scripts/check-local-headers.sh (exclude): Add hurd/ihash.h, and + include .*-.*/ in addition to .*-.*-.*/ (i.e. i386-gnu in addition to + i386-linux-gnu). + * sysdeps/mach/hurd/configure.ac (libc_cv_ld_gnu_indirect_function): + Set to no. + * sysdeps/mach/hurd/configure: Refresh. + 2016-05-30 Adhemerval Zanella <adhemerval.zanella@linaro.org> [BZ #20178] diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh index 0670da16bc..4cae4db572 100755 --- a/scripts/check-local-headers.sh +++ b/scripts/check-local-headers.sh @@ -33,7 +33,7 @@ exec ${AWK} -v includedir="$includedir" ' BEGIN { status = 0 exclude = "^" includedir \ - "/(.*-.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs)|cthreads\\.h|gd|nss3/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)" + "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h)|cthreads\\.h|gd|nss3/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)" } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 } { diff --git a/sysdeps/mach/hurd/configure b/sysdeps/mach/hurd/configure index 3d155a450e..163b5c7730 100644 --- a/sysdeps/mach/hurd/configure +++ b/sysdeps/mach/hurd/configure @@ -45,3 +45,5 @@ fi if test -n "$sysheaders"; then CPPFLAGS=$OLD_CPPFLAGS fi + +libc_cv_ld_gnu_indirect_function=no diff --git a/sysdeps/mach/hurd/configure.ac b/sysdeps/mach/hurd/configure.ac index af9a9ea052..5539a8c8af 100644 --- a/sysdeps/mach/hurd/configure.ac +++ b/sysdeps/mach/hurd/configure.ac @@ -1,6 +1,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. dnl We need this setting because of the need for PLT calls in ld.so. +dnl See Roland's comment in +dnl https://sourceware.org/bugzilla/show_bug.cgi?id=15605 AC_DEFINE([NO_HIDDEN]) if test -n "$sysheaders"; then @@ -24,3 +26,7 @@ fi if test -n "$sysheaders"; then CPPFLAGS=$OLD_CPPFLAGS fi + +dnl ifunc does not work yet for static binaries +dnl http://www.gnu.org/software/hurd/open_issues/ifunc.html +libc_cv_ld_gnu_indirect_function=no |