Cope with PE relocs.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index cfdf8e4d53c1ca1653d68d432af7ead4b444af03..5a9bae34a59c9f1b35fef072b1e395752b8c1f0d 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-25  Alan Modra  <alan@linuxcare.com.au>
+
+       * gas/i386/general.l: Allow for DISP32 pe relocs.
+       * gas/i386/jump.d: Similarly.
+
 Mon Apr 24 16:35:08 2000  Jim Wilson  <wilson@cygnus.com>
 
        * gas/ia64/opc-i.d: Change pmin2.u to pmin2.  Change pmax2.u to pmax2.

diff --git a/gas/testsuite/gas/i386/general.l b/gas/testsuite/gas/i386/general.l
index 9ea9fc3874a2789ce50e29307ee01bb97463e633..51bbdf79963c1d2e2d0167c35fd5367189b00288 100644 (file)
--- a/gas/testsuite/gas/i386/general.l
+++ b/gas/testsuite/gas/i386/general.l
@@ -39,7 +39,7 @@
    2                           .text
    3                           #test jumps and calls
    4 0000 EBFE                 1:      jmp     1b
-   5 0002 E9F(CF|9F)FFF FF                     jmp     xxx
+   5 0002 E9((FC|F9)FFFF FF|000000 00)                 jmp     xxx
    6 0007 FF250000 0000                jmp     \*xxx
    7 000d FF250000 0000                jmp     xxx\(,1\)
 .*Warning:.*
@@ -58,7 +58,7 @@
   16 0035 EA000000 003412              ljmp    \$0x1234,\$xxx
   17                           
   18 003c E8BFFFFF FF                  call    1b
-  19 0041 E8(FC|BA)FFFF FF                     call    xxx
+  19 0041 E8((FC|BA)FFFF FF|000000 00)                 call    xxx
   20 0046 FF150000 0000                call    \*xxx
   21 004c FF150000 0000                call    xxx\(,1\)
 .*Warning:.*

diff --git a/gas/testsuite/gas/i386/jump.d b/gas/testsuite/gas/i386/jump.d
index 5e9fe4b5cdf73ded846a47ac377e361ed7535354..cddd4a3c74aaeaef45e3dd4361541b4f6d2c97b4 100644 (file)
--- a/gas/testsuite/gas/i386/jump.d
+++ b/gas/testsuite/gas/i386/jump.d
@@ -7,7 +7,7 @@ Disassembly of section .text:
 
 0+000 <.text>:
    0:  eb fe [         ]*jmp    (0x0|0 <.text>)
-   2:  e9 (fc|f9) ff ff ff [   ]*jmp    (0x3|0x0|0 <.text>)    3: (R_386_PC)?(DISP)?32 xxx
+   2:  e9 ((fc|f9) ff ff ff|00 00 00 00) [     ]*jmp    (0x)?(0|3|7)( <.text(\+0x7)?>)?        3: (R_386_PC)?(DISP)?32 xxx
    7:  ff 25 00 00 00 00 [     ]*jmp    \*0x0  9: (R_386_)?(dir)?32    xxx
    d:  ff e7 [         ]*jmp    \*%edi
    f:  ff 27 [         ]*jmp    \*\(%edi\)
@@ -15,7 +15,7 @@ Disassembly of section .text:
   18:  ff 2d 00 00 00 00 [     ]*ljmp   \*0x0  1a: (R_386_)?(dir)?32   xxx
   1e:  ea 00 00 00 00 34 12 [  ]*ljmp   \$0x1234,\$0x0 1f: (R_386_)?(dir)?32   xxx
   25:  e8 d6 ff ff ff [        ]*call   (0x0|0 <.text>)
-  2a:  e8 (fc|d1) ff ff ff [   ]*call   (0x2b|0x0|0 <.text>)   2b: (R_386_PC)?(DISP)?32        xxx
+  2a:  e8 ((fc|d1) ff ff ff|00 00 00 00) [     ]*call   (0x)?(0|2b|2f)( <.text(\+0x2f)?>)?     2b: (R_386_PC)?(DISP)?32        xxx
   2f:  ff 15 00 00 00 00 [     ]*call   \*0x0  31: (R_386_)?(dir)?32   xxx
   35:  ff d7 [         ]*call   \*%edi
   37:  ff 17 [         ]*call   \*\(%edi\)