GNU C Library master sources branch release/2.25/master updated. glibc-2.25-53-gb64e029

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, release/2.25/master has been updated
       via  b64e0298661a084d8aab6756b08dbced515449d8 (commit)
      from  4e4cfd77617c190a7c8b3f83c41e1ad0771bd569 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b64e0298661a084d8aab6756b08dbced515449d8

commit b64e0298661a084d8aab6756b08dbced515449d8
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Mon Sep 11 09:04:57 2017 -0700

    Make copy of <bits/std_abs.h> from GCC 7 [BZ #21573]
    
    <bits/std_abs.h> from GCC 7 will include /usr/include/stdlib.h from
    "#include_next" (instead of stdlib/stdlib.h in the glibc source
    directory), and this turns up as a make dependency.  Also make a copy
    of <bits/std_abs.h> to prevent it from including /usr/include/stdlib.h.
    
    	* configure.ac (find_cxx_header): Suppress compiler error message.
    	* configure: Regenerated.
    
    	[BZ #21573]
    	* Makerules [$(c++-bits-std_abs-h) != ""] (before-compile): Add
    	$(common-objpfx)bits/std_abs.h.
    	[$(c++-bits-std_abs-h) != ""] ($(common-objpfx)bits/std_abs.h):
    	New target.
    	* config.make.in (c++-bits-std_abs-h): New.
    	* configure.ac (find_cxx_header): Use "\,$1," with sed.
    	(CXX_BITS_STD_ABS_H): New.
    	(AC_SUBST(CXX_BITS_STD_ABS_H)): Likewise.
    	* configure: Regenerated.
    
    (cherry picked from commit a65ea28d1833d3502c5070472e43bda04410e6b5 and
     commit c2528fef3b05bcffb1ac27c6c09cc3ff24b7f03f)

diff --git a/ChangeLog b/ChangeLog
index a48cd9c..b7e129e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,21 @@
 2017-09-11  H.J. Lu  <hongjiu.lu@intel.com>
+	    Florian Weimer <fweimer@redhat.com>
+
+	* configure.ac (find_cxx_header): Suppress compiler error message.
+	* configure: Regenerated.
+
+	[BZ #21573]
+	* Makerules [$(c++-bits-std_abs-h) != ""] (before-compile): Add
+	$(common-objpfx)bits/std_abs.h.
+	[$(c++-bits-std_abs-h) != ""] ($(common-objpfx)bits/std_abs.h):
+	New target.
+	* config.make.in (c++-bits-std_abs-h): New.
+	* configure.ac (find_cxx_header): Use "\,$1," with sed.
+	(CXX_BITS_STD_ABS_H): New.
+	(AC_SUBST(CXX_BITS_STD_ABS_H)): Likewise.
+	* configure: Regenerated.
+
+2017-09-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #21982]
 	* string/stratcliff.c (do_test): Declare size, nchars, inner,
diff --git a/Makerules b/Makerules
index 7403305..43343f0 100644
--- a/Makerules
+++ b/Makerules
@@ -127,6 +127,14 @@ $(common-objpfx)cstdlib: $(c++-cstdlib-header)
 $(common-objpfx)cmath: $(c++-cmath-header)
 	$(INSTALL_DATA) $< $@T
 	$(move-if-change) $@T $@
+ifneq (,$(c++-bits-std_abs-h))
+# Also make a copy of <bits/std_abs.h> from GCC 7 to prevent it from
+# including /usr/include/stdlib.h.
+before-compile := $(common-objpfx)bits/std_abs.h $(before-compile)
+$(common-objpfx)bits/std_abs.h: $(c++-bits-std_abs-h)
+	$(INSTALL_DATA) $< $@T
+	$(move-if-change) $@T $@
+endif
 endif
 
 before-compile := $(common-objpfx)libc-abis.h $(before-compile)
diff --git a/config.make.in b/config.make.in
index 5836b32..709527d 100644
--- a/config.make.in
+++ b/config.make.in
@@ -47,6 +47,7 @@ sysincludes = @SYSINCLUDES@
 c++-sysincludes = @CXX_SYSINCLUDES@
 c++-cstdlib-header = @CXX_CSTDLIB_HEADER@
 c++-cmath-header = @CXX_CMATH_HEADER@
+c++-bits-std_abs-h = @CXX_BITS_STD_ABS_H@
 all-warnings = @all_warnings@
 enable-werror = @enable_werror@
 
diff --git a/configure b/configure
index eecd0ac..ee637a7 100755
--- a/configure
+++ b/configure
@@ -634,6 +634,7 @@ BISON
 INSTALL_INFO
 PERL
 BASH_SHELL
+CXX_BITS_STD_ABS_H
 CXX_CMATH_HEADER
 CXX_CSTDLIB_HEADER
 CXX_SYSINCLUDES
@@ -5318,14 +5319,17 @@ fi
 # copy of those headers in Makerules.
 if test -n "$CXX"; then
   find_cxx_header () {
-    echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}"
+    echo "#include <$1>" | $CXX -M -MP -x c++ - 2>/dev/null \
+	 | sed -n "\,$1:,{s/:\$//;p}"
   }
   CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
   CXX_CMATH_HEADER="$(find_cxx_header cmath)"
+  CXX_BITS_STD_ABS_H="$(find_cxx_header bits/std_abs.h)"
 fi
 
 
 
+
 # Test if LD_LIBRARY_PATH contains the notation for the current directory
 # since this would lead to problems installing/building glibc.
 # LD_LIBRARY_PATH contains the current directory if one of the following
diff --git a/configure.ac b/configure.ac
index 4a77411..d288ff4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1176,13 +1176,16 @@ AC_SUBST(CXX_SYSINCLUDES)
 # copy of those headers in Makerules.
 if test -n "$CXX"; then
   find_cxx_header () {
-    echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}"
+    echo "#include <$1>" | $CXX -M -MP -x c++ - 2>/dev/null \
+	 | sed -n "\,$1:,{s/:\$//;p}"
   }
   CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
   CXX_CMATH_HEADER="$(find_cxx_header cmath)"
+  CXX_BITS_STD_ABS_H="$(find_cxx_header bits/std_abs.h)"
 fi
 AC_SUBST(CXX_CSTDLIB_HEADER)
 AC_SUBST(CXX_CMATH_HEADER)
+AC_SUBST(CXX_BITS_STD_ABS_H)
 
 # Test if LD_LIBRARY_PATH contains the notation for the current directory
 # since this would lead to problems installing/building glibc.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |   17 +++++++++++++++++
 Makerules      |    8 ++++++++
 config.make.in |    1 +
 configure      |    6 +++++-
 configure.ac   |    5 ++++-
 5 files changed, 35 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources