Prevent warning about redefinition of SUBTARGET_CPU_DEFAULT

From-SVN: r26314

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85e390d..7ce4ea6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  9 13:04:52 1999  Nick Clifton  <nickc@cygnus.com>
+
+       * config/arm/unknown-elf.h (SUBTARGET_CPU_DEFAULT): Only define if
+       not already specified.
+
 Fri Apr  9 11:18:55 1999  Jason Merrill  <jason@yorick.cygnus.com>
 
        * c-common.c (decl_attributes, A_INIT_PRIORITY): Allow arrays

diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h
index 5fa5d72..6402c4e 100644 (file)
--- a/gcc/config/arm/unknown-elf.h
+++ b/gcc/config/arm/unknown-elf.h
@@ -33,7 +33,9 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_ATEXIT
 
 /* Default to using APCS-32 and software floating point.  */
+#ifndef TARGET_DEFAULT
 #define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32)
+#endif
 
 /* Now we define the strings used to build the spec file.  */
 #define STARTFILE_SPEC "crtbegin%O%s crt0%O%s"
@@ -157,8 +159,13 @@ do {                                                               \
   DECL_SECTION_NAME (DECL) = build_string (len, string);       \
 } while (0)
 
+#ifndef CPP_APCS_PC_DEFAULT_SPEC
 #define CPP_APCS_PC_DEFAULT_SPEC       "-D__APCS_32__"
+#endif
+     
+#ifndef SUBTARGET_CPU_DEFAULT
 #define SUBTARGET_CPU_DEFAULT          TARGET_CPU_arm7tdmi
-
+#endif
+     
 /* Now get the routine arm-elf definitions.  */
 #include "arm/elf.h"