[AArch64/PATCH 2/2 (v2)] Add 'xgene2' cpu.

[Philipp Tomsich]

---
 gas/ChangeLog           | 2 ++
 gas/config/tc-aarch64.c | 2 ++
 gas/doc/c-aarch64.texi  | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 943feb2..689679f 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -2,6 +2,8 @@
 
 	* config/tc-aarch64.c (aarch64_cpus): Rename "xgene-1" to "xgene1" to
 	sync up with other tools (as distributed in our BSP) and collateral.
+	* config/tc-aarch64.c (aarch64_cpus): Add "xgene2" (includes support
+	for the CRC instructions.
 
 2014-11-17  Ilya Tocar  <ilya.tocar@intel.com>
 
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 329d824..686a77e 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -7259,6 +7259,8 @@ static const struct aarch64_cpu_option_table aarch64_cpus[] = {
    */
   {"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},
 
   {NULL, AARCH64_ARCH_NONE, NULL}
diff --git a/gas/doc/c-aarch64.texi b/gas/doc/c-aarch64.texi
index 8e22b21..4b5c813 100644
--- a/gas/doc/c-aarch64.texi
+++ b/gas/doc/c-aarch64.texi
@@ -58,8 +58,9 @@ on the target processor.  The following processor names are recognized:
 @code{cortex-a53},
 @code{cortex-a57},
 @code{thunderx},
+@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.
-- 
1.9.1