AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 06:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configuring for i386 is no longer supported.

Browse Source 
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.
This commit is contained in:
Carlos O'Donell 2013-04-17 17:13:20 -07:00
parent 037714dd49
commit 0f122b8d12
5 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2013-04-17 Carlos O'Donell <carlos@redhat.com>
* configure.in: Remove i386 configure warning.
* configure: Regenerate.
* sysdeps/i386/configure.in: Raise error if machine is i386.
Add example to error message.
* sysdeps/i386/configure: Regenerate.
2013-04-17 Siddhesh Poyarekar <siddhesh@redhat.com> 2013-04-17 Siddhesh Poyarekar <siddhesh@redhat.com>
* benchtests/Makefile (bench): Add cos, tan, slowcos and * benchtests/Makefile (bench): Add cos, tan, slowcos and

11
configure vendored
View File

@ -3741,15 +3741,6 @@ case "$machine-$host_os" in
;; ;;
esac 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= submachine=
# Check whether --with-cpu was given. # Check whether --with-cpu was given.
@ -3945,7 +3936,7 @@ fi
# type and particular chip. If an add-on configure fragment already set # type and particular chip. If an add-on configure fragment already set
# base_machine, we don't change it. # base_machine, we don't change it.
test -n "$base_machine" || case "$machine" in 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 ;; powerpc) base_machine=powerpc machine=powerpc/powerpc32 ;;
powerpc64) base_machine=powerpc machine=powerpc/powerpc64 ;; powerpc64) base_machine=powerpc machine=powerpc/powerpc64 ;;
s390) base_machine=s390 machine=s390/s390-32 ;; s390) base_machine=s390 machine=s390/s390-32 ;;

11
configure.in
View File

@ -390,15 +390,6 @@ case "$machine-$host_os" in
;; ;;
esac 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= submachine=
AC_ARG_WITH([cpu], AC_ARG_WITH([cpu],
AS_HELP_STRING([--with-cpu=CPU], [select code for CPU variant]), AS_HELP_STRING([--with-cpu=CPU], [select code for CPU variant]),
@ -576,7 +567,7 @@ changequote(,)dnl
# type and particular chip. If an add-on configure fragment already set # type and particular chip. If an add-on configure fragment already set
# base_machine, we don't change it. # base_machine, we don't change it.
test -n "$base_machine" || case "$machine" in 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 ;; powerpc) base_machine=powerpc machine=powerpc/powerpc32 ;;
powerpc64) base_machine=powerpc machine=powerpc/powerpc64 ;; powerpc64) base_machine=powerpc machine=powerpc/powerpc64 ;;
s390) base_machine=s390 machine=s390/s390-32 ;; s390) base_machine=s390 machine=s390/s390-32 ;;

12
sysdeps/i386/configure vendored
View File

@ -32,6 +32,15 @@ $as_echo "$ac_res" >&6; }
# This file is generated from configure.in by Autoconf. DO NOT EDIT! # This file is generated from configure.in by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/i386. # 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 # 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 # this restriction. The primary reason is that i386 lacks the atomic
# operations required to support the current NPTL implementation. While it is # operations required to support the current NPTL implementation. While it is
@ -66,7 +75,8 @@ if test $libc_compiler_builtin_inlined = yes; then
else else
as_fn_error $? " as_fn_error $? "
*** Building with -march=i386/-mcpu=i386 is not supported. *** 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 fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_compiler_builtin_inlined" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_compiler_builtin_inlined" >&5
$as_echo "$libc_compiler_builtin_inlined" >&6; } $as_echo "$libc_compiler_builtin_inlined" >&6; }

12
sysdeps/i386/configure.in
View File

@ -1,6 +1,15 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/i386. # 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 # 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 # this restriction. The primary reason is that i386 lacks the atomic
# operations required to support the current NPTL implementation. While it is # operations required to support the current NPTL implementation. While it is
@ -18,7 +27,8 @@ LIBC_COMPILER_BUILTIN_INLINED(
[libc_cv_unsupported_i386=no], [libc_cv_unsupported_i386=no],
[AC_MSG_ERROR([ [AC_MSG_ERROR([
*** Building with -march=i386/-mcpu=i386 is not supported. *** 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_CHECK_HEADER([cpuid.h], ,
[AC_MSG_ERROR([gcc must provide the <cpuid.h> header])], [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],