diff options
| author | Carlos O'Donell <carlos@redhat.com> | 2013-04-06 12:00:35 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2013-04-06 12:00:35 -0400 |
| commit | a01f19c8fb12eef419d4112879bc715e2ab6f6d7 (patch) | |
| tree | 7fc2d8e4007a8b4f7d3a7aecf0734a11ee199ba2 /configure.in | |
| parent | b7a329a5614d9001abcc3300a3da548a0865a3ac (diff) | |
| download | glibc-a01f19c8fb12eef419d4112879bc715e2ab6f6d7.zip glibc-a01f19c8fb12eef419d4112879bc715e2ab6f6d7.tar.gz glibc-a01f19c8fb12eef419d4112879bc715e2ab6f6d7.tar.bz2 | |
i386: Fail at configure time for i386 builds.
This change does two things:
* Treats a target i386-* as if it were i686.
* Fails configure if the user is generating code
for i386.
We no longer support i386 code-generation because the i386
lacks the atomic operations we need in glibc.
You can still configure for i386-*, but you get i686 code.
You can't build with --march=i386, --mtune=i386 or a compiler
that defaults to i386 code-generation.
I've added two i386 entries in the master todo list to discuss
merging and renaming:
http://sourceware.org/glibc/wiki/Development_Todo/Master#i386
The failure modes are fail-safe here. You compile for i386,
get i686, and try to run on i386 and it fails. The configure
log has a warning saying we elided to i686. There is no situation
that I can see where we run into any serious problems.
The patch makes the current state better in that we get less
confused users and we build successfully in more default
configurations.
The next enhancement would be to add --march=i?86
as suggested in #c20 of BZ#10062 for any i?86-* builds, which
would solve the problem of a 32-bit compiler that defaults to
i386 code-gen and glibc configured for i686-* target. Which
previously failed at build time, and now will fail at configure
time (requires adding --march=i686).
Updated NEWS with BZ #10060 and #10062.
No regressions.
---
2013-04-06 Carlos O'Donell <carlos@redhat.com>
[BZ #10060, #10062]
* aclocal.m4 (LIBC_COMPILER_BUILTIN_INLINED): New macro.
* sysdeps/i386/configure.in: Use LIBC_COMPILER_BUILTIN_INLINED and
fail configure if __sync_val_compare_and_swap is not inlined.
* sysdeps/i386/configure: Regenerate.
* configure.in: Build for i686 when configured for i386.
* configure: Regenerate.
* README: Remove i386 reference.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.in b/configure.in index bbdf156..d93ca5c 100644 --- a/configure.in +++ b/configure.in @@ -390,6 +390,15 @@ 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= AC_ARG_WITH([cpu], AS_HELP_STRING([--with-cpu=CPU], [select code for CPU variant]), |