Add support for AArch64 system register names IP0, IP1, FP and LR.

	* config/tc-aarch64.c (reg_entry_reg_names): Add IP0,
	IP1, FP, and LR as register aliases of register 16, 17, 29
	and 30 respectively.
	* testsuite/gas/aarch64/diagnostic.l: Remove diagnostic
	prohibiting register 'lr' which is now an alias.
	* testsuite/gas/aarch64/diagnostic.s: Remove instruction
	utilizing register 'lr' which is now an alias.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d77052aaa36fd89a54ae6cb5a5a7ee43b166ba5f..a1853a4711069fa5145d1926c97ddfb9814f33e3 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2017-06-07  Michael Collison  <michael.collison@arm.com>
+
+       * config/tc-aarch64.c (reg_entry_reg_names): Add IP0,
+       IP1, FP, and LR as register aliases of register 16, 17, 29
+       and 30 respectively.
+       * testsuite/gas/aarch64/diagnostic.l: Remove diagnostic
+       prohibiting register 'lr' which is now an alias.
+       * testsuite/gas/aarch64/diagnostic.s: Remove instruction
+       utilizing register 'lr' which is now an alias.
+
 2017-06-06  Jiong Wang  <jiong.wang@arm.com>
 
        * config/tc-arm.c (reject_bad_reg): Allow REG_SP on ARMv8-A.

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index cdb2903521b5d242d0ff2a9bdd4a9277a9a23ebc..be01bdd1432b9eda741b781dbd275aecc40144bc 100644 (file)
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -6797,6 +6797,11 @@ static const reg_entry reg_names[] = {
   REGDEF (wzr, 31, Z_32), REGDEF (WZR, 31, Z_32),
   REGDEF (xzr, 31, Z_64), REGDEF (XZR, 31, Z_64),
 
+  REGDEF (ip0, 16, R_64), REGDEF (IP0, 16, R_64),
+  REGDEF (ip1, 17, R_64), REGDEF (IP1, 17, R_64),
+  REGDEF (fp, 29, R_64), REGDEF (FP, 29, R_64),
+  REGDEF (lr, 30, R_64), REGDEF (LR, 30, R_64),
+
   /* Floating-point single precision registers.  */
   REGSET (s, FP_S), REGSET (S, FP_S),
 

diff --git a/gas/testsuite/gas/aarch64/diagnostic.l b/gas/testsuite/gas/aarch64/diagnostic.l
index 6a2563e606d22e5debe6ab7281f344dd90d8c006..b749d2edfed97f39eedc239e0234f67cfdbfbec8 100644 (file)
--- a/gas/testsuite/gas/aarch64/diagnostic.l
+++ b/gas/testsuite/gas/aarch64/diagnostic.l
@@ -98,7 +98,6 @@
 [^:]*:100: Error: operand 3 must be one of the standard conditions, excluding AL and NV. -- `cinc w0,w1,nv'
 [^:]*:101: Error: operand 2 must be one of the standard conditions, excluding AL and NV. -- `cset w0,al'
 [^:]*:102: Error: operand 2 must be one of the standard conditions, excluding AL and NV. -- `cset w0,nv'
-[^:]*:105: Error: operand 1 must be an integer register -- `ret lr'
 [^:]*:106: Error: operand 1 must be an integer register -- `ret kk'
 [^:]*:107: Error: immediate operand required at operand 1 -- `clrex x0'
 [^:]*:108: Error: immediate operand required at operand 1 -- `clrex w0'

diff --git a/gas/testsuite/gas/aarch64/diagnostic.s b/gas/testsuite/gas/aarch64/diagnostic.s
index d2b9244fa828e7a41922bb3d3b80c69a0ab9872b..09126e623e1a78625cf3221f09780bb1cac18cfe 100644 (file)
--- a/gas/testsuite/gas/aarch64/diagnostic.s
+++ b/gas/testsuite/gas/aarch64/diagnostic.s
@@ -102,7 +102,7 @@
        cset    w0, nv
 
        # test diagnostic info on optional operand
-       ret     lr
+
        ret     kk
        clrex   x0
        clrex   w0