Remove some compile time warnings about duplicate definitions.

From-SVN: r47285

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a84ebf960955be6ccc6b97f1d2e77b56ed323300..02549e6a85e1bbf36115e74af939c7c06f90c0f8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-23  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * config/arm/xscale-coff.h (SUBTARGET_CPU_DEFAULT): Override
+       default definition.
+       (SUBTARGET_EXTRA_ASM_SPEC): Remove previous definition.
+       (MULTILIB_DEFAULTS): Remove previous definition.
+
 2001-11-23  Neil Booth  <neil@daikokuya.demon.co.uk>
 
        * cppmacro.c (warn_of_redefinition): Warn regardless of -pedantic.

diff --git a/gcc/config/arm/xscale-coff.h b/gcc/config/arm/xscale-coff.h
index f5f980dba396c60d393d2465eaca305c194208c8..51fe6932e6d7d6dd38e7bed7db3f94b13f6e86c3 100644 (file)
--- a/gcc/config/arm/xscale-coff.h
+++ b/gcc/config/arm/xscale-coff.h
@@ -1,31 +1,32 @@
 /* Definitions for XScale systems using COFF
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Catherine Moore <clm@cygnus.com>
 
-This file is part of GNU CC.
+   This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 2, or (at your
+   option) any later version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA.  */
 
 /* Run-time Target Specification.  */
-#ifndef SUBTARGET_CPU_DEFAULT
+#undef  SUBTARGET_CPU_DEFAULT
 #define SUBTARGET_CPU_DEFAULT          TARGET_CPU_xscale
-#endif
 
+#undef  SUBTARGET_EXTRA_ASM_SPEC
 #define SUBTARGET_EXTRA_ASM_SPEC "%{!mcpu=*:-mxscale}"
 
+#undef  MULTILIB_DEFAULTS
 #define MULTILIB_DEFAULTS \
   { "mlittle-endian", "mno-thumb-interwork", "marm" }