diff options
| author | Nick Clifton <nickc@redhat.com> | 2004-04-16 13:20:37 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@gcc.gnu.org> | 2004-04-16 13:20:37 +0000 |
| commit | c805f22eca87725368c7c00fcd56477daf888598 (patch) | |
| tree | b66a6cb30abd2fda878090b3565f1e68a18b0fc1 | |
| parent | 8a897efe7a389a2f034dd0789ce05564d898551a (diff) | |
| download | gcc-c805f22eca87725368c7c00fcd56477daf888598.zip gcc-c805f22eca87725368c7c00fcd56477daf888598.tar.gz gcc-c805f22eca87725368c7c00fcd56477daf888598.tar.bz2 | |
arm.c (arm_override_options): Revert previous patch.
* config/arm/arm.c (arm_override_options): Revert previous patch.
* config/arm/t-xscale-elf: Disable iwmmxt multilibs until they can be safely
built.
From-SVN: r80752
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/arm/arm.c | 7 | ||||
| -rw-r--r-- | gcc/config/arm/t-xscale-elf | 12 |
3 files changed, 16 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cee23d3..92cb754 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-04-16 Nick Clifton <nickc@redhat.com> + + * config/arm/arm.c (arm_override_options): Revert previous patch. + * config/arm/t-xscale-elf: Disable iwmmxt multilibs until they can + be safely built. + 2004-04-16 Kazuhiro Inaoka <inaoka dot kazuhiro at renesas dot com> * config/m32r/m32r.h (BIG_ENDIAN_BIT): Deleted to fix endian diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 4d57e28..6f340df 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -856,12 +856,7 @@ arm_override_options (void) error ("invalid ABI option: -mabi=%s", target_abi_name); } else - { - if (TARGET_IWMMXT) - arm_abi = ARM_ABI_AAPCS; - else - arm_abi = ARM_DEFAULT_ABI; - } + arm_abi = ARM_DEFAULT_ABI; if (TARGET_IWMMXT && !ARM_DOUBLEWORD_ALIGN) error ("iwmmxt requires an AAPCS compatible ABI for proper operation"); diff --git a/gcc/config/arm/t-xscale-elf b/gcc/config/arm/t-xscale-elf index 03a886c..1b7119a 100644 --- a/gcc/config/arm/t-xscale-elf +++ b/gcc/config/arm/t-xscale-elf @@ -37,9 +37,15 @@ MULTILIB_EXCEPTIONS += *mhard-float/*mthumb* MULTILIB_REDUNDANT_DIRS = interwork/thumb=thumb -MULTILIB_OPTIONS += mcpu=iwmmxt -MULTILIB_DIRNAMES += iwmmxt -MULTILIB_REDUNDANT_DIRS += interwork/thumb/iwmmxt=thumb +# The iWMMXt multilibs are suppressed for now because gcc only +# supports generating them with the IWMMXT or AAPCS ABIs, neither of +# which is the default. Until GCC can generate code for an iWMMXt +# which will work with the default ABI it is not possible to safely +# generate these multilibs. +# +# MULTILIB_OPTIONS += mcpu=iwmmxt +# MULTILIB_DIRNAMES += iwmmxt +# MULTILIB_REDUNDANT_DIRS += interwork/thumb/iwmmxt=thumb EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o |