diff options
| author | Carlos O'Donell <carlos@redhat.com> | 2013-04-17 17:13:20 -0700 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2013-04-17 17:13:20 -0700 |
| commit | 0f122b8d12875181a4fba3449e3549d34d3dc398 (patch) | |
| tree | f146aebf07ebf237966094b0b371ca7c9e32c125 /sysdeps/i386 | |
| parent | 037714dd49c1d43584163e80008bb53f693e2550 (diff) | |
| download | glibc-0f122b8d12875181a4fba3449e3549d34d3dc398.zip glibc-0f122b8d12875181a4fba3449e3549d34d3dc398.tar.gz glibc-0f122b8d12875181a4fba3449e3549d34d3dc398.tar.bz2 | |
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 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/configure | 12 | ||||
| -rw-r--r-- | sysdeps/i386/configure.in | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index a1a0fe7..53b6a61 100644 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -32,6 +32,15 @@ $as_echo "$ac_res" >&6; } # This file is generated from configure.in by Autoconf. DO NOT EDIT! # Local configure fragment for sysdeps/i386. +# We no longer support i386 since it lacks the atomic instructions +# required to implement NPTL threading. +if test "$config_machine" = i386; then + as_fn_error $? " +*** ERROR: Support for i386 is deprecated. +*** Please use host i786, i686, i585 or i486. +*** For example: /src/glibc/configure --host=i686-pc-linux-gnu ...\"" "$LINENO" 5 +fi + # The GNU C Library can't be built for i386. There are several reasons for # this restriction. The primary reason is that i386 lacks the atomic # operations required to support the current NPTL implementation. While it is @@ -66,7 +75,8 @@ if test $libc_compiler_builtin_inlined = yes; then else as_fn_error $? " *** Building with -march=i386/-mcpu=i386 is not supported. -*** Please use host i786, i686, i586, or i486." "$LINENO" 5 +*** Please use host i786, i686, i586, or i486. +*** For example: /source/glibc/configure CFLAGS='-O2 -march=i686' ..." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_compiler_builtin_inlined" >&5 $as_echo "$libc_compiler_builtin_inlined" >&6; } diff --git a/sysdeps/i386/configure.in b/sysdeps/i386/configure.in index 56a7c1f..96ab7b0 100644 --- a/sysdeps/i386/configure.in +++ b/sysdeps/i386/configure.in @@ -1,6 +1,15 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/i386. +# We no longer support i386 since it lacks the atomic instructions +# required to implement NPTL threading. +if test "$config_machine" = i386; then + AC_MSG_ERROR([ +*** ERROR: Support for i386 is deprecated. +*** Please use host i786, i686, i585 or i486. +*** For example: /src/glibc/configure --host=i686-pc-linux-gnu ..."]) +fi + # The GNU C Library can't be built for i386. There are several reasons for # this restriction. The primary reason is that i386 lacks the atomic # operations required to support the current NPTL implementation. While it is @@ -18,7 +27,8 @@ LIBC_COMPILER_BUILTIN_INLINED( [libc_cv_unsupported_i386=no], [AC_MSG_ERROR([ *** Building with -march=i386/-mcpu=i386 is not supported. -*** Please use host i786, i686, i586, or i486.])]) +*** Please use host i786, i686, i586, or i486. +*** For example: /source/glibc/configure CFLAGS='-O2 -march=i686' ...])]) AC_CHECK_HEADER([cpuid.h], , [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])], |