MIPS/testsuite: Fix %hi usage across MIPS16 GAS/LD tests

Fix a couple of places in MIPS GAS and LD R_MIPS16_HI16/R_MIPS16_LO16
relocation tests where the %hi operator has been incorrectly used, but
the %lo operator is expected to complement the preceding %hi operation.

diff --git a/gas/testsuite/gas/mips/mips16-hilo-n32.d b/gas/testsuite/gas/mips/mips16-hilo-n32.d
index 5ac680d2b36e53895849dbb5fd08dbbce105ab43..7d78664afe01285b85b87a893215c94782452503 100644 (file)
--- a/gas/testsuite/gas/mips/mips16-hilo-n32.d
+++ b/gas/testsuite/gas/mips/mips16-hilo-n32.d
@@ -273,12 +273,12 @@ Disassembly of section \.text:
                        27e: R_MIPS16_HI16      \.data
  282:  f400 35a0       sll     a1,16
  286:  f000 9d80       lw      a0,0\(a1\)
-                       286: R_MIPS16_HI16      \.data
+                       286: R_MIPS16_LO16      \.data
  28a:  f000 6d00       li      a1,0
                        28a: R_MIPS16_HI16      \.data\+0x4
  28e:  f400 35a0       sll     a1,16
  292:  f000 9d80       lw      a0,0\(a1\)
-                       292: R_MIPS16_HI16      \.data\+0x4
+                       292: R_MIPS16_LO16      \.data\+0x4
  296:  f000 6d00       li      a1,0
                        296: R_MIPS16_HI16      big_external_data_label
  29a:  f400 35a0       sll     a1,16

diff --git a/gas/testsuite/gas/mips/mips16-hilo.d b/gas/testsuite/gas/mips/mips16-hilo.d
index 081993a94e5a0165865ced498dee27170184aa97..5ecc9287aed8144fe6ba7f1145321ca7b2e05af3 100644 (file)
--- a/gas/testsuite/gas/mips/mips16-hilo.d
+++ b/gas/testsuite/gas/mips/mips16-hilo.d
@@ -273,12 +273,12 @@ Disassembly of section \.text:
                        27e: R_MIPS16_HI16      \.data
  282:  f400 35a0       sll     a1,16
  286:  f000 9d80       lw      a0,0\(a1\)
-                       286: R_MIPS16_HI16      \.data
+                       286: R_MIPS16_LO16      \.data
  28a:  f000 6d00       li      a1,0
                        28a: R_MIPS16_HI16      \.data
  28e:  f400 35a0       sll     a1,16
- 292:  f000 9d80       lw      a0,0\(a1\)
-                       292: R_MIPS16_HI16      \.data
+ 292:  f000 9d84       lw      a0,4\(a1\)
+                       292: R_MIPS16_LO16      \.data
  296:  f000 6d00       li      a1,0
                        296: R_MIPS16_HI16      big_external_data_label
  29a:  f400 35a0       sll     a1,16

diff --git a/gas/testsuite/gas/mips/mips16-hilo.s b/gas/testsuite/gas/mips/mips16-hilo.s
index cc1e8a01f8ca6ceab4bd0c4806457210f03b80e1..b61b6b55db1c58ac13b4c7a72510b1d2afb4fcbb 100644 (file)
--- a/gas/testsuite/gas/mips/mips16-hilo.s
+++ b/gas/testsuite/gas/mips/mips16-hilo.s
@@ -181,13 +181,13 @@ stuff:
        addiu   $4,%lo(small_local_common+0x1a5a5)
        li      $5,%hi(0)
        sll     $5,16
-       lw      $4,%hi(0)($5)
+       lw      $4,%lo(0)($5)
        li      $5,%hi(data_label)
        sll     $5,16
-       lw      $4,%hi(data_label)($5)
+       lw      $4,%lo(data_label)($5)
        li      $5,%hi(data_label2)
        sll     $5,16
-       lw      $4,%hi(data_label2)($5)
+       lw      $4,%lo(data_label2)($5)
        li      $5,%hi(big_external_data_label)
        sll     $5,16
        lw      $4,%lo(big_external_data_label)($5)

diff --git a/gas/testsuite/gas/mips/mips16e2-hilo-n32.d b/gas/testsuite/gas/mips/mips16e2-hilo-n32.d
index b5df2b93e9626222995e217fe8f6648edd199deb..21a583622a9676cc1635108bcd25cc61a4babef0 100644 (file)
--- a/gas/testsuite/gas/mips/mips16e2-hilo-n32.d
+++ b/gas/testsuite/gas/mips/mips16e2-hilo-n32.d
@@ -217,11 +217,11 @@ Disassembly of section \.text:
 [      ]*[0-9a-f]+:    f000 6d20       lui     a1,0x0
 [      ]*[0-9a-f]+: R_MIPS16_HI16      \.data
 [      ]*[0-9a-f]+:    f000 9d80       lw      a0,0\(a1\)
-[      ]*[0-9a-f]+: R_MIPS16_HI16      \.data
+[      ]*[0-9a-f]+: R_MIPS16_LO16      \.data
 [      ]*[0-9a-f]+:    f000 6d20       lui     a1,0x0
 [      ]*[0-9a-f]+: R_MIPS16_HI16      \.data\+0x4
 [      ]*[0-9a-f]+:    f000 9d80       lw      a0,0\(a1\)
-[      ]*[0-9a-f]+: R_MIPS16_HI16      \.data\+0x4
+[      ]*[0-9a-f]+: R_MIPS16_LO16      \.data\+0x4
 [      ]*[0-9a-f]+:    f000 6d20       lui     a1,0x0
 [      ]*[0-9a-f]+: R_MIPS16_HI16      big_external_data_label
 [      ]*[0-9a-f]+:    f000 9d80       lw      a0,0\(a1\)

diff --git a/gas/testsuite/gas/mips/mips16e2-hilo.d b/gas/testsuite/gas/mips/mips16e2-hilo.d
index 49dca2db7ee734e29218dd743041f9708aa94bd8..0591a5d4576dec30a25838b70752fe80c06e1b57 100644 (file)
--- a/gas/testsuite/gas/mips/mips16e2-hilo.d
+++ b/gas/testsuite/gas/mips/mips16e2-hilo.d
@@ -217,11 +217,11 @@ Disassembly of section \.text:
 [      ]*[0-9a-f]+:    f000 6d20       lui     a1,0x0
 [      ]*[0-9a-f]+: R_MIPS16_HI16      \.data
 [      ]*[0-9a-f]+:    f000 9d80       lw      a0,0\(a1\)
-[      ]*[0-9a-f]+: R_MIPS16_HI16      \.data
+[      ]*[0-9a-f]+: R_MIPS16_LO16      \.data
 [      ]*[0-9a-f]+:    f000 6d20       lui     a1,0x0
 [      ]*[0-9a-f]+: R_MIPS16_HI16      \.data
-[      ]*[0-9a-f]+:    f000 9d80       lw      a0,0\(a1\)
-[      ]*[0-9a-f]+: R_MIPS16_HI16      \.data
+[      ]*[0-9a-f]+:    f000 9d84       lw      a0,4\(a1\)
+[      ]*[0-9a-f]+: R_MIPS16_LO16      \.data
 [      ]*[0-9a-f]+:    f000 6d20       lui     a1,0x0
 [      ]*[0-9a-f]+: R_MIPS16_HI16      big_external_data_label
 [      ]*[0-9a-f]+:    f000 9d80       lw      a0,0\(a1\)

diff --git a/gas/testsuite/gas/mips/mips16e2-hilo.s b/gas/testsuite/gas/mips/mips16e2-hilo.s
index f16a3541ff4d2335445104d781003cf981da36e4..0efee2d9e868f2542579630f5a3c97bb45e313dc 100644 (file)
--- a/gas/testsuite/gas/mips/mips16e2-hilo.s
+++ b/gas/testsuite/gas/mips/mips16e2-hilo.s
@@ -126,11 +126,11 @@ stuff:
        lui     $4,%hi(small_local_common+0x1a5a5)
        addiu   $4,%lo(small_local_common+0x1a5a5)
        lui     $5,%hi(0)
-       lw      $4,%hi(0)($5)
+       lw      $4,%lo(0)($5)
        lui     $5,%hi(data_label)
-       lw      $4,%hi(data_label)($5)
+       lw      $4,%lo(data_label)($5)
        lui     $5,%hi(data_label2)
-       lw      $4,%hi(data_label2)($5)
+       lw      $4,%lo(data_label2)($5)
        lui     $5,%hi(big_external_data_label)
        lw      $4,%lo(big_external_data_label)($5)
        lui     $5,%hi(small_external_data_label)

diff --git a/ld/testsuite/ld-mips-elf/mips16-hilo.d b/ld/testsuite/ld-mips-elf/mips16-hilo.d
index 6871f8a3dca8d74ab4b3455ec2c63e04b63e4ea5..dfa840c45d5e30d91eeaec6f4d127b23dd00b1fa 100644 (file)
--- a/ld/testsuite/ld-mips-elf/mips16-hilo.d
+++ b/ld/testsuite/ld-mips-elf/mips16-hilo.d
@@ -177,10 +177,10 @@ Disassembly of section .text:
 0+50027c <[^>]*> 9d80          lw      a0,0\(a1\)
 0+50027e <[^>]*> f060 6d05     li      a1,101
 0+500282 <[^>]*> f400 35a0     sll     a1,16
-0+500286 <[^>]*> f060 9d85     lw      a0,101\(a1\)
+0+500286 <[^>]*> f328 9d80     lw      a0,17184\(a1\)
 0+50028a <[^>]*> f060 6d05     li      a1,101
 0+50028e <[^>]*> f400 35a0     sll     a1,16
-0+500292 <[^>]*> f060 9d85     lw      a0,101\(a1\)
+0+500292 <[^>]*> f328 9d84     lw      a0,17188\(a1\)
 0+500296 <[^>]*> f060 6d05     li      a1,101
 0+50029a <[^>]*> f400 35a0     sll     a1,16
 0+50029e <[^>]*> f328 9d90     lw      a0,17200\(a1\)