[AArch64] Enable CRC feature in GAS for cortex-a53 and cortex-a57.

Conflicts:
	gas/config/tc-aarch64.c

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ecbac5f36307b57d9630ec4654ca72b86596e2ed..27c3f76c8bc33a5c08f391037f2bd2dad039a67e 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-13  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+       Apply trunk patch:
+       * config/tc-aarch64.c (aarch64_cpus): Add CRC feature for
+       cortex-A53 and cortex-A57.
+
 2014-11-12  Alan Modra  <amodra@gmail.com>
 
        PR ld/17482

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 150949cc685007464874658cc7942ebe2560e47c..c0153bcffd692a03333fe5873e7ca49ed29a443a 100644 (file)
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -7180,8 +7180,11 @@ struct aarch64_cpu_option_table
    recognized by GCC.  */
 static const struct aarch64_cpu_option_table aarch64_cpus[] = {
   {"all", AARCH64_ANY, NULL},
-  {"cortex-a53",       AARCH64_ARCH_V8, "Cortex-A53"},
-  {"cortex-a57",       AARCH64_ARCH_V8, "Cortex-A57"},
+  {"cortex-a53", AARCH64_FEATURE(AARCH64_ARCH_V8,
+                                AARCH64_FEATURE_CRC), "Cortex-A53"},
+  {"cortex-a57", AARCH64_FEATURE(AARCH64_ARCH_V8,
+                                AARCH64_FEATURE_CRC), "Cortex-A57"},
+  {"thunderx", AARCH64_ARCH_V8, "Cavium ThunderX"},
   {"xgene-1", AARCH64_ARCH_V8, "APM X-Gene 1"},
   {"generic", AARCH64_ARCH_V8, NULL},