summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/arm/driver-arm.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6e5eefdbc60..d911f6f9060 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2017-06-08 Richard Earnshaw <rearnsha@arm.com>
+ * config/arm/driver-arm.c (arm_cpu_table): Use fp-capable product names
+ for armv6 ARM CPU IDs.
+
+2017-06-08 Richard Earnshaw <rearnsha@arm.com>
+
* common/config/arm/arm-common.c: Include <algorithm>.
(INCLUDE_VECTOR): Define.
(compare_opt_names): New function.
diff --git a/gcc/config/arm/driver-arm.c b/gcc/config/arm/driver-arm.c
index 5c29b94caab..86212315f13 100644
--- a/gcc/config/arm/driver-arm.c
+++ b/gcc/config/arm/driver-arm.c
@@ -33,12 +33,12 @@ static struct vendor_cpu arm_cpu_table[] = {
{"0x926", "armv5te", "arm926ej-s"},
{"0xa26", "armv5te", "arm1026ej-s"},
{"0xb02", "armv6k", "mpcore"},
- {"0xb36", "armv6j", "arm1136j-s"},
- {"0xb56", "armv6t2", "arm1156t2-s"},
+ {"0xb36", "armv6j", "arm1136jf-s"},
+ {"0xb56", "armv6t2", "arm1156t2f-s"},
/* armv6kz is the correct spelling for ARMv6KZ but may not be supported in
the version of binutils used. The incorrect spelling is supported in
legacy and current binutils so that is used instead. */
- {"0xb76", "armv6zk", "arm1176jz-s"},
+ {"0xb76", "armv6zk", "arm1176jzf-s"},
{"0xc05", "armv7-a", "cortex-a5"},
{"0xc07", "armv7ve", "cortex-a7"},
{"0xc08", "armv7-a", "cortex-a8"},