[Bug bootstrap/52784] i386-apple-darwin multilib bootstrap broken

[howarth at nitro dot med.uc.edu]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52784

--- Comment #1 from Jack Howarth <howarth at nitro dot med.uc.edu> 2012-03-30 01:39:14 UTC ---
Caused by...

Author: hjl
Date: Wed Mar 28 22:42:28 2012
New Revision: 185937

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=185937
Log:
Add ABI_64 and replace ISA_X32 with ABI_X32

2012-03-28  H.J. Lu  <hongjiu.lu@intel.com>

    * config/i386/biarch64.h (TARGET_64BIT_DEFAULT): Add
    OPTION_MASK_ABI_64.

    * config/i386/gnu-user64.h (SPEC_64): Support TARGET_BI_ARCH == 2.
    (SPEC_X32): Likewise.
    (MULTILIB_DEFAULTS): Likewise.

    * config/i386/i386.c (isa_opts): Remove -m64.
    (ix86_target_string): Properly handle -m32/-m64/-mx32.
    (ix86_option_override_internal): Properly
    set OPTION_MASK_ISA_64BIT and OPTION_MASK_ISA_X32 as well as
    handle -m32, -m64 and -mx32.

    * config/i386/i386.h (TARGET_X32): Replace OPTION_ISA_X32
    with OPTION_ABI_X32.  Moved after TARGET_LP64.
    (TARGET_LP64): Changed to OPTION_ABI_64.

    * config/i386/i386.opt (m64): Replace ISA_64BIT with ABI_64.
    (mx32): Replace ISA_X32 with ABI_X32.

Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/config/i386/biarch64.h
    trunk/gcc/config/i386/gnu-user64.h
    trunk/gcc/config/i386/i386.c
    trunk/gcc/config/i386/i386.h
    trunk/gcc/config/i386/i386.opt

Reverting this commit eliminates the multilib bootstrap failure on
i386-apple-darwin10.