2001-08-04 H.J. Lu <hjl@gnu.org>

	    Chris G. Demetriou <cgd@broadcom.com>

	* gas/mips/e32-rel4.s: Removed.

	* gas/mips/e32-rel4.d: Use elf-rel4.s.

	* gas/mips/mips.exp: Use the same rel4 test for litte endian.

	* gas/mips/mips-abi32-pic.d: Add lines for objdump.
	* gas/mips/mips-abi32.d: Likewise.
	* gas/mips/mips-gp32-fp32-pic.d: Likewise.
	* gas/mips/mips-gp32-fp32.d: Likewise.
	* gas/mips/mips-gp32-fp64-pic.d: Likewise.
	* gas/mips/mips-gp32-fp64.d: Likewise.
	* gas/mips/mips-gp64-fp32-pic.d: Likewise.
	* gas/mips/mips-gp64-fp32.d: Likewise.
	* gas/mips/mips-gp64-fp64-pic.d: Likewise.
	* gas/mips/mips-gp64-fp64.d: Likewise.

	* gas/mips/mips-abi32-pic.s: Add space for objdump.
	* gas/mips/mips-abi32.s: Likewise.
	* gas/mips/mips-gp32-fp32-pic.s: Likewise.
	* gas/mips/mips-gp32-fp32.s: Likewise.
	* gas/mips/mips-gp32-fp64-pic.s: Likewise.
	* gas/mips/mips-gp32-fp64.s: Likewise.
	* gas/mips/mips-gp64-fp32-pic.s: Likewise.
	* gas/mips/mips-gp64-fp32.s: Likewise.
	* gas/mips/mips-gp64-fp64-pic.s: Likewise.
	* gas/mips/mips-gp64-fp64.s: Likewise.

	* gas/mips/mips-abi32-pic.s: Add the missing .end.
	* gas/mips/mips-gp32-fp32-pic.s: Likewise.
	* gas/mips/mips-gp32-fp64-pic.s: Likewise.
	* gas/mips/mips-gp64-fp32-pic.s: Likewise.
	* gas/mips/mips-gp64-fp64-pic.s: Likewise.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index a4ef070..9f2fbf7 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,40 @@
+2001-08-04  H.J. Lu  <hjl@gnu.org>
+           Chris G. Demetriou <cgd@broadcom.com>
+
+       * gas/mips/e32-rel4.s: Removed.
+
+       * gas/mips/e32-rel4.d: Use elf-rel4.s.
+
+       * gas/mips/mips.exp: Use the same rel4 test for litte endian.
+
+       * gas/mips/mips-abi32-pic.d: Add lines for objdump.
+       * gas/mips/mips-abi32.d: Likewise.
+       * gas/mips/mips-gp32-fp32-pic.d: Likewise.
+       * gas/mips/mips-gp32-fp32.d: Likewise.
+       * gas/mips/mips-gp32-fp64-pic.d: Likewise.
+       * gas/mips/mips-gp32-fp64.d: Likewise.
+       * gas/mips/mips-gp64-fp32-pic.d: Likewise.
+       * gas/mips/mips-gp64-fp32.d: Likewise.
+       * gas/mips/mips-gp64-fp64-pic.d: Likewise.
+       * gas/mips/mips-gp64-fp64.d: Likewise.
+
+       * gas/mips/mips-abi32-pic.s: Add space for objdump.
+       * gas/mips/mips-abi32.s: Likewise.
+       * gas/mips/mips-gp32-fp32-pic.s: Likewise.
+       * gas/mips/mips-gp32-fp32.s: Likewise.
+       * gas/mips/mips-gp32-fp64-pic.s: Likewise.
+       * gas/mips/mips-gp32-fp64.s: Likewise.
+       * gas/mips/mips-gp64-fp32-pic.s: Likewise.
+       * gas/mips/mips-gp64-fp32.s: Likewise.
+       * gas/mips/mips-gp64-fp64-pic.s: Likewise.
+       * gas/mips/mips-gp64-fp64.s: Likewise.
+
+       * gas/mips/mips-abi32-pic.s: Add the missing .end.
+       * gas/mips/mips-gp32-fp32-pic.s: Likewise.
+       * gas/mips/mips-gp32-fp64-pic.s: Likewise.
+       * gas/mips/mips-gp64-fp32-pic.s: Likewise.
+       * gas/mips/mips-gp64-fp64-pic.s: Likewise.
+
 2001-08-03  Richard Sandiford  <rsandifo@redhat.com>
        
        * gas/mips/elf-rel4.s, gas/mips/elf-rel4.d: New test.

diff --git a/gas/testsuite/gas/mips/e32-rel4.d b/gas/testsuite/gas/mips/e32-rel4.d
index 005075b..81ae4e7 100644 (file)
--- a/gas/testsuite/gas/mips/e32-rel4.d
+++ b/gas/testsuite/gas/mips/e32-rel4.d
@@ -1,5 +1,6 @@
 #objdump: --prefix-addresses -dr
 #name: MIPS ELF reloc 4
+#source: elf-rel4.s
 
 .*: +file format.*
 

diff --git a/gas/testsuite/gas/mips/e32-rel4.s b/gas/testsuite/gas/mips/e32-rel4.s
deleted file mode 100644 (file)
index 085cb23..0000000
--- a/gas/testsuite/gas/mips/e32-rel4.s
+++ /dev/null
@@ -1,12 +0,0 @@
-
-       .section .sdata
-       .global a
-       .4byte 1
-a:     .4byte 2
-
-       .section .text
-       la $4,a
-       la $4,a+4
-       la $4,a+8
-       la $4,a+12
-

diff --git a/gas/testsuite/gas/mips/mips-abi32-pic.d b/gas/testsuite/gas/mips/mips-abi32-pic.d
index 77fe665..16f5891 100644 (file)
--- a/gas/testsuite/gas/mips/mips-abi32-pic.d
+++ b/gas/testsuite/gas/mips/mips-abi32-pic.d
@@ -112,3 +112,6 @@ Disassembly of section .text:
  198:  24a40064        addiu   a0,a1,100
  19c:  0004202b        sltu    a0,zero,a0
  1a0:  00a02025        move    a0,a1
+
+0+01a4 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-abi32-pic.s b/gas/testsuite/gas/mips/mips-abi32-pic.s
index f6b27ec..c727607 100644 (file)
--- a/gas/testsuite/gas/mips/mips-abi32-pic.s
+++ b/gas/testsuite/gas/mips/mips-abi32-pic.s
@@ -137,4 +137,9 @@ func:
 # Should produce warnings given -mfp32
 #      add.d   $f1, $f2, $f3
 
+       .end    func
+
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .space  8

diff --git a/gas/testsuite/gas/mips/mips-abi32.d b/gas/testsuite/gas/mips/mips-abi32.d
index 7de8b9f..a4595c6 100644 (file)
--- a/gas/testsuite/gas/mips/mips-abi32.d
+++ b/gas/testsuite/gas/mips/mips-abi32.d
@@ -73,3 +73,6 @@ Disassembly of section .text:
   fc:  24a40064        addiu   a0,a1,100
  100:  0004202b        sltu    a0,zero,a0
  104:  00a02025        move    a0,a1
+
+0+0108 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-abi32.s b/gas/testsuite/gas/mips/mips-abi32.s
index 61d9140..bd20fe5 100644 (file)
--- a/gas/testsuite/gas/mips/mips-abi32.s
+++ b/gas/testsuite/gas/mips/mips-abi32.s
@@ -97,3 +97,6 @@ func:
 #      add.d   $f1, $f2, $f3
 
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .space  8

diff --git a/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d b/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
index be6e32e..4994de3 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp32-pic.d
@@ -112,3 +112,6 @@ Disassembly of section .text:
  198:  24a40064        addiu   a0,a1,100
  19c:  0004202b        sltu    a0,zero,a0
  1a0:  00a02025        move    a0,a1
+
+0+01a4 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-gp32-fp32-pic.s b/gas/testsuite/gas/mips/mips-gp32-fp32-pic.s
index f6b27ec..1603dc1 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp32-fp32-pic.s
+++ b/gas/testsuite/gas/mips/mips-gp32-fp32-pic.s
@@ -137,4 +137,9 @@ func:
 # Should produce warnings given -mfp32
 #      add.d   $f1, $f2, $f3
 
+       .end    func
+
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+      .space  8

diff --git a/gas/testsuite/gas/mips/mips-gp32-fp32.d b/gas/testsuite/gas/mips/mips-gp32-fp32.d
index cae6b9a..565af2f 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp32-fp32.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp32.d
@@ -73,3 +73,6 @@ Disassembly of section .text:
   fc:  24a40064        addiu   a0,a1,100
  100:  0004202b        sltu    a0,zero,a0
  104:  00a02025        move    a0,a1
+
+0+0108 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-gp32-fp32.s b/gas/testsuite/gas/mips/mips-gp32-fp32.s
index 61d9140..955b77e 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp32-fp32.s
+++ b/gas/testsuite/gas/mips/mips-gp32-fp32.s
@@ -97,3 +97,6 @@ func:
 #      add.d   $f1, $f2, $f3
 
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+      .space  8

diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
index 529fea9..28457d2 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.d
@@ -112,3 +112,6 @@ Disassembly of section .text:
  198:  0004202b        sltu    a0,zero,a0
  19c:  00a02025        move    a0,a1
  1a0:  46231040        add.d   \$f1,\$f2,\$f3
+
+0+01a4 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64-pic.s b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.s
index 4dad471..0110b1e 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp32-fp64-pic.s
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64-pic.s
@@ -136,4 +136,8 @@ func:
 # Should produce warnings given -mfp32
        add.d   $f1, $f2, $f3   # 01a0 add.d    $f1,$f2,$f3
 
+       .end    func
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .space  8

diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64.d b/gas/testsuite/gas/mips/mips-gp32-fp64.d
index 6a5d294..e5a84a7 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp32-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64.d
@@ -72,3 +72,6 @@ Disassembly of section .text:
   f8:  0004202b        sltu    a0,zero,a0
   fc:  00a02025        move    a0,a1
  100:  46231040        add.d   \$f1,\$f2,\$f3
+
+0+0104 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64.s b/gas/testsuite/gas/mips/mips-gp32-fp64.s
index e377ecc..4578a33 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp32-fp64.s
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64.s
@@ -94,3 +94,6 @@ func:
        add.d   $f1, $f2, $f3   # 0100 add.d    $f1,$f2,$f3
 
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .space  8

diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
index 1daf415..03c4097 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.d
@@ -145,3 +145,6 @@ Disassembly of section .text:
  21c:  0081082b        sltu    at,a0,at
  220:  14200001        bnez    at,228 <[^>]*>
  224:  00000000        nop
+
+0+0228 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
index 339fb78..aae2afb 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32-pic.s
@@ -160,4 +160,8 @@ func:
 # Should produce warnings given -mfp32
 #      add.d   $f1, $f2, $f3
 
+       .end    func
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .space  8

diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32.d b/gas/testsuite/gas/mips/mips-gp64-fp32.d
index 6dd2217..bd0e7fd 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp64-fp32.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32.d
@@ -92,3 +92,6 @@ Disassembly of section .text:
  148:  00010c78        dsll    at,at,0x11
  14c:  0081082b        sltu    at,a0,at
  150:  14200000        bnez    at,154 <[^>]*>
+
+0+0154 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32.s b/gas/testsuite/gas/mips/mips-gp64-fp32.s
index 8a5f1d7..190998b 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp64-fp32.s
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32.s
@@ -106,3 +106,6 @@ func:
 #      add.d   $f1, $f2, $f3
 
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .space  8

diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
index 076d48b..513cee5 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.d
@@ -146,3 +146,6 @@ Disassembly of section .text:
  220:  14200002        bnez    at,22c <[^>]*>
  224:  00000000        nop
  228:  46231040        add.d   \$f1,\$f2,\$f3
+
+0+022c <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
index 24f07d6..0858b05 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64-pic.s
@@ -159,4 +159,8 @@ func:
 
        add.d   $f1, $f2, $f3   # 0228 add.d    $f1,$f2,$f3
 
+       .end    func
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .space  8

diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64.d b/gas/testsuite/gas/mips/mips-gp64-fp64.d
index 5caef53..1f1df3e 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp64-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64.d
@@ -93,3 +93,6 @@ Disassembly of section .text:
  14c:  0081082b        sltu    at,a0,at
  150:  14200001        bnez    at,158 <[^>]*>
  154:  46231040        add.d   \$f1,\$f2,\$f3
+
+0+0158 <[^>]*>:
+       ...

diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64.s b/gas/testsuite/gas/mips/mips-gp64-fp64.s
index a926256..a3b4f4d 100644 (file)
--- a/gas/testsuite/gas/mips/mips-gp64-fp64.s
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64.s
@@ -104,3 +104,6 @@ func:
 
        add.d   $f1, $f2, $f3   # 0154 add.d    $f1,$f2,$f3
 end:
+
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+       .space  8

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 84932aa..ffb4fe1 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -151,10 +151,10 @@ if { [istarget mips*-*-*] } then {
        run_dump_test "elf${el}-rel"
        if [istarget mips64*-*-*] { 
            run_dump_test "elf${el}-rel2"
-           run_dump_test "elf${el}-rel4"
+           run_dump_test "elf-rel4"
        } {
            run_dump_test "e32${el}-rel2"
-           run_dump_test "e32${el}-rel4"
+           run_dump_test "e32-rel4"
        }
        run_dump_test "elf${el}-rel3"
        run_dump_test "${tmips}${el}empic"