[AArch64] Add xgene1.

The name xgene1 superceeds xgene-1.  We retain support for the
original xgene-1 for compatibility but drop it from documentation.

Conflicts:
	gas/config/tc-aarch64.c

diff --git a/gas/ChangeLog b/gas/ChangeLog
index bc39ebc8044c47be4cb3e3c2ae54661d49952b7c..915264c8f4739c38c50513b02a644f8ff22f42f5 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2014-11-18  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
        Apply trunk patch:

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 14610574474fa5220dce36856a306d4494d2f254..0d1d73ae76dce916e39b34ad5c58720aad0990a7 100644 (file)
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -7184,7 +7184,11 @@ static const struct aarch64_cpu_option_table aarch64_cpus[] = {
                                 AARCH64_FEATURE_CRC), "Cortex-A53"},
   {"cortex-a57", AARCH64_FEATURE(AARCH64_ARCH_V8,
                                 AARCH64_FEATURE_CRC), "Cortex-A57"},
+  /* The 'xgene-1' name is an older name for 'xgene1', which was used
+     in earlier releases and is superseded by 'xgene1' in all
+     tools.  */
   {"xgene-1", AARCH64_ARCH_V8, "APM X-Gene 1"},
+  {"xgene1", AARCH64_ARCH_V8, "APM X-Gene 1"},
   {"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 1f4ce4cc8542ac280c95a693b69fef2e1e2e7c63..b4c0a10c4608c3b67548540764c6c4ee79308aee 100644 (file)
--- a/gas/doc/c-aarch64.texi
+++ b/gas/doc/c-aarch64.texi
@@ -58,7 +58,7 @@ on the target processor.  The following processor names are recognized:
 @code{cortex-a53},
 @code{cortex-a57},
 and
-@code{xgene-1}.
+@code{xgene1}.
 The special name @code{all} may be used to allow the assembler to accept
 instructions valid for any supported processor, including all optional
 extensions.