qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://sourceware.org/git/glibc

This commit is contained in:
Paul Pluzhnikov 2016-05-30 15:33:13 -07:00
parent ca7e8dda67 600c13bf72
commit 7838d298d8
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -4,6 +4,15 @@
* inet/if_index.c (__protocol_available): Delete #if 0'd code. * inet/if_index.c (__protocol_available): Delete #if 0'd code.
* inet/ruserpass.c (ruserpass): 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> 2016-05-30 Adhemerval Zanella <adhemerval.zanella@linaro.org>
[BZ #20178] [BZ #20178]

2
scripts/check-local-headers.sh
View File

@ -33,7 +33,7 @@ exec ${AWK} -v includedir="$includedir" '
BEGIN { BEGIN {
status = 0 status = 0
exclude = "^" includedir \ 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 } /^[^ ]/ && $1 ~ /.*:/ { obj = $1 }
{ {

2
sysdeps/mach/hurd/configure vendored
View File

@ -45,3 +45,5 @@ fi
if test -n "$sysheaders"; then if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS CPPFLAGS=$OLD_CPPFLAGS
fi fi
libc_cv_ld_gnu_indirect_function=no

6
sysdeps/mach/hurd/configure.ac
View File

@ -1,6 +1,8 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. 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 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]) AC_DEFINE([NO_HIDDEN])
if test -n "$sysheaders"; then if test -n "$sysheaders"; then
@ -24,3 +26,7 @@ fi
if test -n "$sysheaders"; then if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS CPPFLAGS=$OLD_CPPFLAGS
fi 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