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 a4ef070e3aadccabd57c9943ddf05b416f868df4..9f2fbf7917445b082c196a66744e50732cafeab3 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 005075b654fbd7c47f66935be28d851bffb74053..81ae4e7fc1b207a5aa7eb6fe56f4e5712cea4b46 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 77fe6650123464cc3b81c6d3eed57c6c454fb019..16f589169dd224b9210d0bcefe5b6ae1779860d9 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 f6b27ecec9176faa0fa9ab85a30727b2bf452cb7..c727607ab56f51ee10b3f3e8b3e9cacd963d6012 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 7de8b9fcde5eb4e41c94b25caf9b04a2cb491784..a4595c65bd386d7e5131ad9796de23557dfc53be 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 61d91406b21ad2b11f449c6a3ec8b477bb4a4fb0..bd20fe59f74ebf3ff8eab546eec163f7fa23cf29 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 be6e32e593fe38da5269347165c22da915a1c7c5..4994de3b535f08e075430c690b9caa1740c251ab 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 f6b27ecec9176faa0fa9ab85a30727b2bf452cb7..1603dc1eae3ebb5dd1061a8dce9f495deb306102 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 cae6b9aeda0939b2e6bdb6edc13bf07bacfd871b..565af2fdc7db29a734e44720243ba253406ac612 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 61d91406b21ad2b11f449c6a3ec8b477bb4a4fb0..955b77ee11dcdcb5e3c410d53a6411947d08a1df 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 529fea9017fdc3edf46bfb6183fe59bbaa493385..28457d2941b058681e610c164562c071259afc3e 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 4dad47133ddf6040f803578c538f9ffc901205f9..0110b1e900a7dd9bfa7ae95304053f50a68d7ec0 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 6a5d294d2f21969bd43a1726577ca345e111c27c..e5a84a7ecde3b456f5ecc5999c0ccf13f1c89633 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 e377eccc2d7d8ae028f2e23a7d06e10a31d5637c..4578a33eba512722d030d6ef9626f7757b25f0c9 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 1daf415a934e5bcaa3915b2f4da78062317b8860..03c40974d28b5e5c44f8055166f5b817e473ee1f 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 339fb78011b53a783fd7f509cd9981e15e34bb72..aae2afbacf073ffe91a3068658e13a6e9f8ddf3e 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 6dd2217f11ace4dd4075befa49a5173bb1075a84..bd0e7fdb9cb82b4c382fe1f642fabf43d6610303 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 8a5f1d7c85049f54f2d8b00b3b588d5c2fdb18d8..190998b89c72aff60cfb2602bf103fb456dfa747 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 076d48b4ace343777d0feb4147f1dc73a2c261af..513cee5805d454bb86c24a1b2372e3c9f3e179c9 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 24f07d6b4091a56b85f31d92d64a501195b3ecf5..0858b055272398670288f022bd9a575446889c16 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 5caef53e790c97c1509b353a67d03b5a2785bd90..1f1df3e7651a992904009c061225866e09d06a89 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 a92625651440efd0736ebf44242642d6f23296ec..a3b4f4d11831654e1f2048dfa449e10acdf14afc 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 84932aa43f4093bca986065fd802a7f482b5b203..ffb4fe12783e0160afd51d46289ff9766383b15e 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"