[AArch64] Add xgene2.

Conflicts:
	gas/doc/c-aarch64.texi

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 915264c..1d4553c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 2014-11-17  Philipp Tomsich  <philipp.tomsich@theobroma-systems.com>
 
+       * config/tc-aarch64.c (aarch64_cpus): Add "xgene2".
+       * doc/c-aarch64.texi: Document it.
+
+2014-11-17  Philipp Tomsich  <philipp.tomsich@theobroma-systems.com>
+
        * config/tc-aarch64.c (aarch64_cpus): Add "xgene1".
        * doc/c-aarch64.texi: Rename xgene-1 to xgene1.
 

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 0d1d73a..0e58764 100644 (file)
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -7189,6 +7189,8 @@ static const struct aarch64_cpu_option_table aarch64_cpus[] = {
      tools.  */
   {"xgene-1", AARCH64_ARCH_V8, "APM X-Gene 1"},
   {"xgene1", AARCH64_ARCH_V8, "APM X-Gene 1"},
+  {"xgene2", AARCH64_FEATURE(AARCH64_ARCH_V8,
+                            AARCH64_FEATURE_CRC), "APM X-Gene 2"},
   {"generic", AARCH64_ARCH_V8, NULL},
 
   /* These two are example CPUs supported in GCC, once we have real

diff --git a/gas/doc/c-aarch64.texi b/gas/doc/c-aarch64.texi
index b4c0a10..8fbae06 100644 (file)
--- a/gas/doc/c-aarch64.texi
+++ b/gas/doc/c-aarch64.texi
@@ -57,8 +57,9 @@ message if an attempt is made to assemble an instruction which will not execute
 on the target processor.  The following processor names are recognized:
 @code{cortex-a53},
 @code{cortex-a57},
+@code{xgene1},
 and
-@code{xgene1}.
+@code{xgene2}.
 The special name @code{all} may be used to allow the assembler to accept
 instructions valid for any supported processor, including all optional
 extensions.