From 2ce4f01533128a525799c3cbfba7be4502c5c8c9 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 26 Apr 2012 18:42:42 +0000
Subject: [PATCH] Don't handle unsupported OSes in configure (base_os
 settings).

---
 ChangeLog    | 25 +++++++++++++++++++++++++
 configure    | 14 ++------------
 configure.in | 14 ++------------
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ad5a64691d..ea4cb58bc5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2012-04-26  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in (arm*-none*): Do not allow without
+	--enable-hacker-mode.
+	(netbsd*): Remove case setting base_os.
+	(386bsd*): Likewise.
+	(freebsd*): Likewise.
+	(bsdi*): Likewise.
+	(osf*): Likewise.
+	(sunos*): Likewise.
+	(ultrix*): Likewise.
+	(newsos*): Likewise.
+	(dynix*): Likewise.
+	(*bsd*): Likewise.
+	(sysv*): Likewise.
+	(isc*): Likewise.
+	(esix*): Likewise.
+	(sco*): Likewise.
+	(minix*): Likewise.
+	(irix4*): Likewise.
+	(irix6*): Likewise.
+	(solaris[2-9]*): Likewise.
+	(none): Likewise.
+	* configure: Regenerated.
+
 2012-04-26  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	[BZ #11521]
diff --git a/configure b/configure
index 7fd47c17c0b..d4958f3ed76 100755
--- a/configure
+++ b/configure
@@ -3982,7 +3982,7 @@ fi
 ###
 if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
   case "$machine-$host_os" in
-  *-linux* | *-gnu* | arm*-none*)
+  *-linux* | *-gnu*)
     ;;
   *)
     echo "*** The GNU C library is currently not available for this platform."
@@ -4177,18 +4177,8 @@ os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`"
 test "x$base_os" != x || case "$os" in
 gnu*)
   base_os=mach/hurd ;;
-netbsd* | 386bsd* | freebsd* | bsdi*)
-  base_os=unix/bsd/bsd4.4 ;;
-osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
-  base_os=unix/bsd ;;
-sysv* | isc* | esix* | sco* | minix* | irix4* | linux*)
+linux*)
   base_os=unix/sysv ;;
-irix6*)
-  base_os=unix/sysv/irix6/$os ;;
-solaris[2-9]*)
-  base_os=unix/sysv/sysv4 ;;
-none)
-  base_os=standalone ;;
 esac
 
 # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.
diff --git a/configure.in b/configure.in
index 42d521f7081..0f5193e7170 100644
--- a/configure.in
+++ b/configure.in
@@ -463,7 +463,7 @@ AC_SUBST(add_on_subdirs)
 ###
 if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
   case "$machine-$host_os" in
-  *-linux* | *-gnu* | arm*-none*)
+  *-linux* | *-gnu*)
     ;;
   *)
     echo "*** The GNU C library is currently not available for this platform."
@@ -615,18 +615,8 @@ os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`"
 test "x$base_os" != x || case "$os" in
 gnu*)
   base_os=mach/hurd ;;
-netbsd* | 386bsd* | freebsd* | bsdi*)
-  base_os=unix/bsd/bsd4.4 ;;
-osf* | sunos* | ultrix* | newsos* | dynix* | *bsd*)
-  base_os=unix/bsd ;;
-sysv* | isc* | esix* | sco* | minix* | irix4* | linux*)
+linux*)
   base_os=unix/sysv ;;
-irix6*)
-  base_os=unix/sysv/irix6/$os ;;
-solaris[2-9]*)
-  base_os=unix/sysv/sysv4 ;;
-none)
-  base_os=standalone ;;
 esac
 
 # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.
-- 
2.39.2