Update i386 tests

diff --git a/ld/testsuite/ld-i386/discarded1.d b/ld/testsuite/ld-i386/discarded1.d
index 8106db3e3c1e0cfe4c053baa13658ea3b45ae0d3..03563c62e565865b60881758f955ae928b5dfd81 100644 (file)
--- a/ld/testsuite/ld-i386/discarded1.d
+++ b/ld/testsuite/ld-i386/discarded1.d
@@ -1,3 +1,16 @@
 #as: --32
 #ld: -melf_i386 -T discarded1.t
-#error: .*discarded output section: `.got.plt'
+#objdump: --sym -dw
+
+.*: +file format .*
+
+SYMBOL TABLE:
+#...
+0+8 g     O .data      0+4 x
+#...
+
+Disassembly of section .text:
+
+0+ <_start>:
+[      ]*[a-f0-9]+:    c7 c0 08 00 00 00       mov    \$0x8,%eax
+#pass

diff --git a/ld/testsuite/ld-i386/load1-nacl.d b/ld/testsuite/ld-i386/load1-nacl.d
index 1dbba1107fc446259b21897a8ff27735ef2b532e..317d1c40543b9a8ed732720f1c905682280c90a8 100644 (file)
--- a/ld/testsuite/ld-i386/load1-nacl.d
+++ b/ld/testsuite/ld-i386/load1-nacl.d
@@ -8,52 +8,52 @@
 
 SYMBOL TABLE:
 #...
-10030080 l     O .data 0+1 bar
+10030074 l     O .data 0+1 bar
 #...
-10030081 g     O .data 0+1 foo
+10030075 g     O .data 0+1 foo
 #...
 
 Disassembly of section .text:
 
 0+20000 <_start>:
-[      ]*[a-f0-9]+:    c7 c0 80 00 03 10       mov    \$0x10030080,%eax
-[      ]*[a-f0-9]+:    81 d0 80 00 03 10       adc    \$0x10030080,%eax
-[      ]*[a-f0-9]+:    81 c3 80 00 03 10       add    \$0x10030080,%ebx
-[      ]*[a-f0-9]+:    81 e1 80 00 03 10       and    \$0x10030080,%ecx
-[      ]*[a-f0-9]+:    81 fa 80 00 03 10       cmp    \$0x10030080,%edx
-[      ]*[a-f0-9]+:    81 cf 80 00 03 10       or     \$0x10030080,%edi
-[      ]*[a-f0-9]+:    81 de 80 00 03 10       sbb    \$0x10030080,%esi
-[      ]*[a-f0-9]+:    81 ed 80 00 03 10       sub    \$0x10030080,%ebp
-[      ]*[a-f0-9]+:    81 f4 80 00 03 10       xor    \$0x10030080,%esp
-[      ]*[a-f0-9]+:    f7 c1 80 00 03 10       test   \$0x10030080,%ecx
-[      ]*[a-f0-9]+:    c7 c0 80 00 03 10       mov    \$0x10030080,%eax
-[      ]*[a-f0-9]+:    81 d0 80 00 03 10       adc    \$0x10030080,%eax
-[      ]*[a-f0-9]+:    81 c3 80 00 03 10       add    \$0x10030080,%ebx
-[      ]*[a-f0-9]+:    81 e1 80 00 03 10       and    \$0x10030080,%ecx
-[      ]*[a-f0-9]+:    81 fa 80 00 03 10       cmp    \$0x10030080,%edx
-[      ]*[a-f0-9]+:    81 cf 80 00 03 10       or     \$0x10030080,%edi
-[      ]*[a-f0-9]+:    81 de 80 00 03 10       sbb    \$0x10030080,%esi
-[      ]*[a-f0-9]+:    81 ed 80 00 03 10       sub    \$0x10030080,%ebp
-[      ]*[a-f0-9]+:    81 f4 80 00 03 10       xor    \$0x10030080,%esp
-[      ]*[a-f0-9]+:    f7 c1 80 00 03 10       test   \$0x10030080,%ecx
-[      ]*[a-f0-9]+:    c7 c0 81 00 03 10       mov    \$0x10030081,%eax
-[      ]*[a-f0-9]+:    81 d0 81 00 03 10       adc    \$0x10030081,%eax
-[      ]*[a-f0-9]+:    81 c3 81 00 03 10       add    \$0x10030081,%ebx
-[      ]*[a-f0-9]+:    81 e1 81 00 03 10       and    \$0x10030081,%ecx
-[      ]*[a-f0-9]+:    81 fa 81 00 03 10       cmp    \$0x10030081,%edx
-[      ]*[a-f0-9]+:    81 cf 81 00 03 10       or     \$0x10030081,%edi
-[      ]*[a-f0-9]+:    81 de 81 00 03 10       sbb    \$0x10030081,%esi
-[      ]*[a-f0-9]+:    81 ed 81 00 03 10       sub    \$0x10030081,%ebp
-[      ]*[a-f0-9]+:    81 f4 81 00 03 10       xor    \$0x10030081,%esp
-[      ]*[a-f0-9]+:    f7 c1 81 00 03 10       test   \$0x10030081,%ecx
-[      ]*[a-f0-9]+:    c7 c0 81 00 03 10       mov    \$0x10030081,%eax
-[      ]*[a-f0-9]+:    81 d0 81 00 03 10       adc    \$0x10030081,%eax
-[      ]*[a-f0-9]+:    81 c3 81 00 03 10       add    \$0x10030081,%ebx
-[      ]*[a-f0-9]+:    81 e1 81 00 03 10       and    \$0x10030081,%ecx
-[      ]*[a-f0-9]+:    81 fa 81 00 03 10       cmp    \$0x10030081,%edx
-[      ]*[a-f0-9]+:    81 cf 81 00 03 10       or     \$0x10030081,%edi
-[      ]*[a-f0-9]+:    81 de 81 00 03 10       sbb    \$0x10030081,%esi
-[      ]*[a-f0-9]+:    81 ed 81 00 03 10       sub    \$0x10030081,%ebp
-[      ]*[a-f0-9]+:    81 f4 81 00 03 10       xor    \$0x10030081,%esp
-[      ]*[a-f0-9]+:    f7 c1 81 00 03 10       test   \$0x10030081,%ecx
+[      ]*[a-f0-9]+:    c7 c0 74 00 03 10       mov    \$0x10030074,%eax
+[      ]*[a-f0-9]+:    81 d0 74 00 03 10       adc    \$0x10030074,%eax
+[      ]*[a-f0-9]+:    81 c3 74 00 03 10       add    \$0x10030074,%ebx
+[      ]*[a-f0-9]+:    81 e1 74 00 03 10       and    \$0x10030074,%ecx
+[      ]*[a-f0-9]+:    81 fa 74 00 03 10       cmp    \$0x10030074,%edx
+[      ]*[a-f0-9]+:    81 cf 74 00 03 10       or     \$0x10030074,%edi
+[      ]*[a-f0-9]+:    81 de 74 00 03 10       sbb    \$0x10030074,%esi
+[      ]*[a-f0-9]+:    81 ed 74 00 03 10       sub    \$0x10030074,%ebp
+[      ]*[a-f0-9]+:    81 f4 74 00 03 10       xor    \$0x10030074,%esp
+[      ]*[a-f0-9]+:    f7 c1 74 00 03 10       test   \$0x10030074,%ecx
+[      ]*[a-f0-9]+:    c7 c0 74 00 03 10       mov    \$0x10030074,%eax
+[      ]*[a-f0-9]+:    81 d0 74 00 03 10       adc    \$0x10030074,%eax
+[      ]*[a-f0-9]+:    81 c3 74 00 03 10       add    \$0x10030074,%ebx
+[      ]*[a-f0-9]+:    81 e1 74 00 03 10       and    \$0x10030074,%ecx
+[      ]*[a-f0-9]+:    81 fa 74 00 03 10       cmp    \$0x10030074,%edx
+[      ]*[a-f0-9]+:    81 cf 74 00 03 10       or     \$0x10030074,%edi
+[      ]*[a-f0-9]+:    81 de 74 00 03 10       sbb    \$0x10030074,%esi
+[      ]*[a-f0-9]+:    81 ed 74 00 03 10       sub    \$0x10030074,%ebp
+[      ]*[a-f0-9]+:    81 f4 74 00 03 10       xor    \$0x10030074,%esp
+[      ]*[a-f0-9]+:    f7 c1 74 00 03 10       test   \$0x10030074,%ecx
+[      ]*[a-f0-9]+:    c7 c0 75 00 03 10       mov    \$0x10030075,%eax
+[      ]*[a-f0-9]+:    81 d0 75 00 03 10       adc    \$0x10030075,%eax
+[      ]*[a-f0-9]+:    81 c3 75 00 03 10       add    \$0x10030075,%ebx
+[      ]*[a-f0-9]+:    81 e1 75 00 03 10       and    \$0x10030075,%ecx
+[      ]*[a-f0-9]+:    81 fa 75 00 03 10       cmp    \$0x10030075,%edx
+[      ]*[a-f0-9]+:    81 cf 75 00 03 10       or     \$0x10030075,%edi
+[      ]*[a-f0-9]+:    81 de 75 00 03 10       sbb    \$0x10030075,%esi
+[      ]*[a-f0-9]+:    81 ed 75 00 03 10       sub    \$0x10030075,%ebp
+[      ]*[a-f0-9]+:    81 f4 75 00 03 10       xor    \$0x10030075,%esp
+[      ]*[a-f0-9]+:    f7 c1 75 00 03 10       test   \$0x10030075,%ecx
+[      ]*[a-f0-9]+:    c7 c0 75 00 03 10       mov    \$0x10030075,%eax
+[      ]*[a-f0-9]+:    81 d0 75 00 03 10       adc    \$0x10030075,%eax
+[      ]*[a-f0-9]+:    81 c3 75 00 03 10       add    \$0x10030075,%ebx
+[      ]*[a-f0-9]+:    81 e1 75 00 03 10       and    \$0x10030075,%ecx
+[      ]*[a-f0-9]+:    81 fa 75 00 03 10       cmp    \$0x10030075,%edx
+[      ]*[a-f0-9]+:    81 cf 75 00 03 10       or     \$0x10030075,%edi
+[      ]*[a-f0-9]+:    81 de 75 00 03 10       sbb    \$0x10030075,%esi
+[      ]*[a-f0-9]+:    81 ed 75 00 03 10       sub    \$0x10030075,%ebp
+[      ]*[a-f0-9]+:    81 f4 75 00 03 10       xor    \$0x10030075,%esp
+[      ]*[a-f0-9]+:    f7 c1 75 00 03 10       test   \$0x10030075,%ecx
 #pass

diff --git a/ld/testsuite/ld-i386/load1.d b/ld/testsuite/ld-i386/load1.d
index 9c4aa8e164e3eec9d916130b8b5b200a1c363420..2e4957b0ada7c3cecfec5552ffd1b045f1a0606a 100644 (file)
--- a/ld/testsuite/ld-i386/load1.d
+++ b/ld/testsuite/ld-i386/load1.d
@@ -7,52 +7,52 @@
 
 SYMBOL TABLE:
 #...
-0+8049170 l     O .data        0+1 bar
+0+8049164 l     O .data        0+1 bar
 #...
-0+8049171 g     O .data        0+1 foo
+0+8049165 g     O .data        0+1 foo
 #...
 
 Disassembly of section .text:
 
 0+8048074 <_start>:
-[      ]*[a-f0-9]+:    c7 c0 70 91 04 08       mov    \$0x8049170,%eax
-[      ]*[a-f0-9]+:    81 d0 70 91 04 08       adc    \$0x8049170,%eax
-[      ]*[a-f0-9]+:    81 c3 70 91 04 08       add    \$0x8049170,%ebx
-[      ]*[a-f0-9]+:    81 e1 70 91 04 08       and    \$0x8049170,%ecx
-[      ]*[a-f0-9]+:    81 fa 70 91 04 08       cmp    \$0x8049170,%edx
-[      ]*[a-f0-9]+:    81 cf 70 91 04 08       or     \$0x8049170,%edi
-[      ]*[a-f0-9]+:    81 de 70 91 04 08       sbb    \$0x8049170,%esi
-[      ]*[a-f0-9]+:    81 ed 70 91 04 08       sub    \$0x8049170,%ebp
-[      ]*[a-f0-9]+:    81 f4 70 91 04 08       xor    \$0x8049170,%esp
-[      ]*[a-f0-9]+:    f7 c1 70 91 04 08       test   \$0x8049170,%ecx
-[      ]*[a-f0-9]+:    c7 c0 70 91 04 08       mov    \$0x8049170,%eax
-[      ]*[a-f0-9]+:    81 d0 70 91 04 08       adc    \$0x8049170,%eax
-[      ]*[a-f0-9]+:    81 c3 70 91 04 08       add    \$0x8049170,%ebx
-[      ]*[a-f0-9]+:    81 e1 70 91 04 08       and    \$0x8049170,%ecx
-[      ]*[a-f0-9]+:    81 fa 70 91 04 08       cmp    \$0x8049170,%edx
-[      ]*[a-f0-9]+:    81 cf 70 91 04 08       or     \$0x8049170,%edi
-[      ]*[a-f0-9]+:    81 de 70 91 04 08       sbb    \$0x8049170,%esi
-[      ]*[a-f0-9]+:    81 ed 70 91 04 08       sub    \$0x8049170,%ebp
-[      ]*[a-f0-9]+:    81 f4 70 91 04 08       xor    \$0x8049170,%esp
-[      ]*[a-f0-9]+:    f7 c1 70 91 04 08       test   \$0x8049170,%ecx
-[      ]*[a-f0-9]+:    c7 c0 71 91 04 08       mov    \$0x8049171,%eax
-[      ]*[a-f0-9]+:    81 d0 71 91 04 08       adc    \$0x8049171,%eax
-[      ]*[a-f0-9]+:    81 c3 71 91 04 08       add    \$0x8049171,%ebx
-[      ]*[a-f0-9]+:    81 e1 71 91 04 08       and    \$0x8049171,%ecx
-[      ]*[a-f0-9]+:    81 fa 71 91 04 08       cmp    \$0x8049171,%edx
-[      ]*[a-f0-9]+:    81 cf 71 91 04 08       or     \$0x8049171,%edi
-[      ]*[a-f0-9]+:    81 de 71 91 04 08       sbb    \$0x8049171,%esi
-[      ]*[a-f0-9]+:    81 ed 71 91 04 08       sub    \$0x8049171,%ebp
-[      ]*[a-f0-9]+:    81 f4 71 91 04 08       xor    \$0x8049171,%esp
-[      ]*[a-f0-9]+:    f7 c1 71 91 04 08       test   \$0x8049171,%ecx
-[      ]*[a-f0-9]+:    c7 c0 71 91 04 08       mov    \$0x8049171,%eax
-[      ]*[a-f0-9]+:    81 d0 71 91 04 08       adc    \$0x8049171,%eax
-[      ]*[a-f0-9]+:    81 c3 71 91 04 08       add    \$0x8049171,%ebx
-[      ]*[a-f0-9]+:    81 e1 71 91 04 08       and    \$0x8049171,%ecx
-[      ]*[a-f0-9]+:    81 fa 71 91 04 08       cmp    \$0x8049171,%edx
-[      ]*[a-f0-9]+:    81 cf 71 91 04 08       or     \$0x8049171,%edi
-[      ]*[a-f0-9]+:    81 de 71 91 04 08       sbb    \$0x8049171,%esi
-[      ]*[a-f0-9]+:    81 ed 71 91 04 08       sub    \$0x8049171,%ebp
-[      ]*[a-f0-9]+:    81 f4 71 91 04 08       xor    \$0x8049171,%esp
-[      ]*[a-f0-9]+:    f7 c1 71 91 04 08       test   \$0x8049171,%ecx
+[      ]*[a-f0-9]+:    c7 c0 64 91 04 08       mov    \$0x8049164,%eax
+[      ]*[a-f0-9]+:    81 d0 64 91 04 08       adc    \$0x8049164,%eax
+[      ]*[a-f0-9]+:    81 c3 64 91 04 08       add    \$0x8049164,%ebx
+[      ]*[a-f0-9]+:    81 e1 64 91 04 08       and    \$0x8049164,%ecx
+[      ]*[a-f0-9]+:    81 fa 64 91 04 08       cmp    \$0x8049164,%edx
+[      ]*[a-f0-9]+:    81 cf 64 91 04 08       or     \$0x8049164,%edi
+[      ]*[a-f0-9]+:    81 de 64 91 04 08       sbb    \$0x8049164,%esi
+[      ]*[a-f0-9]+:    81 ed 64 91 04 08       sub    \$0x8049164,%ebp
+[      ]*[a-f0-9]+:    81 f4 64 91 04 08       xor    \$0x8049164,%esp
+[      ]*[a-f0-9]+:    f7 c1 64 91 04 08       test   \$0x8049164,%ecx
+[      ]*[a-f0-9]+:    c7 c0 64 91 04 08       mov    \$0x8049164,%eax
+[      ]*[a-f0-9]+:    81 d0 64 91 04 08       adc    \$0x8049164,%eax
+[      ]*[a-f0-9]+:    81 c3 64 91 04 08       add    \$0x8049164,%ebx
+[      ]*[a-f0-9]+:    81 e1 64 91 04 08       and    \$0x8049164,%ecx
+[      ]*[a-f0-9]+:    81 fa 64 91 04 08       cmp    \$0x8049164,%edx
+[      ]*[a-f0-9]+:    81 cf 64 91 04 08       or     \$0x8049164,%edi
+[      ]*[a-f0-9]+:    81 de 64 91 04 08       sbb    \$0x8049164,%esi
+[      ]*[a-f0-9]+:    81 ed 64 91 04 08       sub    \$0x8049164,%ebp
+[      ]*[a-f0-9]+:    81 f4 64 91 04 08       xor    \$0x8049164,%esp
+[      ]*[a-f0-9]+:    f7 c1 64 91 04 08       test   \$0x8049164,%ecx
+[      ]*[a-f0-9]+:    c7 c0 65 91 04 08       mov    \$0x8049165,%eax
+[      ]*[a-f0-9]+:    81 d0 65 91 04 08       adc    \$0x8049165,%eax
+[      ]*[a-f0-9]+:    81 c3 65 91 04 08       add    \$0x8049165,%ebx
+[      ]*[a-f0-9]+:    81 e1 65 91 04 08       and    \$0x8049165,%ecx
+[      ]*[a-f0-9]+:    81 fa 65 91 04 08       cmp    \$0x8049165,%edx
+[      ]*[a-f0-9]+:    81 cf 65 91 04 08       or     \$0x8049165,%edi
+[      ]*[a-f0-9]+:    81 de 65 91 04 08       sbb    \$0x8049165,%esi
+[      ]*[a-f0-9]+:    81 ed 65 91 04 08       sub    \$0x8049165,%ebp
+[      ]*[a-f0-9]+:    81 f4 65 91 04 08       xor    \$0x8049165,%esp
+[      ]*[a-f0-9]+:    f7 c1 65 91 04 08       test   \$0x8049165,%ecx
+[      ]*[a-f0-9]+:    c7 c0 65 91 04 08       mov    \$0x8049165,%eax
+[      ]*[a-f0-9]+:    81 d0 65 91 04 08       adc    \$0x8049165,%eax
+[      ]*[a-f0-9]+:    81 c3 65 91 04 08       add    \$0x8049165,%ebx
+[      ]*[a-f0-9]+:    81 e1 65 91 04 08       and    \$0x8049165,%ecx
+[      ]*[a-f0-9]+:    81 fa 65 91 04 08       cmp    \$0x8049165,%edx
+[      ]*[a-f0-9]+:    81 cf 65 91 04 08       or     \$0x8049165,%edi
+[      ]*[a-f0-9]+:    81 de 65 91 04 08       sbb    \$0x8049165,%esi
+[      ]*[a-f0-9]+:    81 ed 65 91 04 08       sub    \$0x8049165,%ebp
+[      ]*[a-f0-9]+:    81 f4 65 91 04 08       xor    \$0x8049165,%esp
+[      ]*[a-f0-9]+:    f7 c1 65 91 04 08       test   \$0x8049165,%ecx
 #pass