Fix gas x86 testsuite for a.out

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e631626..d466928 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 21 12:48:06 2000  H.J. Lu <hjl@gnu.org>
+
+       * gas/i386/general.l: Support a.out.
+       * gas/i386/jump.d: Likewise.
+       * gas/i386/jump16.d: Likewise.
+
 2000-01-21  Alan Modra  <alan@spri.levels.unisa.edu.au>
 
        * gas/i386/general.{s,l}: Move 16 bit jmp and call tests from here

diff --git a/gas/testsuite/gas/i386/general.l b/gas/testsuite/gas/i386/general.l
index bbb59ef..a6fc584 100644 (file)
--- a/gas/testsuite/gas/i386/general.l
+++ b/gas/testsuite/gas/i386/general.l
@@ -221,7 +221,7 @@
  157                           
  158                           .code32
  159 0169 EB98                         jmp     1b
- 160 016b E9FCFFFF FF                  jmp     xxx
+ 160 016b E9(FCFF|90FE)FF FF                   jmp     xxx
  161 0170 FF250000 0000                jmp     \*xxx
  162 0176 FF250000 0000                jmp     xxx\(,1\)
 .*Warning:.*
@@ -240,7 +240,7 @@
  171 019e EA000000 003412              ljmp    \$0x1234,\$xxx
  172                           
  173 01a5 E859FFFF FF                  call    1b
- 174 01aa E8FCFFFF FF                  call    xxx
+ 174 01aa E8(FCFF|51FE)FF FF                   call    xxx
  175 01af FF150000 0000                call    \*xxx
  176 01b5 FF150000 0000                call    xxx\(,1\)
 .*Warning:.*

diff --git a/gas/testsuite/gas/i386/jump.d b/gas/testsuite/gas/i386/jump.d
index 90e893e..5e9fe4b 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|0 <.text>)        3: (R_386_PC)?(DISP)?32 xxx
+   2:  e9 (fc|f9) ff ff ff [   ]*jmp    (0x3|0x0|0 <.text>)    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|0 <.text>)       2b: (R_386_PC)?(DISP)?32        xxx
+  2a:  e8 (fc|d1) ff ff ff [   ]*call   (0x2b|0x0|0 <.text>)   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\)

diff --git a/gas/testsuite/gas/i386/jump16.d b/gas/testsuite/gas/i386/jump16.d
index 4513e4a..3d5d6bb 100644 (file)
--- a/gas/testsuite/gas/i386/jump16.d
+++ b/gas/testsuite/gas/i386/jump16.d
@@ -7,7 +7,7 @@ Disassembly of section .text:
 
 0+000 <.text>:
    0:  eb fe [         ]*jmp    (0x0|0 <.text>)
-   2:  e9 (fe|fb) ff [         ]*jmp    (0x3|0 <.text>)        3: (R_386_PC)?(DISP)?16 xxx
+   2:  e9 (fe|fb) ff [         ]*jmp    (0x3|0x0|0 <.text>)    3: (R_386_PC)?(DISP)?16 xxx
    5:  ff 26 00 00 [   ]*jmp    \*0    7: (R_386_)?(dir)?16    xxx
    9:  66 ff e7 [      ]*jmpl   \*%edi
    c:  67 ff 27 [      ]*addr32 jmp \*\(%edi\)
@@ -15,7 +15,7 @@ Disassembly of section .text:
   16:  ff 2e 00 00 [   ]*ljmp   \*0    18: (R_386_)?(dir)?16   xxx
   1a:  ea 00 00 34 12 [        ]*ljmp   \$0x1234,\$0x0 1b: (R_386_)?(dir)?16   xxx
   1f:  66 e8 db ff ff ff [     ]*calll  (0x0|0 <.text>)
-  25:  66 e8 (fc|d5) ff ff ff [        ]*calll  (0x27|0 <.text>)       27: (R_386_PC)?(DISP)?32        xxx
+  25:  66 e8 (fc|d5) ff ff ff [        ]*calll  (0x27|0x0|0 <.text>)   27: (R_386_PC)?(DISP)?32        xxx
   2b:  66 ff 16 00 00 [        ]*calll  \*0    2e: (R_386_)?(dir)?16   xxx
   30:  66 ff d7 [      ]*calll  \*%edi
   33:  67 66 ff 17 [   ]*addr32 calll \*\(%edi\)
@@ -30,7 +30,7 @@ Disassembly of section .text:
   5a:  ff 2e 00 00 [   ]*ljmp   \*0    5c: (R_386_)?(dir)?16   xxx
   5e:  ea 00 00 34 12 [        ]*ljmp   \$0x1234,\$0x0 5f: (R_386_)?(dir)?16   xxx
   63:  e8 9a ff [      ]*call   (0x0|0 <.text>)
-  66:  e8 (fe|97) ff [         ]*call   (0x67|0 <.text>)       67: (R_386_PC)?(DISP)?16        xxx
+  66:  e8 (fe|97) ff [         ]*call   (0x67|0x0|0 <.text>)   67: (R_386_PC)?(DISP)?16        xxx
   69:  ff 16 00 00 [   ]*call   \*0    6b: (R_386_)?(dir)?16   xxx
   6d:  ff d7 [         ]*call   \*%di
   6f:  ff 15 [         ]*call   \*\(%di\)