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.

1 files changed, 12 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index d89aaf0cdf..8043a27c3f 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.