From a88ec949e97b289aee6ed1462602903ae86f3336 Mon Sep 17 00:00:00 2001 From: nickc Date: Tue, 21 Nov 2000 19:34:14 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 7 +++++++ gcc/config.gcc | 4 ++-- gcc/config/arm/arm.h | 7 ++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0a88e629d74..a3fc10aa95d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2000-11-21 Nick Clifton + + * 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 * c-common.c (c_unsafe_for_reeval): New function. diff --git a/gcc/config.gcc b/gcc/config.gcc index 63eaa8c7982..21db142a32e 100644 --- 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 f9d5cd8baab..f8859a392e8 100644 --- 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. -- 2.11.4.GIT