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 c61a392255f076ef3f67c8d5f16b79aff8bef7a6..bf4ddd07e8d432a50e7bf98513cdeb97b24aeaf9 100644 (file)
--- 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 b2ed6f3e9685f197a93f71681d96d144dc8f3435..87cd6816a91fe94b604f95969023937ed49a1d8e 100644 (file)
--- 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 ce0c6a01f114d009945dcca58d039fa5123d648e..7337823652ba37d4b2d960fdface2cb93b1fc1dd 100755 (executable)
--- 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 d89aaf0cdf329f1fe6247dbbfad49693642c570f..8043a27c3fa8c0efe7114fd0d4e50ddf99bc9951 100644 (file)
--- 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.