[AARCH64] Remove Load/Store register (unscaled immediate) alias.

opcodes/ChangeLog:

2015-03-10  Renlin Li  <renlin.li@arm.com>

	* aarch64-tbl.h (aarch64_opcode_table): Remove strub, ldurb, ldursb,
         stur, ldur, sturh, ldurh, ldursh, ldursw, prfum F_HAS_ALIAS flag and
         related alias.
	* aarch64-asm-2.c: Regenerate.
	* aarch64-dis-2.c: Likewise.
	* aarch64-opc-2.c: Likewise.

gas/testsuite/ChangeLog:

2015-03-10  Renlin Li  <renlin.li@arm.com>

	* gas/aarch64/ldst-reg-uns-imm.d: Adjust expected output.
	* gas/aarch64/ldst-reg-unscaled-imm.d: Likewise.
	* gas/aarch64/reloc-insn.d: Likewise.

4 files changed, 204 insertions, 200 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 004c642..25f560a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,4 +1,8 @@
-2015-03-10  Matthew Wahab  <matthew.wahab@arm.com>
+2015-03-10  Renlin Li  <renlin.li@arm.com>
+
+	* gas/aarch64/ldst-reg-uns-imm.d: Adjust expected output.
+	* gas/aarch64/ldst-reg-unscaled-imm.d: Likewise.
+	* gas/aarch64/reloc-insn.d: Likewise.2015-03-10  Matthew Wahab  <matthew.wahab@arm.com>
 
 	* gas/aarch64/codealign.d: Add test for code section alignment.
 	* gas/aarch64/codealign.s: New file.
diff --git a/gas/testsuite/gas/aarch64/ldst-reg-uns-imm.d b/gas/testsuite/gas/aarch64/ldst-reg-uns-imm.d
index caaea07..be9fd60 100644
--- a/gas/testsuite/gas/aarch64/ldst-reg-uns-imm.d
+++ b/gas/testsuite/gas/aarch64/ldst-reg-uns-imm.d
@@ -5,8 +5,8 @@
 Disassembly of section \.text:
 
 0000000000000000 <.*>:
-   0:	3c1003e7 	str	b7, \[sp,#-256\]
-   4:	3c1553e7 	str	b7, \[sp,#-171\]
+   0:	3c1003e7 	stur	b7, \[sp,#-256\]
+   4:	3c1553e7 	stur	b7, \[sp,#-171\]
    8:	3d0003e7 	str	b7, \[sp\]
    c:	3d0003e7 	str	b7, \[sp\]
   10:	3d000be7 	str	b7, \[sp,#2\]
@@ -16,52 +16,52 @@ Disassembly of section \.text:
   20:	3d0157e7 	str	b7, \[sp,#85\]
   24:	3d03ffe7 	str	b7, \[sp,#255\]
   28:	3d3fffe7 	str	b7, \[sp,#4095\]
-  2c:	7c1003e7 	str	h7, \[sp,#-256\]
-  30:	7c1553e7 	str	h7, \[sp,#-171\]
+  2c:	7c1003e7 	stur	h7, \[sp,#-256\]
+  30:	7c1553e7 	stur	h7, \[sp,#-171\]
   34:	7d0003e7 	str	h7, \[sp\]
   38:	7d0003e7 	str	h7, \[sp\]
   3c:	7d0007e7 	str	h7, \[sp,#2\]
   40:	7d000be7 	str	h7, \[sp,#4\]
   44:	7d0013e7 	str	h7, \[sp,#8\]
   48:	7d0023e7 	str	h7, \[sp,#16\]
-  4c:	7c0553e7 	str	h7, \[sp,#85\]
-  50:	7c0ff3e7 	str	h7, \[sp,#255\]
+  4c:	7c0553e7 	stur	h7, \[sp,#85\]
+  50:	7c0ff3e7 	stur	h7, \[sp,#255\]
   54:	7d3fffe7 	str	h7, \[sp,#8190\]
-  58:	bc1003e7 	str	s7, \[sp,#-256\]
-  5c:	bc1553e7 	str	s7, \[sp,#-171\]
+  58:	bc1003e7 	stur	s7, \[sp,#-256\]
+  5c:	bc1553e7 	stur	s7, \[sp,#-171\]
   60:	bd0003e7 	str	s7, \[sp\]
   64:	bd0003e7 	str	s7, \[sp\]
-  68:	bc0023e7 	str	s7, \[sp,#2\]
+  68:	bc0023e7 	stur	s7, \[sp,#2\]
   6c:	bd0007e7 	str	s7, \[sp,#4\]
   70:	bd000be7 	str	s7, \[sp,#8\]
   74:	bd0013e7 	str	s7, \[sp,#16\]
-  78:	bc0553e7 	str	s7, \[sp,#85\]
-  7c:	bc0ff3e7 	str	s7, \[sp,#255\]
+  78:	bc0553e7 	stur	s7, \[sp,#85\]
+  7c:	bc0ff3e7 	stur	s7, \[sp,#255\]
   80:	bd3fffe7 	str	s7, \[sp,#16380\]
-  84:	fc1003e7 	str	d7, \[sp,#-256\]
-  88:	fc1553e7 	str	d7, \[sp,#-171\]
+  84:	fc1003e7 	stur	d7, \[sp,#-256\]
+  88:	fc1553e7 	stur	d7, \[sp,#-171\]
   8c:	fd0003e7 	str	d7, \[sp\]
   90:	fd0003e7 	str	d7, \[sp\]
-  94:	fc0023e7 	str	d7, \[sp,#2\]
-  98:	fc0043e7 	str	d7, \[sp,#4\]
+  94:	fc0023e7 	stur	d7, \[sp,#2\]
+  98:	fc0043e7 	stur	d7, \[sp,#4\]
   9c:	fd0007e7 	str	d7, \[sp,#8\]
   a0:	fd000be7 	str	d7, \[sp,#16\]
-  a4:	fc0553e7 	str	d7, \[sp,#85\]
-  a8:	fc0ff3e7 	str	d7, \[sp,#255\]
+  a4:	fc0553e7 	stur	d7, \[sp,#85\]
+  a8:	fc0ff3e7 	stur	d7, \[sp,#255\]
   ac:	fd3fffe7 	str	d7, \[sp,#32760\]
-  b0:	3c9003e7 	str	q7, \[sp,#-256\]
-  b4:	3c9553e7 	str	q7, \[sp,#-171\]
+  b0:	3c9003e7 	stur	q7, \[sp,#-256\]
+  b4:	3c9553e7 	stur	q7, \[sp,#-171\]
   b8:	3d8003e7 	str	q7, \[sp\]
   bc:	3d8003e7 	str	q7, \[sp\]
-  c0:	3c8023e7 	str	q7, \[sp,#2\]
-  c4:	3c8043e7 	str	q7, \[sp,#4\]
-  c8:	3c8083e7 	str	q7, \[sp,#8\]
+  c0:	3c8023e7 	stur	q7, \[sp,#2\]
+  c4:	3c8043e7 	stur	q7, \[sp,#4\]
+  c8:	3c8083e7 	stur	q7, \[sp,#8\]
   cc:	3d8007e7 	str	q7, \[sp,#16\]
-  d0:	3c8553e7 	str	q7, \[sp,#85\]
-  d4:	3c8ff3e7 	str	q7, \[sp,#255\]
+  d0:	3c8553e7 	stur	q7, \[sp,#85\]
+  d4:	3c8ff3e7 	stur	q7, \[sp,#255\]
   d8:	3dbfffe7 	str	q7, \[sp,#65520\]
-  dc:	3c5003e7 	ldr	b7, \[sp,#-256\]
-  e0:	3c5553e7 	ldr	b7, \[sp,#-171\]
+  dc:	3c5003e7 	ldur	b7, \[sp,#-256\]
+  e0:	3c5553e7 	ldur	b7, \[sp,#-171\]
   e4:	3d4003e7 	ldr	b7, \[sp\]
   e8:	3d4003e7 	ldr	b7, \[sp\]
   ec:	3d400be7 	ldr	b7, \[sp,#2\]
@@ -71,52 +71,52 @@ Disassembly of section \.text:
   fc:	3d4157e7 	ldr	b7, \[sp,#85\]
  100:	3d43ffe7 	ldr	b7, \[sp,#255\]
  104:	3d7fffe7 	ldr	b7, \[sp,#4095\]
- 108:	7c5003e7 	ldr	h7, \[sp,#-256\]
- 10c:	7c5553e7 	ldr	h7, \[sp,#-171\]
+ 108:	7c5003e7 	ldur	h7, \[sp,#-256\]
+ 10c:	7c5553e7 	ldur	h7, \[sp,#-171\]
  110:	7d4003e7 	ldr	h7, \[sp\]
  114:	7d4003e7 	ldr	h7, \[sp\]
  118:	7d4007e7 	ldr	h7, \[sp,#2\]
  11c:	7d400be7 	ldr	h7, \[sp,#4\]
  120:	7d4013e7 	ldr	h7, \[sp,#8\]
  124:	7d4023e7 	ldr	h7, \[sp,#16\]
- 128:	7c4553e7 	ldr	h7, \[sp,#85\]
- 12c:	7c4ff3e7 	ldr	h7, \[sp,#255\]
+ 128:	7c4553e7 	ldur	h7, \[sp,#85\]
+ 12c:	7c4ff3e7 	ldur	h7, \[sp,#255\]
  130:	7d7fffe7 	ldr	h7, \[sp,#8190\]
- 134:	bc5003e7 	ldr	s7, \[sp,#-256\]
- 138:	bc5553e7 	ldr	s7, \[sp,#-171\]
+ 134:	bc5003e7 	ldur	s7, \[sp,#-256\]
+ 138:	bc5553e7 	ldur	s7, \[sp,#-171\]
  13c:	bd4003e7 	ldr	s7, \[sp\]
  140:	bd4003e7 	ldr	s7, \[sp\]
- 144:	bc4023e7 	ldr	s7, \[sp,#2\]
+ 144:	bc4023e7 	ldur	s7, \[sp,#2\]
  148:	bd4007e7 	ldr	s7, \[sp,#4\]
  14c:	bd400be7 	ldr	s7, \[sp,#8\]
  150:	bd4013e7 	ldr	s7, \[sp,#16\]
- 154:	bc4553e7 	ldr	s7, \[sp,#85\]
- 158:	bc4ff3e7 	ldr	s7, \[sp,#255\]
+ 154:	bc4553e7 	ldur	s7, \[sp,#85\]
+ 158:	bc4ff3e7 	ldur	s7, \[sp,#255\]
  15c:	bd7fffe7 	ldr	s7, \[sp,#16380\]
- 160:	fc5003e7 	ldr	d7, \[sp,#-256\]
- 164:	fc5553e7 	ldr	d7, \[sp,#-171\]
+ 160:	fc5003e7 	ldur	d7, \[sp,#-256\]
+ 164:	fc5553e7 	ldur	d7, \[sp,#-171\]
  168:	fd4003e7 	ldr	d7, \[sp\]
  16c:	fd4003e7 	ldr	d7, \[sp\]
- 170:	fc4023e7 	ldr	d7, \[sp,#2\]
- 174:	fc4043e7 	ldr	d7, \[sp,#4\]
+ 170:	fc4023e7 	ldur	d7, \[sp,#2\]
+ 174:	fc4043e7 	ldur	d7, \[sp,#4\]
  178:	fd4007e7 	ldr	d7, \[sp,#8\]
  17c:	fd400be7 	ldr	d7, \[sp,#16\]
- 180:	fc4553e7 	ldr	d7, \[sp,#85\]
- 184:	fc4ff3e7 	ldr	d7, \[sp,#255\]
+ 180:	fc4553e7 	ldur	d7, \[sp,#85\]
+ 184:	fc4ff3e7 	ldur	d7, \[sp,#255\]
  188:	fd7fffe7 	ldr	d7, \[sp,#32760\]
- 18c:	3cd003e7 	ldr	q7, \[sp,#-256\]
- 190:	3cd553e7 	ldr	q7, \[sp,#-171\]
+ 18c:	3cd003e7 	ldur	q7, \[sp,#-256\]
+ 190:	3cd553e7 	ldur	q7, \[sp,#-171\]
  194:	3dc003e7 	ldr	q7, \[sp\]
  198:	3dc003e7 	ldr	q7, \[sp\]
- 19c:	3cc023e7 	ldr	q7, \[sp,#2\]
- 1a0:	3cc043e7 	ldr	q7, \[sp,#4\]
- 1a4:	3cc083e7 	ldr	q7, \[sp,#8\]
+ 19c:	3cc023e7 	ldur	q7, \[sp,#2\]
+ 1a0:	3cc043e7 	ldur	q7, \[sp,#4\]
+ 1a4:	3cc083e7 	ldur	q7, \[sp,#8\]
  1a8:	3dc007e7 	ldr	q7, \[sp,#16\]
- 1ac:	3cc553e7 	ldr	q7, \[sp,#85\]
- 1b0:	3ccff3e7 	ldr	q7, \[sp,#255\]
+ 1ac:	3cc553e7 	ldur	q7, \[sp,#85\]
+ 1b0:	3ccff3e7 	ldur	q7, \[sp,#255\]
  1b4:	3dffffe7 	ldr	q7, \[sp,#65520\]
- 1b8:	381003e7 	strb	w7, \[sp,#-256\]
- 1bc:	381553e7 	strb	w7, \[sp,#-171\]
+ 1b8:	381003e7 	sturb	w7, \[sp,#-256\]
+ 1bc:	381553e7 	sturb	w7, \[sp,#-171\]
  1c0:	390003e7 	strb	w7, \[sp\]
  1c4:	390003e7 	strb	w7, \[sp\]
  1c8:	39000be7 	strb	w7, \[sp,#2\]
@@ -126,41 +126,41 @@ Disassembly of section \.text:
  1d8:	390157e7 	strb	w7, \[sp,#85\]
  1dc:	3903ffe7 	strb	w7, \[sp,#255\]
  1e0:	393fffe7 	strb	w7, \[sp,#4095\]
- 1e4:	781003e7 	strh	w7, \[sp,#-256\]
- 1e8:	781553e7 	strh	w7, \[sp,#-171\]
+ 1e4:	781003e7 	sturh	w7, \[sp,#-256\]
+ 1e8:	781553e7 	sturh	w7, \[sp,#-171\]
  1ec:	790003e7 	strh	w7, \[sp\]
  1f0:	790003e7 	strh	w7, \[sp\]
  1f4:	790007e7 	strh	w7, \[sp,#2\]
  1f8:	79000be7 	strh	w7, \[sp,#4\]
  1fc:	790013e7 	strh	w7, \[sp,#8\]
  200:	790023e7 	strh	w7, \[sp,#16\]
- 204:	780553e7 	strh	w7, \[sp,#85\]
- 208:	780ff3e7 	strh	w7, \[sp,#255\]
+ 204:	780553e7 	sturh	w7, \[sp,#85\]
+ 208:	780ff3e7 	sturh	w7, \[sp,#255\]
  20c:	793fffe7 	strh	w7, \[sp,#8190\]
- 210:	b81003e7 	str	w7, \[sp,#-256\]
- 214:	b81553e7 	str	w7, \[sp,#-171\]
+ 210:	b81003e7 	stur	w7, \[sp,#-256\]
+ 214:	b81553e7 	stur	w7, \[sp,#-171\]
  218:	b90003e7 	str	w7, \[sp\]
  21c:	b90003e7 	str	w7, \[sp\]
- 220:	b80023e7 	str	w7, \[sp,#2\]
+ 220:	b80023e7 	stur	w7, \[sp,#2\]
  224:	b90007e7 	str	w7, \[sp,#4\]
  228:	b9000be7 	str	w7, \[sp,#8\]
  22c:	b90013e7 	str	w7, \[sp,#16\]
- 230:	b80553e7 	str	w7, \[sp,#85\]
- 234:	b80ff3e7 	str	w7, \[sp,#255\]
+ 230:	b80553e7 	stur	w7, \[sp,#85\]
+ 234:	b80ff3e7 	stur	w7, \[sp,#255\]
  238:	b93fffe7 	str	w7, \[sp,#16380\]
- 23c:	f81003e7 	str	x7, \[sp,#-256\]
- 240:	f81553e7 	str	x7, \[sp,#-171\]
+ 23c:	f81003e7 	stur	x7, \[sp,#-256\]
+ 240:	f81553e7 	stur	x7, \[sp,#-171\]
  244:	f90003e7 	str	x7, \[sp\]
  248:	f90003e7 	str	x7, \[sp\]
- 24c:	f80023e7 	str	x7, \[sp,#2\]
- 250:	f80043e7 	str	x7, \[sp,#4\]
+ 24c:	f80023e7 	stur	x7, \[sp,#2\]
+ 250:	f80043e7 	stur	x7, \[sp,#4\]
  254:	f90007e7 	str	x7, \[sp,#8\]
  258:	f9000be7 	str	x7, \[sp,#16\]
- 25c:	f80553e7 	str	x7, \[sp,#85\]
- 260:	f80ff3e7 	str	x7, \[sp,#255\]
+ 25c:	f80553e7 	stur	x7, \[sp,#85\]
+ 260:	f80ff3e7 	stur	x7, \[sp,#255\]
  264:	f93fffe7 	str	x7, \[sp,#32760\]
- 268:	385003e7 	ldrb	w7, \[sp,#-256\]
- 26c:	385553e7 	ldrb	w7, \[sp,#-171\]
+ 268:	385003e7 	ldurb	w7, \[sp,#-256\]
+ 26c:	385553e7 	ldurb	w7, \[sp,#-171\]
  270:	394003e7 	ldrb	w7, \[sp\]
  274:	394003e7 	ldrb	w7, \[sp\]
  278:	39400be7 	ldrb	w7, \[sp,#2\]
@@ -170,41 +170,41 @@ Disassembly of section \.text:
  288:	394157e7 	ldrb	w7, \[sp,#85\]
  28c:	3943ffe7 	ldrb	w7, \[sp,#255\]
  290:	397fffe7 	ldrb	w7, \[sp,#4095\]
- 294:	785003e7 	ldrh	w7, \[sp,#-256\]
- 298:	785553e7 	ldrh	w7, \[sp,#-171\]
+ 294:	785003e7 	ldurh	w7, \[sp,#-256\]
+ 298:	785553e7 	ldurh	w7, \[sp,#-171\]
  29c:	794003e7 	ldrh	w7, \[sp\]
  2a0:	794003e7 	ldrh	w7, \[sp\]
  2a4:	794007e7 	ldrh	w7, \[sp,#2\]
  2a8:	79400be7 	ldrh	w7, \[sp,#4\]
  2ac:	794013e7 	ldrh	w7, \[sp,#8\]
  2b0:	794023e7 	ldrh	w7, \[sp,#16\]
- 2b4:	784553e7 	ldrh	w7, \[sp,#85\]
- 2b8:	784ff3e7 	ldrh	w7, \[sp,#255\]
+ 2b4:	784553e7 	ldurh	w7, \[sp,#85\]
+ 2b8:	784ff3e7 	ldurh	w7, \[sp,#255\]
  2bc:	797fffe7 	ldrh	w7, \[sp,#8190\]
- 2c0:	b85003e7 	ldr	w7, \[sp,#-256\]
- 2c4:	b85553e7 	ldr	w7, \[sp,#-171\]
+ 2c0:	b85003e7 	ldur	w7, \[sp,#-256\]
+ 2c4:	b85553e7 	ldur	w7, \[sp,#-171\]
  2c8:	b94003e7 	ldr	w7, \[sp\]
  2cc:	b94003e7 	ldr	w7, \[sp\]
- 2d0:	b84023e7 	ldr	w7, \[sp,#2\]
+ 2d0:	b84023e7 	ldur	w7, \[sp,#2\]
  2d4:	b94007e7 	ldr	w7, \[sp,#4\]
  2d8:	b9400be7 	ldr	w7, \[sp,#8\]
  2dc:	b94013e7 	ldr	w7, \[sp,#16\]
- 2e0:	b84553e7 	ldr	w7, \[sp,#85\]
- 2e4:	b84ff3e7 	ldr	w7, \[sp,#255\]
+ 2e0:	b84553e7 	ldur	w7, \[sp,#85\]
+ 2e4:	b84ff3e7 	ldur	w7, \[sp,#255\]
  2e8:	b97fffe7 	ldr	w7, \[sp,#16380\]
- 2ec:	f85003e7 	ldr	x7, \[sp,#-256\]
- 2f0:	f85553e7 	ldr	x7, \[sp,#-171\]
+ 2ec:	f85003e7 	ldur	x7, \[sp,#-256\]
+ 2f0:	f85553e7 	ldur	x7, \[sp,#-171\]
  2f4:	f94003e7 	ldr	x7, \[sp\]
  2f8:	f94003e7 	ldr	x7, \[sp\]
- 2fc:	f84023e7 	ldr	x7, \[sp,#2\]
- 300:	f84043e7 	ldr	x7, \[sp,#4\]
+ 2fc:	f84023e7 	ldur	x7, \[sp,#2\]
+ 300:	f84043e7 	ldur	x7, \[sp,#4\]
  304:	f94007e7 	ldr	x7, \[sp,#8\]
  308:	f9400be7 	ldr	x7, \[sp,#16\]
- 30c:	f84553e7 	ldr	x7, \[sp,#85\]
- 310:	f84ff3e7 	ldr	x7, \[sp,#255\]
+ 30c:	f84553e7 	ldur	x7, \[sp,#85\]
+ 310:	f84ff3e7 	ldur	x7, \[sp,#255\]
  314:	f97fffe7 	ldr	x7, \[sp,#32760\]
- 318:	389003e7 	ldrsb	x7, \[sp,#-256\]
- 31c:	389553e7 	ldrsb	x7, \[sp,#-171\]
+ 318:	389003e7 	ldursb	x7, \[sp,#-256\]
+ 31c:	389553e7 	ldursb	x7, \[sp,#-171\]
  320:	398003e7 	ldrsb	x7, \[sp\]
  324:	398003e7 	ldrsb	x7, \[sp\]
  328:	39800be7 	ldrsb	x7, \[sp,#2\]
@@ -214,30 +214,30 @@ Disassembly of section \.text:
  338:	398157e7 	ldrsb	x7, \[sp,#85\]
  33c:	3983ffe7 	ldrsb	x7, \[sp,#255\]
  340:	39bfffe7 	ldrsb	x7, \[sp,#4095\]
- 344:	789003e7 	ldrsh	x7, \[sp,#-256\]
- 348:	789553e7 	ldrsh	x7, \[sp,#-171\]
+ 344:	789003e7 	ldursh	x7, \[sp,#-256\]
+ 348:	789553e7 	ldursh	x7, \[sp,#-171\]
  34c:	798003e7 	ldrsh	x7, \[sp\]
  350:	798003e7 	ldrsh	x7, \[sp\]
  354:	798007e7 	ldrsh	x7, \[sp,#2\]
  358:	79800be7 	ldrsh	x7, \[sp,#4\]
  35c:	798013e7 	ldrsh	x7, \[sp,#8\]
  360:	798023e7 	ldrsh	x7, \[sp,#16\]
- 364:	788553e7 	ldrsh	x7, \[sp,#85\]
- 368:	788ff3e7 	ldrsh	x7, \[sp,#255\]
+ 364:	788553e7 	ldursh	x7, \[sp,#85\]
+ 368:	788ff3e7 	ldursh	x7, \[sp,#255\]
  36c:	79bfffe7 	ldrsh	x7, \[sp,#8190\]
- 370:	b89003e7 	ldrsw	x7, \[sp,#-256\]
- 374:	b89553e7 	ldrsw	x7, \[sp,#-171\]
+ 370:	b89003e7 	ldursw	x7, \[sp,#-256\]
+ 374:	b89553e7 	ldursw	x7, \[sp,#-171\]
  378:	b98003e7 	ldrsw	x7, \[sp\]
  37c:	b98003e7 	ldrsw	x7, \[sp\]
- 380:	b88023e7 	ldrsw	x7, \[sp,#2\]
+ 380:	b88023e7 	ldursw	x7, \[sp,#2\]
  384:	b98007e7 	ldrsw	x7, \[sp,#4\]
  388:	b9800be7 	ldrsw	x7, \[sp,#8\]
  38c:	b98013e7 	ldrsw	x7, \[sp,#16\]
- 390:	b88553e7 	ldrsw	x7, \[sp,#85\]
- 394:	b88ff3e7 	ldrsw	x7, \[sp,#255\]
+ 390:	b88553e7 	ldursw	x7, \[sp,#85\]
+ 394:	b88ff3e7 	ldursw	x7, \[sp,#255\]
  398:	b9bfffe7 	ldrsw	x7, \[sp,#16380\]
- 39c:	38d003e7 	ldrsb	w7, \[sp,#-256\]
- 3a0:	38d553e7 	ldrsb	w7, \[sp,#-171\]
+ 39c:	38d003e7 	ldursb	w7, \[sp,#-256\]
+ 3a0:	38d553e7 	ldursb	w7, \[sp,#-171\]
  3a4:	39c003e7 	ldrsb	w7, \[sp\]
  3a8:	39c003e7 	ldrsb	w7, \[sp\]
  3ac:	39c00be7 	ldrsb	w7, \[sp,#2\]
@@ -247,14 +247,14 @@ Disassembly of section \.text:
  3bc:	39c157e7 	ldrsb	w7, \[sp,#85\]
  3c0:	39c3ffe7 	ldrsb	w7, \[sp,#255\]
  3c4:	39ffffe7 	ldrsb	w7, \[sp,#4095\]
- 3c8:	78d003e7 	ldrsh	w7, \[sp,#-256\]
- 3cc:	78d553e7 	ldrsh	w7, \[sp,#-171\]
+ 3c8:	78d003e7 	ldursh	w7, \[sp,#-256\]
+ 3cc:	78d553e7 	ldursh	w7, \[sp,#-171\]
  3d0:	79c003e7 	ldrsh	w7, \[sp\]
  3d4:	79c003e7 	ldrsh	w7, \[sp\]
  3d8:	79c007e7 	ldrsh	w7, \[sp,#2\]
  3dc:	79c00be7 	ldrsh	w7, \[sp,#4\]
  3e0:	79c013e7 	ldrsh	w7, \[sp,#8\]
  3e4:	79c023e7 	ldrsh	w7, \[sp,#16\]
- 3e8:	78c553e7 	ldrsh	w7, \[sp,#85\]
- 3ec:	78cff3e7 	ldrsh	w7, \[sp,#255\]
+ 3e8:	78c553e7 	ldursh	w7, \[sp,#85\]
+ 3ec:	78cff3e7 	ldursh	w7, \[sp,#255\]
  3f0:	79ffffe7 	ldrsh	w7, \[sp,#8190\]
diff --git a/gas/testsuite/gas/aarch64/ldst-reg-unscaled-imm.d b/gas/testsuite/gas/aarch64/ldst-reg-unscaled-imm.d
index 39dba7b..03358e9 100644
--- a/gas/testsuite/gas/aarch64/ldst-reg-unscaled-imm.d
+++ b/gas/testsuite/gas/aarch64/ldst-reg-unscaled-imm.d
@@ -5,8 +5,8 @@
 Disassembly of section \.text:
 
 0000000000000000 <.*>:
-   0:	3c1003e7 	str	b7, \[sp,#-256\]
-   4:	3c1553e7 	str	b7, \[sp,#-171\]
+   0:	3c1003e7 	stur	b7, \[sp,#-256\]
+   4:	3c1553e7 	stur	b7, \[sp,#-171\]
    8:	3c0003e7 	stur	b7, \[sp\]
    c:	3c0003e7 	stur	b7, \[sp\]
   10:	3c0023e7 	stur	b7, \[sp,#2\]
@@ -15,48 +15,48 @@ Disassembly of section \.text:
   1c:	3c0103e7 	stur	b7, \[sp,#16\]
   20:	3c0553e7 	stur	b7, \[sp,#85\]
   24:	3c0ff3e7 	stur	b7, \[sp,#255\]
-  28:	7c1003e7 	str	h7, \[sp,#-256\]
-  2c:	7c1553e7 	str	h7, \[sp,#-171\]
+  28:	7c1003e7 	stur	h7, \[sp,#-256\]
+  2c:	7c1553e7 	stur	h7, \[sp,#-171\]
   30:	7c0003e7 	stur	h7, \[sp\]
   34:	7c0003e7 	stur	h7, \[sp\]
   38:	7c0023e7 	stur	h7, \[sp,#2\]
   3c:	7c0043e7 	stur	h7, \[sp,#4\]
   40:	7c0083e7 	stur	h7, \[sp,#8\]
   44:	7c0103e7 	stur	h7, \[sp,#16\]
-  48:	7c0553e7 	str	h7, \[sp,#85\]
-  4c:	7c0ff3e7 	str	h7, \[sp,#255\]
-  50:	bc1003e7 	str	s7, \[sp,#-256\]
-  54:	bc1553e7 	str	s7, \[sp,#-171\]
+  48:	7c0553e7 	stur	h7, \[sp,#85\]
+  4c:	7c0ff3e7 	stur	h7, \[sp,#255\]
+  50:	bc1003e7 	stur	s7, \[sp,#-256\]
+  54:	bc1553e7 	stur	s7, \[sp,#-171\]
   58:	bc0003e7 	stur	s7, \[sp\]
   5c:	bc0003e7 	stur	s7, \[sp\]
-  60:	bc0023e7 	str	s7, \[sp,#2\]
+  60:	bc0023e7 	stur	s7, \[sp,#2\]
   64:	bc0043e7 	stur	s7, \[sp,#4\]
   68:	bc0083e7 	stur	s7, \[sp,#8\]
   6c:	bc0103e7 	stur	s7, \[sp,#16\]
-  70:	bc0553e7 	str	s7, \[sp,#85\]
-  74:	bc0ff3e7 	str	s7, \[sp,#255\]
-  78:	fc1003e7 	str	d7, \[sp,#-256\]
-  7c:	fc1553e7 	str	d7, \[sp,#-171\]
+  70:	bc0553e7 	stur	s7, \[sp,#85\]
+  74:	bc0ff3e7 	stur	s7, \[sp,#255\]
+  78:	fc1003e7 	stur	d7, \[sp,#-256\]
+  7c:	fc1553e7 	stur	d7, \[sp,#-171\]
   80:	fc0003e7 	stur	d7, \[sp\]
   84:	fc0003e7 	stur	d7, \[sp\]
-  88:	fc0023e7 	str	d7, \[sp,#2\]
-  8c:	fc0043e7 	str	d7, \[sp,#4\]
+  88:	fc0023e7 	stur	d7, \[sp,#2\]
+  8c:	fc0043e7 	stur	d7, \[sp,#4\]
   90:	fc0083e7 	stur	d7, \[sp,#8\]
   94:	fc0103e7 	stur	d7, \[sp,#16\]
-  98:	fc0553e7 	str	d7, \[sp,#85\]
-  9c:	fc0ff3e7 	str	d7, \[sp,#255\]
-  a0:	3c9003e7 	str	q7, \[sp,#-256\]
-  a4:	3c9553e7 	str	q7, \[sp,#-171\]
+  98:	fc0553e7 	stur	d7, \[sp,#85\]
+  9c:	fc0ff3e7 	stur	d7, \[sp,#255\]
+  a0:	3c9003e7 	stur	q7, \[sp,#-256\]
+  a4:	3c9553e7 	stur	q7, \[sp,#-171\]
   a8:	3c8003e7 	stur	q7, \[sp\]
   ac:	3c8003e7 	stur	q7, \[sp\]
-  b0:	3c8023e7 	str	q7, \[sp,#2\]
-  b4:	3c8043e7 	str	q7, \[sp,#4\]
-  b8:	3c8083e7 	str	q7, \[sp,#8\]
+  b0:	3c8023e7 	stur	q7, \[sp,#2\]
+  b4:	3c8043e7 	stur	q7, \[sp,#4\]
+  b8:	3c8083e7 	stur	q7, \[sp,#8\]
   bc:	3c8103e7 	stur	q7, \[sp,#16\]
-  c0:	3c8553e7 	str	q7, \[sp,#85\]
-  c4:	3c8ff3e7 	str	q7, \[sp,#255\]
-  c8:	3c5003e7 	ldr	b7, \[sp,#-256\]
-  cc:	3c5553e7 	ldr	b7, \[sp,#-171\]
+  c0:	3c8553e7 	stur	q7, \[sp,#85\]
+  c4:	3c8ff3e7 	stur	q7, \[sp,#255\]
+  c8:	3c5003e7 	ldur	b7, \[sp,#-256\]
+  cc:	3c5553e7 	ldur	b7, \[sp,#-171\]
   d0:	3c4003e7 	ldur	b7, \[sp\]
   d4:	3c4003e7 	ldur	b7, \[sp\]
   d8:	3c4023e7 	ldur	b7, \[sp,#2\]
@@ -65,48 +65,48 @@ Disassembly of section \.text:
   e4:	3c4103e7 	ldur	b7, \[sp,#16\]
   e8:	3c4553e7 	ldur	b7, \[sp,#85\]
   ec:	3c4ff3e7 	ldur	b7, \[sp,#255\]
-  f0:	7c5003e7 	ldr	h7, \[sp,#-256\]
-  f4:	7c5553e7 	ldr	h7, \[sp,#-171\]
+  f0:	7c5003e7 	ldur	h7, \[sp,#-256\]
+  f4:	7c5553e7 	ldur	h7, \[sp,#-171\]
   f8:	7c4003e7 	ldur	h7, \[sp\]
   fc:	7c4003e7 	ldur	h7, \[sp\]
  100:	7c4023e7 	ldur	h7, \[sp,#2\]
  104:	7c4043e7 	ldur	h7, \[sp,#4\]
  108:	7c4083e7 	ldur	h7, \[sp,#8\]
  10c:	7c4103e7 	ldur	h7, \[sp,#16\]
- 110:	7c4553e7 	ldr	h7, \[sp,#85\]
- 114:	7c4ff3e7 	ldr	h7, \[sp,#255\]
- 118:	bc5003e7 	ldr	s7, \[sp,#-256\]
- 11c:	bc5553e7 	ldr	s7, \[sp,#-171\]
+ 110:	7c4553e7 	ldur	h7, \[sp,#85\]
+ 114:	7c4ff3e7 	ldur	h7, \[sp,#255\]
+ 118:	bc5003e7 	ldur	s7, \[sp,#-256\]
+ 11c:	bc5553e7 	ldur	s7, \[sp,#-171\]
  120:	bc4003e7 	ldur	s7, \[sp\]
  124:	bc4003e7 	ldur	s7, \[sp\]
- 128:	bc4023e7 	ldr	s7, \[sp,#2\]
+ 128:	bc4023e7 	ldur	s7, \[sp,#2\]
  12c:	bc4043e7 	ldur	s7, \[sp,#4\]
  130:	bc4083e7 	ldur	s7, \[sp,#8\]
  134:	bc4103e7 	ldur	s7, \[sp,#16\]
- 138:	bc4553e7 	ldr	s7, \[sp,#85\]
- 13c:	bc4ff3e7 	ldr	s7, \[sp,#255\]
- 140:	fc5003e7 	ldr	d7, \[sp,#-256\]
- 144:	fc5553e7 	ldr	d7, \[sp,#-171\]
+ 138:	bc4553e7 	ldur	s7, \[sp,#85\]
+ 13c:	bc4ff3e7 	ldur	s7, \[sp,#255\]
+ 140:	fc5003e7 	ldur	d7, \[sp,#-256\]
+ 144:	fc5553e7 	ldur	d7, \[sp,#-171\]
  148:	fc4003e7 	ldur	d7, \[sp\]
  14c:	fc4003e7 	ldur	d7, \[sp\]
- 150:	fc4023e7 	ldr	d7, \[sp,#2\]
- 154:	fc4043e7 	ldr	d7, \[sp,#4\]
+ 150:	fc4023e7 	ldur	d7, \[sp,#2\]
+ 154:	fc4043e7 	ldur	d7, \[sp,#4\]
  158:	fc4083e7 	ldur	d7, \[sp,#8\]
  15c:	fc4103e7 	ldur	d7, \[sp,#16\]
- 160:	fc4553e7 	ldr	d7, \[sp,#85\]
- 164:	fc4ff3e7 	ldr	d7, \[sp,#255\]
- 168:	3cd003e7 	ldr	q7, \[sp,#-256\]
- 16c:	3cd553e7 	ldr	q7, \[sp,#-171\]
+ 160:	fc4553e7 	ldur	d7, \[sp,#85\]
+ 164:	fc4ff3e7 	ldur	d7, \[sp,#255\]
+ 168:	3cd003e7 	ldur	q7, \[sp,#-256\]
+ 16c:	3cd553e7 	ldur	q7, \[sp,#-171\]
  170:	3cc003e7 	ldur	q7, \[sp\]
  174:	3cc003e7 	ldur	q7, \[sp\]
- 178:	3cc023e7 	ldr	q7, \[sp,#2\]
- 17c:	3cc043e7 	ldr	q7, \[sp,#4\]
- 180:	3cc083e7 	ldr	q7, \[sp,#8\]
+ 178:	3cc023e7 	ldur	q7, \[sp,#2\]
+ 17c:	3cc043e7 	ldur	q7, \[sp,#4\]
+ 180:	3cc083e7 	ldur	q7, \[sp,#8\]
  184:	3cc103e7 	ldur	q7, \[sp,#16\]
- 188:	3cc553e7 	ldr	q7, \[sp,#85\]
- 18c:	3ccff3e7 	ldr	q7, \[sp,#255\]
- 190:	381003e7 	strb	w7, \[sp,#-256\]
- 194:	381553e7 	strb	w7, \[sp,#-171\]
+ 188:	3cc553e7 	ldur	q7, \[sp,#85\]
+ 18c:	3ccff3e7 	ldur	q7, \[sp,#255\]
+ 190:	381003e7 	sturb	w7, \[sp,#-256\]
+ 194:	381553e7 	sturb	w7, \[sp,#-171\]
  198:	380003e7 	sturb	w7, \[sp\]
  19c:	380003e7 	sturb	w7, \[sp\]
  1a0:	380023e7 	sturb	w7, \[sp,#2\]
@@ -115,38 +115,38 @@ Disassembly of section \.text:
  1ac:	380103e7 	sturb	w7, \[sp,#16\]
  1b0:	380553e7 	sturb	w7, \[sp,#85\]
  1b4:	380ff3e7 	sturb	w7, \[sp,#255\]
- 1b8:	781003e7 	strh	w7, \[sp,#-256\]
- 1bc:	781553e7 	strh	w7, \[sp,#-171\]
+ 1b8:	781003e7 	sturh	w7, \[sp,#-256\]
+ 1bc:	781553e7 	sturh	w7, \[sp,#-171\]
  1c0:	780003e7 	sturh	w7, \[sp\]
  1c4:	780003e7 	sturh	w7, \[sp\]
  1c8:	780023e7 	sturh	w7, \[sp,#2\]
  1cc:	780043e7 	sturh	w7, \[sp,#4\]
  1d0:	780083e7 	sturh	w7, \[sp,#8\]
  1d4:	780103e7 	sturh	w7, \[sp,#16\]
- 1d8:	780553e7 	strh	w7, \[sp,#85\]
- 1dc:	780ff3e7 	strh	w7, \[sp,#255\]
- 1e0:	b81003e7 	str	w7, \[sp,#-256\]
- 1e4:	b81553e7 	str	w7, \[sp,#-171\]
+ 1d8:	780553e7 	sturh	w7, \[sp,#85\]
+ 1dc:	780ff3e7 	sturh	w7, \[sp,#255\]
+ 1e0:	b81003e7 	stur	w7, \[sp,#-256\]
+ 1e4:	b81553e7 	stur	w7, \[sp,#-171\]
  1e8:	b80003e7 	stur	w7, \[sp\]
  1ec:	b80003e7 	stur	w7, \[sp\]
- 1f0:	b80023e7 	str	w7, \[sp,#2\]
+ 1f0:	b80023e7 	stur	w7, \[sp,#2\]
  1f4:	b80043e7 	stur	w7, \[sp,#4\]
  1f8:	b80083e7 	stur	w7, \[sp,#8\]
  1fc:	b80103e7 	stur	w7, \[sp,#16\]
- 200:	b80553e7 	str	w7, \[sp,#85\]
- 204:	b80ff3e7 	str	w7, \[sp,#255\]
- 208:	f81003e7 	str	x7, \[sp,#-256\]
- 20c:	f81553e7 	str	x7, \[sp,#-171\]
+ 200:	b80553e7 	stur	w7, \[sp,#85\]
+ 204:	b80ff3e7 	stur	w7, \[sp,#255\]
+ 208:	f81003e7 	stur	x7, \[sp,#-256\]
+ 20c:	f81553e7 	stur	x7, \[sp,#-171\]
  210:	f80003e7 	stur	x7, \[sp\]
  214:	f80003e7 	stur	x7, \[sp\]
- 218:	f80023e7 	str	x7, \[sp,#2\]
- 21c:	f80043e7 	str	x7, \[sp,#4\]
+ 218:	f80023e7 	stur	x7, \[sp,#2\]
+ 21c:	f80043e7 	stur	x7, \[sp,#4\]
  220:	f80083e7 	stur	x7, \[sp,#8\]
  224:	f80103e7 	stur	x7, \[sp,#16\]
- 228:	f80553e7 	str	x7, \[sp,#85\]
- 22c:	f80ff3e7 	str	x7, \[sp,#255\]
- 230:	385003e7 	ldrb	w7, \[sp,#-256\]
- 234:	385553e7 	ldrb	w7, \[sp,#-171\]
+ 228:	f80553e7 	stur	x7, \[sp,#85\]
+ 22c:	f80ff3e7 	stur	x7, \[sp,#255\]
+ 230:	385003e7 	ldurb	w7, \[sp,#-256\]
+ 234:	385553e7 	ldurb	w7, \[sp,#-171\]
  238:	384003e7 	ldurb	w7, \[sp\]
  23c:	384003e7 	ldurb	w7, \[sp\]
  240:	384023e7 	ldurb	w7, \[sp,#2\]
@@ -155,38 +155,38 @@ Disassembly of section \.text:
  24c:	384103e7 	ldurb	w7, \[sp,#16\]
  250:	384553e7 	ldurb	w7, \[sp,#85\]
  254:	384ff3e7 	ldurb	w7, \[sp,#255\]
- 258:	785003e7 	ldrh	w7, \[sp,#-256\]
- 25c:	785553e7 	ldrh	w7, \[sp,#-171\]
+ 258:	785003e7 	ldurh	w7, \[sp,#-256\]
+ 25c:	785553e7 	ldurh	w7, \[sp,#-171\]
  260:	784003e7 	ldurh	w7, \[sp\]
  264:	784003e7 	ldurh	w7, \[sp\]
  268:	784023e7 	ldurh	w7, \[sp,#2\]
  26c:	784043e7 	ldurh	w7, \[sp,#4\]
  270:	784083e7 	ldurh	w7, \[sp,#8\]
  274:	784103e7 	ldurh	w7, \[sp,#16\]
- 278:	784553e7 	ldrh	w7, \[sp,#85\]
- 27c:	784ff3e7 	ldrh	w7, \[sp,#255\]
- 280:	b85003e7 	ldr	w7, \[sp,#-256\]
- 284:	b85553e7 	ldr	w7, \[sp,#-171\]
+ 278:	784553e7 	ldurh	w7, \[sp,#85\]
+ 27c:	784ff3e7 	ldurh	w7, \[sp,#255\]
+ 280:	b85003e7 	ldur	w7, \[sp,#-256\]
+ 284:	b85553e7 	ldur	w7, \[sp,#-171\]
  288:	b84003e7 	ldur	w7, \[sp\]
  28c:	b84003e7 	ldur	w7, \[sp\]
- 290:	b84023e7 	ldr	w7, \[sp,#2\]
+ 290:	b84023e7 	ldur	w7, \[sp,#2\]
  294:	b84043e7 	ldur	w7, \[sp,#4\]
  298:	b84083e7 	ldur	w7, \[sp,#8\]
  29c:	b84103e7 	ldur	w7, \[sp,#16\]
- 2a0:	b84553e7 	ldr	w7, \[sp,#85\]
- 2a4:	b84ff3e7 	ldr	w7, \[sp,#255\]
- 2a8:	f85003e7 	ldr	x7, \[sp,#-256\]
- 2ac:	f85553e7 	ldr	x7, \[sp,#-171\]
+ 2a0:	b84553e7 	ldur	w7, \[sp,#85\]
+ 2a4:	b84ff3e7 	ldur	w7, \[sp,#255\]
+ 2a8:	f85003e7 	ldur	x7, \[sp,#-256\]
+ 2ac:	f85553e7 	ldur	x7, \[sp,#-171\]
  2b0:	f84003e7 	ldur	x7, \[sp\]
  2b4:	f84003e7 	ldur	x7, \[sp\]
- 2b8:	f84023e7 	ldr	x7, \[sp,#2\]
- 2bc:	f84043e7 	ldr	x7, \[sp,#4\]
+ 2b8:	f84023e7 	ldur	x7, \[sp,#2\]
+ 2bc:	f84043e7 	ldur	x7, \[sp,#4\]
  2c0:	f84083e7 	ldur	x7, \[sp,#8\]
  2c4:	f84103e7 	ldur	x7, \[sp,#16\]
- 2c8:	f84553e7 	ldr	x7, \[sp,#85\]
- 2cc:	f84ff3e7 	ldr	x7, \[sp,#255\]
- 2d0:	389003e7 	ldrsb	x7, \[sp,#-256\]
- 2d4:	389553e7 	ldrsb	x7, \[sp,#-171\]
+ 2c8:	f84553e7 	ldur	x7, \[sp,#85\]
+ 2cc:	f84ff3e7 	ldur	x7, \[sp,#255\]
+ 2d0:	389003e7 	ldursb	x7, \[sp,#-256\]
+ 2d4:	389553e7 	ldursb	x7, \[sp,#-171\]
  2d8:	388003e7 	ldursb	x7, \[sp\]
  2dc:	388003e7 	ldursb	x7, \[sp\]
  2e0:	388023e7 	ldursb	x7, \[sp,#2\]
@@ -195,28 +195,28 @@ Disassembly of section \.text:
  2ec:	388103e7 	ldursb	x7, \[sp,#16\]
  2f0:	388553e7 	ldursb	x7, \[sp,#85\]
  2f4:	388ff3e7 	ldursb	x7, \[sp,#255\]
- 2f8:	789003e7 	ldrsh	x7, \[sp,#-256\]
- 2fc:	789553e7 	ldrsh	x7, \[sp,#-171\]
+ 2f8:	789003e7 	ldursh	x7, \[sp,#-256\]
+ 2fc:	789553e7 	ldursh	x7, \[sp,#-171\]
  300:	788003e7 	ldursh	x7, \[sp\]
  304:	788003e7 	ldursh	x7, \[sp\]
  308:	788023e7 	ldursh	x7, \[sp,#2\]
  30c:	788043e7 	ldursh	x7, \[sp,#4\]
  310:	788083e7 	ldursh	x7, \[sp,#8\]
  314:	788103e7 	ldursh	x7, \[sp,#16\]
- 318:	788553e7 	ldrsh	x7, \[sp,#85\]
- 31c:	788ff3e7 	ldrsh	x7, \[sp,#255\]
- 320:	b89003e7 	ldrsw	x7, \[sp,#-256\]
- 324:	b89553e7 	ldrsw	x7, \[sp,#-171\]
+ 318:	788553e7 	ldursh	x7, \[sp,#85\]
+ 31c:	788ff3e7 	ldursh	x7, \[sp,#255\]
+ 320:	b89003e7 	ldursw	x7, \[sp,#-256\]
+ 324:	b89553e7 	ldursw	x7, \[sp,#-171\]
  328:	b88003e7 	ldursw	x7, \[sp\]
  32c:	b88003e7 	ldursw	x7, \[sp\]
- 330:	b88023e7 	ldrsw	x7, \[sp,#2\]
+ 330:	b88023e7 	ldursw	x7, \[sp,#2\]
  334:	b88043e7 	ldursw	x7, \[sp,#4\]
  338:	b88083e7 	ldursw	x7, \[sp,#8\]
  33c:	b88103e7 	ldursw	x7, \[sp,#16\]
- 340:	b88553e7 	ldrsw	x7, \[sp,#85\]
- 344:	b88ff3e7 	ldrsw	x7, \[sp,#255\]
- 348:	38d003e7 	ldrsb	w7, \[sp,#-256\]
- 34c:	38d553e7 	ldrsb	w7, \[sp,#-171\]
+ 340:	b88553e7 	ldursw	x7, \[sp,#85\]
+ 344:	b88ff3e7 	ldursw	x7, \[sp,#255\]
+ 348:	38d003e7 	ldursb	w7, \[sp,#-256\]
+ 34c:	38d553e7 	ldursb	w7, \[sp,#-171\]
  350:	38c003e7 	ldursb	w7, \[sp\]
  354:	38c003e7 	ldursb	w7, \[sp\]
  358:	38c023e7 	ldursb	w7, \[sp,#2\]
@@ -225,13 +225,13 @@ Disassembly of section \.text:
  364:	38c103e7 	ldursb	w7, \[sp,#16\]
  368:	38c553e7 	ldursb	w7, \[sp,#85\]
  36c:	38cff3e7 	ldursb	w7, \[sp,#255\]
- 370:	78d003e7 	ldrsh	w7, \[sp,#-256\]
- 374:	78d553e7 	ldrsh	w7, \[sp,#-171\]
+ 370:	78d003e7 	ldursh	w7, \[sp,#-256\]
+ 374:	78d553e7 	ldursh	w7, \[sp,#-171\]
  378:	78c003e7 	ldursh	w7, \[sp\]
  37c:	78c003e7 	ldursh	w7, \[sp\]
  380:	78c023e7 	ldursh	w7, \[sp,#2\]
  384:	78c043e7 	ldursh	w7, \[sp,#4\]
  388:	78c083e7 	ldursh	w7, \[sp,#8\]
  38c:	78c103e7 	ldursh	w7, \[sp,#16\]
- 390:	78c553e7 	ldrsh	w7, \[sp,#85\]
- 394:	78cff3e7 	ldrsh	w7, \[sp,#255\]
+ 390:	78c553e7 	ldursh	w7, \[sp,#85\]
+ 394:	78cff3e7 	ldursh	w7, \[sp,#255\]
diff --git a/gas/testsuite/gas/aarch64/reloc-insn.d b/gas/testsuite/gas/aarch64/reloc-insn.d
index afcccc7..a9aa097 100644
--- a/gas/testsuite/gas/aarch64/reloc-insn.d
+++ b/gas/testsuite/gas/aarch64/reloc-insn.d
@@ -139,7 +139,7 @@ Disassembly of section \.text:
  160:	d41fffe1 	svc	#0xffff
  164:	f8500420 	ldr	x0, \[x1\],#-256
  168:	f8500c20 	ldr	x0, \[x1,#-256\]!
- 16c:	f8500020 	ldr	x0, \[x1,#-256\]
+ 16c:	f8500020 	ldur	x0, \[x1,#-256\]
  170:	f97ffc20 	ldr	x0, \[x1,#32760\]
  174:	79400000 	ldrh	w0, \[x0\]
 			174: R_AARCH64_LDST16_ABS_LO12_NC	\.text\+0x194