From eecbc061d4cbb4ea2498cb7388f4f98171fe36de Mon Sep 17 00:00:00 2001 From: Joern Rennecke Date: Fri, 31 Dec 2010 11:48:03 +0000 Subject: [PATCH] re PR target/47112 (mipstx39-*-elf*: Redefined target macros) PR target/47112 * config/mips/r3900.h: Update Copyright years. (MIPS_CPU_STRING_DEFAULT): Undef before defining. (MULTILIB_DEFAULTS, MIPS_ABI_DEFAULT, SUBTARGET_CC1_SPEC): Likewise. From-SVN: r168369 --- gcc/ChangeLog | 5 +++++ gcc/config/mips/r3900.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6820d8d..e346fc2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -12,6 +12,11 @@ PR target/47111 * config/rtems.h (NO_IMPLICIT_EXTERN_C): Undef before defining. + PR target/47112 + * config/mips/r3900.h: Update Copyright years. + (MIPS_CPU_STRING_DEFAULT): Undef before defining. + (MULTILIB_DEFAULTS, MIPS_ABI_DEFAULT, SUBTARGET_CC1_SPEC): Likewise. + 2010-12-30 Mingjie Xing * config/mips/mips.h (SHIFT_COUNT_TRUNCATED): Change diff --git a/gcc/config/mips/r3900.h b/gcc/config/mips/r3900.h index 66aaf94..557ca3e 100644 --- a/gcc/config/mips/r3900.h +++ b/gcc/config/mips/r3900.h @@ -2,7 +2,7 @@ Toshiba r3900. You should include mips.h after this. Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2004, - 2007 Free Software Foundation, Inc. + 2007, 2010 Free Software Foundation, Inc. Contributed by Gavin Koch (gavin@cygnus.com). This file is part of GCC. @@ -21,15 +21,19 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see . */ +#undef MIPS_CPU_STRING_DEFAULT #define MIPS_CPU_STRING_DEFAULT "r3900" #define MIPS_ISA_DEFAULT 1 +#undef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS { MULTILIB_ENDIAN_DEFAULT, "msoft-float" } /* We use the MIPS EABI by default. */ +#undef MIPS_ABI_DEFAULT #define MIPS_ABI_DEFAULT ABI_EABI /* By default (if not mips-something-else) produce code for the r3900 */ +#undef SUBTARGET_CC1_SPEC #define SUBTARGET_CC1_SPEC "\ %{mhard-float:%e-mhard-float not supported} \ %{msingle-float:%{msoft-float: \ -- 2.7.4