GNU C Library master sources branch master updated. glibc-2.21-63-gebf27d1

[sthibaul 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, master has been updated
       via  ebf27d12e602b428a316c105ed10371ed84d2d3d (commit)
      from  d435569cd626bccb9c27361202a279d0fd7fce88 (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=ebf27d12e602b428a316c105ed10371ed84d2d3d

commit ebf27d12e602b428a316c105ed10371ed84d2d3d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed Feb 11 23:27:50 2015 +0000

    Revert "hurd: Fix abi-tag, following ba90e05"
    
    	and revert the corresponding part of ba90e05 which was making the fix
    	necessary.
    
    	* abi-tags: Revert ae20c9a: rename back gnu into gnu-gnu.
    	* configure.ac, configure: Revert ba90e05: modify gnu-* host_os back
    	into gnu-gnu, and update comment to refer to abi-tags.

diff --git a/ChangeLog b/ChangeLog
index c61a392..bf4ddd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-11  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* abi-tags: Revert ae20c9a: rename back gnu into gnu-gnu.
+	* configure.ac, configure: Revert ba90e05: modify gnu-* host_os back
+	into gnu-gnu, and update comment to refer to abi-tags.
+
 2015-02-11  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #15467]
diff --git a/abi-tags b/abi-tags
index b2ed6f3..87cd681 100644
--- a/abi-tags
+++ b/abi-tags
@@ -18,7 +18,7 @@
 
 .*-.*-linux.*		0	2.0.0	# earliest compatible kernel version
 
-.*-.*-gnu.*		1	0.0.0
+.*-.*-gnu-gnu.*		1	0.0.0
 
 .*-sun-solaris2.*	2	2.0.0	# just an arbitrary value
 
diff --git a/configure b/configure
index ce0c6a0..7337823 100755
--- a/configure
+++ b/configure
@@ -3742,6 +3742,18 @@ if test "$build_pt_chown" = yes; then
 
 fi
 
+# The abi-tags file uses a fairly simplistic model for name recognition that
+# can't distinguish i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a
+# $host_os of `gnu*' here to be `gnu-gnu*' just so that it can tell.
+# This doesn't get used much beyond that, so it's fairly safe.
+case "$host_os" in
+linux*)
+  ;;
+gnu*)
+  host_os=`echo $host_os | sed -e 's/gnu/gnu-gnu/'`
+  ;;
+esac
+
 # We keep the original values in `$config_*' and never modify them, so we
 # can write them unchanged into config.make.  Everything else uses
 # $machine, $vendor, and $os, and changes them whenever convenient.
diff --git a/configure.ac b/configure.ac
index d89aaf0..8043a27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,6 +360,18 @@ if test "$build_pt_chown" = yes; then
   AC_DEFINE(HAVE_PT_CHOWN)
 fi
 
+# The abi-tags file uses a fairly simplistic model for name recognition that
+# can't distinguish i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a
+# $host_os of `gnu*' here to be `gnu-gnu*' just so that it can tell.
+# This doesn't get used much beyond that, so it's fairly safe.
+case "$host_os" in
+linux*)
+  ;;
+gnu*)
+  host_os=`echo $host_os | sed -e 's/gnu/gnu-gnu/'`
+  ;;
+esac
+
 # We keep the original values in `$config_*' and never modify them, so we
 # can write them unchanged into config.make.  Everything else uses
 # $machine, $vendor, and $os, and changes them whenever convenient.

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

Summary of changes:
 ChangeLog    |    6 ++++++
 abi-tags     |    2 +-
 configure    |   12 ++++++++++++
 configure.ac |   12 ++++++++++++
 4 files changed, 31 insertions(+), 1 deletions(-)


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