From f8693fafeffe58c374b04ddb44bfc281c426505a Mon Sep 17 00:00:00 2001 From: Matthew Gretton-Dann Date: Tue, 20 Aug 2013 12:18:36 +0000 Subject: linux-elf.h (MULTILIB_DEFAULTS): Remove definition. 2013-08-20 Matthew Gretton-Dann * config/arm/linux-elf.h (MULTILIB_DEFAULTS): Remove definition. * config/arm/t-linux-eabi (MULTILIB_OPTIONS): Document association with MULTLIB_DEFAULTS. From-SVN: r201879 --- gcc/ChangeLog | 6 ++++++ gcc/config/arm/linux-elf.h | 4 ++-- gcc/config/arm/t-linux-eabi | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bce291d..c6a5893 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-08-20 Matthew Gretton-Dann + + * config/arm/linux-elf.h (MULTILIB_DEFAULTS): Remove definition. + * config/arm/t-linux-eabi (MULTILIB_OPTIONS): Document association + with MULTLIB_DEFAULTS. + 2013-08-20 Nick Clifton * target.def (narrow_volatile_bitfield): Note that the default diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h index 488efa4..475e220 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -44,9 +44,9 @@ #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p" +/* We do not have any MULTILIB_OPTIONS specified, so there are no + MULTILIB_DEFAULTS. */ #undef MULTILIB_DEFAULTS -#define MULTILIB_DEFAULTS \ - { "marm", "mlittle-endian", "mfloat-abi=hard", "mno-thumb-interwork" } /* Now we define the strings used to build the spec file. */ #undef LIB_SPEC diff --git a/gcc/config/arm/t-linux-eabi b/gcc/config/arm/t-linux-eabi index 2f2f8ff..07e32b3 100644 --- a/gcc/config/arm/t-linux-eabi +++ b/gcc/config/arm/t-linux-eabi @@ -18,6 +18,8 @@ # We do not build a Thumb multilib for Linux because the definition of # CLEAR_INSN_CACHE in linux-gas.h does not work in Thumb mode. +# If you set MULTILIB_OPTIONS to a non-empty value you should also set +# MULTILIB_DEFAULTS in linux-elf.h. MULTILIB_OPTIONS = MULTILIB_DIRNAMES = -- cgit v1.1