aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/arm/arm.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8374634..d415b4d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-02 Ryan Mansfield <rmansfield@qnx.com>
+
+ * arm.c (arm_override_options): Correct fall-back code to use
+ SUBTARGET_CPU_DEFAULT.
+
2010-09-02 Julian Brown <julian@codesourcery.com>
* config/arm/neon.md (UNSPEC_VCLE, UNSPEC_VCLT): New constants for
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 88444db..440995f 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -1411,7 +1411,7 @@ arm_override_options (void)
arm_selected_cpu = &all_cores[SUBTARGET_CPU_DEFAULT];
#endif
/* Default to ARM6. */
- if (arm_selected_cpu->name)
+ if (!arm_selected_cpu->name)
arm_selected_cpu = &all_cores[arm6];
}