about summary refs log tree commit diff
path: root/configure
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@redhat.com>2013-04-17 17:13:20 -0700
committerCarlos O'Donell <carlos@redhat.com>2013-04-17 17:13:20 -0700
commit0f122b8d12875181a4fba3449e3549d34d3dc398 (patch)
treef146aebf07ebf237966094b0b371ca7c9e32c125 /configure
parent037714dd49c1d43584163e80008bb53f693e2550 (diff)
downloadglibc-0f122b8d12875181a4fba3449e3549d34d3dc398.tar.gz
glibc-0f122b8d12875181a4fba3449e3549d34d3dc398.tar.xz
glibc-0f122b8d12875181a4fba3449e3549d34d3dc398.zip
Configuring for i386 is no longer supported.
We no longer support configuring for i386, nor do we
elide such a configuration to i686. Configuring with
i386-* is a failure, and we provide an example of
how to fix that.

---

2013-04-17  Carlos O'Donell  <carlos@redhat.com>

	* configure.in: Remove i386 configure warning. Remove i386 case.
	* configure: Regenerate.
	* sysdeps/i386/configure.in: Raise error if config_machine is i386.
	Add example to error message.
	* sysdeps/i386/configure: Regenerate.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 1 insertions, 10 deletions
diff --git a/configure b/configure
index 0b50df94f5..8c538f5094 100755
--- a/configure
+++ b/configure
@@ -3741,15 +3741,6 @@ case "$machine-$host_os" in
     ;;
 esac
 
-# Configure for i686 if the user asks for i386. We don't support
-# i386 any more but it continues to be common for users to configure
-# 32-bit x86 as i386. We build for i686 instead.
-if test "$machine" = i386; then
-  machine="i686"
-  echo "\
-*** WARNING: Support for i386 is deprecated. Building for i686 instead."
-fi
-
 submachine=
 
 # Check whether --with-cpu was given.
@@ -3945,7 +3936,7 @@ fi
 # type and particular chip.  If an add-on configure fragment already set
 # base_machine, we don't change it.
 test -n "$base_machine" || case "$machine" in
-i[34567]86)	base_machine=i386 machine=i386/$machine ;;
+i[4567]86)	base_machine=i386 machine=i386/$machine ;;
 powerpc)	base_machine=powerpc machine=powerpc/powerpc32 ;;
 powerpc64)	base_machine=powerpc machine=powerpc/powerpc64 ;;
 s390)           base_machine=s390 machine=s390/s390-32 ;;