Allow ARM configurations with --with-cpu=arm9 or --with-cpu=arm9tdmi or

--with-cpu=strongarm110 or --with-cpu=strongarm1100

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37625 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a88e62..a3fc10a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-21  Nick Clifton  <nickc@redhat.com>
+
+       * config/arm/arm.h: Accept TARGET_CPU_arm9tdmi,
+       TARGET_CPU_strongarm110 and TARGET_SPU_strongarm1100.
+
+       * config.gcc: Accept --with-cpu=arm9 and --with-cpu=arm9tdmi.
+       
 2000-11-21  Richard Henderson  <rth@redhat.com>
 
        * c-common.c (c_unsafe_for_reeval): New function.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 63eaa8c..21db142 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -3277,8 +3277,8 @@ arm*-*-*)
 
                # Distinguish cores, and major variants
                # arm7m doesn't exist, but D & I don't affect code
-               xarm[23678] | xarm250 | xarm[67][01]0 \
-               | xarm7m | xarm7dm | xarm7dmi | xarm7tdmi \
+               xarm[236789] | xarm250 | xarm[67][01]0 \
+               | xarm7m | xarm7dm | xarm7dmi | xarm[79]tdmi \
                | xarm7100 | xarm7500 | xarm7500fe | xarm810 \
                | xstrongarm | xstrongarm110 | xstrongarm1100)
                        target_cpu_default2="TARGET_CPU_$with_cpu"

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index f9d5cd8..f8859a3 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -89,9 +89,10 @@ extern int current_function_anonymous_args;
 #endif
 
 /* If the configuration file doesn't specify the cpu, the subtarget may
-   override it.  If it doesn't, then default to an ARM6. */
+   override it.  If it doesn't, then default to an ARM6.  */
 #if TARGET_CPU_DEFAULT == TARGET_CPU_generic
 #undef TARGET_CPU_DEFAULT
+
 #ifdef SUBTARGET_CPU_DEFAULT
 #define TARGET_CPU_DEFAULT SUBTARGET_CPU_DEFAULT
 #else
@@ -108,10 +109,10 @@ extern int current_function_anonymous_args;
 #if TARGET_CPU_DEFAULT == TARGET_CPU_arm7m
 #define CPP_ARCH_DEFAULT_SPEC "-D__ARM_ARCH_3M__"
 #else
-#if TARGET_CPU_DEFAULT == TARGET_CPU_arm7tdmi || TARGET_CPU_DEFAULT == TARGET_CPU_arm9
+#if TARGET_CPU_DEFAULT == TARGET_CPU_arm7tdmi || TARGET_CPU_DEFAULT == TARGET_CPU_arm9 || TARGET_CPU_DEFAULT == TARGET_CPU_arm9tdmi
 #define CPP_ARCH_DEFAULT_SPEC "-D__ARM_ARCH_4T__"
 #else
-#if TARGET_CPU_DEFAULT == TARGET_CPU_arm8 || TARGET_CPU_DEFAULT == TARGET_CPU_arm810 || TARGET_CPU_DEFAULT == TARGET_CPU_strongarm
+#if TARGET_CPU_DEFAULT == TARGET_CPU_arm8 || TARGET_CPU_DEFAULT == TARGET_CPU_arm810 || TARGET_CPU_DEFAULT == TARGET_CPU_strongarm || TARGET_CPU_DEFAULT = TARGET_CPU_strongarm110 || TARGET_CPU_DEFAULT = TARGET_CPU_strongarm1100 
 #define CPP_ARCH_DEFAULT_SPEC "-D__ARM_ARCH_4__"
 #else
 Unrecognized value in TARGET_CPU_DEFAULT.