From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Mon, 30 May 2016 22:33:13 +0000 (-0700)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: upstream/2.24~170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7838d298d895f65247fb6b498db03a4336fc0506;p=platform%2Fupstream%2Fglibc.git

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

7838d298d895f65247fb6b498db03a4336fc0506
diff --cc ChangeLog
index e17b2ca,fe7ef65..d1a3489
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,12 +1,18 @@@
 +2016-05-30  Paul Pluzhnikov  <ppluzhnikov@google.com>
 +
 +	[BZ 19653]
 +	* 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]