summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--abi-tags2
-rwxr-xr-xconfigure12
-rw-r--r--configure.ac12
4 files changed, 31 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c61a392255..bf4ddd07e8 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 b2ed6f3e96..87cd6816a9 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 ce0c6a01f1..7337823652 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 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.