Jie Zhang <jie@codesourcery.com>

    Julian Brown  <julian@codesourcery.com>

    gas/
    * config/tc-arm.c (parse_shifter_operand): Fix handling
    of explicit rotation.
    (encode_arm_shifter_operand): Likewise.

    gas/testsuite/
    * gas/arm/adrl.d: Adjust.
    * gas/arm/immed2.d: New test.
    * gas/arm/immed2.s: New test.

    ld/testsuite/
    * ld-arm/cortex-a8-fix-b-plt.d: Adjust.
    * ld-arm/cortex-a8-fix-bcc-plt.d: Adjust.
    * ld-arm/cortex-a8-fix-bl-plt.d: Adjust.
    * ld-arm/cortex-a8-fix-bl-rel-plt.d: Adjust.
    * ld-arm/cortex-a8-fix-blx-plt.d: Adjust.
    * ld-arm/ifunc-1.dd: Adjust.
    * ld-arm/ifunc-2.dd: Adjust.
    * ld-arm/ifunc-3.dd: Adjust.
    * ld-arm/ifunc-4.dd: Adjust.
    * ld-arm/ifunc-5.dd: Adjust.
    * ld-arm/ifunc-6.dd: Adjust.
    * ld-arm/ifunc-7.dd: Adjust.
    * ld-arm/ifunc-8.dd: Adjust.
    * ld-arm/ifunc-9.dd: Adjust.
    * ld-arm/ifunc-10.dd: Adjust.
    * ld-arm/ifunc-14.dd: Adjust.
    * ld-arm/ifunc-15.dd: Adjust.
    * ld-arm/ifunc-16.dd: Adjust.

    opcodes/
    * arm-dis.c (print_insn_arm): Explicitly specify rotation
    if needed.

1 files changed, 24 insertions, 24 deletions

diff --git a/ld/testsuite/ld-arm/ifunc-4.dd b/ld/testsuite/ld-arm/ifunc-4.dd
index afac39780a..f5a4d9190b 100644
--- a/ld/testsuite/ld-arm/ifunc-4.dd
+++ b/ld/testsuite/ld-arm/ifunc-4.dd
@@ -21,7 +21,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ atf2's .plt entry
 #------------------------------------------------------------------------------
-    9018:	e28fc600 	add	ip, pc, #0
+    9018:	e28fc600 	add	ip, pc, #0, 12
     901c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9020:	e5bcffec 	ldr	pc, \[ip, #4076\]!	; 0xfec
 #------------------------------------------------------------------------------
@@ -32,7 +32,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ ttf2's .plt entry
 #------------------------------------------------------------------------------
-    9028:	e28fc600 	add	ip, pc, #0
+    9028:	e28fc600 	add	ip, pc, #0, 12
     902c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9030:	e5bcffe0 	ldr	pc, \[ip, #4064\]!	; 0xfe0
 #------------------------------------------------------------------------------
@@ -43,19 +43,19 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ tbf2's .plt entry
 #------------------------------------------------------------------------------
-    9038:	e28fc600 	add	ip, pc, #0
+    9038:	e28fc600 	add	ip, pc, #0, 12
     903c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9040:	e5bcffd4 	ldr	pc, \[ip, #4052\]!	; 0xfd4
 #------------------------------------------------------------------------------
 #------ taf2's .plt entry
 #------------------------------------------------------------------------------
-    9044:	e28fc600 	add	ip, pc, #0
+    9044:	e28fc600 	add	ip, pc, #0, 12
     9048:	e28cca07 	add	ip, ip, #28672	; 0x7000
     904c:	e5bcffcc 	ldr	pc, \[ip, #4044\]!	; 0xfcc
 #------------------------------------------------------------------------------
 #------ aaf2's .plt entry
 #------------------------------------------------------------------------------
-    9050:	e28fc600 	add	ip, pc, #0
+    9050:	e28fc600 	add	ip, pc, #0, 12
     9054:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9058:	e5bcffc4 	ldr	pc, \[ip, #4036\]!	; 0xfc4
 #------------------------------------------------------------------------------
@@ -66,7 +66,7 @@ Disassembly of section \.plt:
 #------------------------------------------------------------------------------
 #------ abf2's .plt entry
 #------------------------------------------------------------------------------
-    9060:	e28fc600 	add	ip, pc, #0
+    9060:	e28fc600 	add	ip, pc, #0, 12
     9064:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9068:	e5bcffb8 	ldr	pc, \[ip, #4024\]!	; 0xfb8
 
@@ -76,7 +76,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ aaf1's .iplt entry
 #------------------------------------------------------------------------------
-    906c:	e28fc600 	add	ip, pc, #0
+    906c:	e28fc600 	add	ip, pc, #0, 12
     9070:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9074:	e5bcffb0 	ldr	pc, \[ip, #4016\]!	; 0xfb0
 #------------------------------------------------------------------------------
@@ -87,7 +87,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf1's .iplt entry
 #------------------------------------------------------------------------------
-    907c:	e28fc600 	add	ip, pc, #0
+    907c:	e28fc600 	add	ip, pc, #0, 12
     9080:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9084:	e5bcffa4 	ldr	pc, \[ip, #4004\]!	; 0xfa4
 #------------------------------------------------------------------------------
@@ -98,13 +98,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf1's .iplt entry
 #------------------------------------------------------------------------------
-    908c:	e28fc600 	add	ip, pc, #0
+    908c:	e28fc600 	add	ip, pc, #0, 12
     9090:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9094:	e5bcff98 	ldr	pc, \[ip, #3992\]!	; 0xf98
 #------------------------------------------------------------------------------
 #------ taf1's .iplt entry
 #------------------------------------------------------------------------------
-    9098:	e28fc600 	add	ip, pc, #0
+    9098:	e28fc600 	add	ip, pc, #0, 12
     909c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90a0:	e5bcff90 	ldr	pc, \[ip, #3984\]!	; 0xf90
 #------------------------------------------------------------------------------
@@ -115,7 +115,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf1's .iplt entry
 #------------------------------------------------------------------------------
-    90a8:	e28fc600 	add	ip, pc, #0
+    90a8:	e28fc600 	add	ip, pc, #0, 12
     90ac:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90b0:	e5bcff84 	ldr	pc, \[ip, #3972\]!	; 0xf84
 #------------------------------------------------------------------------------
@@ -126,13 +126,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf1's .iplt entry
 #------------------------------------------------------------------------------
-    90b8:	e28fc600 	add	ip, pc, #0
+    90b8:	e28fc600 	add	ip, pc, #0, 12
     90bc:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90c0:	e5bcff78 	ldr	pc, \[ip, #3960\]!	; 0xf78
 #------------------------------------------------------------------------------
 #------ aaf4's .iplt entry
 #------------------------------------------------------------------------------
-    90c4:	e28fc600 	add	ip, pc, #0
+    90c4:	e28fc600 	add	ip, pc, #0, 12
     90c8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90cc:	e5bcff70 	ldr	pc, \[ip, #3952\]!	; 0xf70
 #------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf3's .iplt entry
 #------------------------------------------------------------------------------
-    90d4:	e28fc600 	add	ip, pc, #0
+    90d4:	e28fc600 	add	ip, pc, #0, 12
     90d8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90dc:	e5bcff64 	ldr	pc, \[ip, #3940\]!	; 0xf64
 #------------------------------------------------------------------------------
@@ -154,7 +154,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf3's .iplt entry
 #------------------------------------------------------------------------------
-    90e4:	e28fc600 	add	ip, pc, #0
+    90e4:	e28fc600 	add	ip, pc, #0, 12
     90e8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90ec:	e5bcff58 	ldr	pc, \[ip, #3928\]!	; 0xf58
 #------------------------------------------------------------------------------
@@ -165,7 +165,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf3's .iplt entry
 #------------------------------------------------------------------------------
-    90f4:	e28fc600 	add	ip, pc, #0
+    90f4:	e28fc600 	add	ip, pc, #0, 12
     90f8:	e28cca07 	add	ip, ip, #28672	; 0x7000
     90fc:	e5bcff4c 	ldr	pc, \[ip, #3916\]!	; 0xf4c
 #------------------------------------------------------------------------------
@@ -176,13 +176,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf3's .iplt entry
 #------------------------------------------------------------------------------
-    9104:	e28fc600 	add	ip, pc, #0
+    9104:	e28fc600 	add	ip, pc, #0, 12
     9108:	e28cca07 	add	ip, ip, #28672	; 0x7000
     910c:	e5bcff40 	ldr	pc, \[ip, #3904\]!	; 0xf40
 #------------------------------------------------------------------------------
 #------ taf3's .iplt entry
 #------------------------------------------------------------------------------
-    9110:	e28fc600 	add	ip, pc, #0
+    9110:	e28fc600 	add	ip, pc, #0, 12
     9114:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9118:	e5bcff38 	ldr	pc, \[ip, #3896\]!	; 0xf38
 #------------------------------------------------------------------------------
@@ -193,7 +193,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ abf4's .iplt entry
 #------------------------------------------------------------------------------
-    9120:	e28fc600 	add	ip, pc, #0
+    9120:	e28fc600 	add	ip, pc, #0, 12
     9124:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9128:	e5bcff2c 	ldr	pc, \[ip, #3884\]!	; 0xf2c
 #------------------------------------------------------------------------------
@@ -204,7 +204,7 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ tbf4's .iplt entry
 #------------------------------------------------------------------------------
-    9130:	e28fc600 	add	ip, pc, #0
+    9130:	e28fc600 	add	ip, pc, #0, 12
     9134:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9138:	e5bcff20 	ldr	pc, \[ip, #3872\]!	; 0xf20
 #------------------------------------------------------------------------------
@@ -215,13 +215,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ ttf4's .iplt entry
 #------------------------------------------------------------------------------
-    9140:	e28fc600 	add	ip, pc, #0
+    9140:	e28fc600 	add	ip, pc, #0, 12
     9144:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9148:	e5bcff14 	ldr	pc, \[ip, #3860\]!	; 0xf14
 #------------------------------------------------------------------------------
 #------ aaf3's .iplt entry
 #------------------------------------------------------------------------------
-    914c:	e28fc600 	add	ip, pc, #0
+    914c:	e28fc600 	add	ip, pc, #0, 12
     9150:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9154:	e5bcff0c 	ldr	pc, \[ip, #3852\]!	; 0xf0c
 #------------------------------------------------------------------------------
@@ -232,13 +232,13 @@ Disassembly of section \.iplt:
 #------------------------------------------------------------------------------
 #------ atf4's .iplt entry
 #------------------------------------------------------------------------------
-    915c:	e28fc600 	add	ip, pc, #0
+    915c:	e28fc600 	add	ip, pc, #0, 12
     9160:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9164:	e5bcff00 	ldr	pc, \[ip, #3840\]!	; 0xf00
 #------------------------------------------------------------------------------
 #------ taf4's .iplt entry
 #------------------------------------------------------------------------------
-    9168:	e28fc600 	add	ip, pc, #0
+    9168:	e28fc600 	add	ip, pc, #0, 12
     916c:	e28cca07 	add	ip, ip, #28672	; 0x7000
     9170:	e5bcfef8 	ldr	pc, \[ip, #3832\]!	; 0xef8