From ed4dca900c0dbc1317917cb289255d2f8d03f732 Mon Sep 17 00:00:00 2001 From: YunQiang Su Date: Fri, 28 Jul 2023 06:00:36 +0100 Subject: [PATCH] testsuite: Handle composed R_MIPS_NONE relocations MIPS n64 ABI has a peculiarity where all relocations are composed of three, with subsequent relocation types set to R_MIPS_NONE if further calculation is not required. Example output produced by `readelf' and `objdump' for such relocations is: Offset Info Type Sym. Value Sym. Name + Addend 000000000000 000800000002 R_MIPS_32 0000000000000000 foo + 0 Type2: R_MIPS_NONE Type3: R_MIPS_NONE and: OFFSET TYPE VALUE 0000000000000000 R_MIPS_32 foo 0000000000000000 R_MIPS_NONE *ABS* 0000000000000000 R_MIPS_NONE *ABS* respectively. The presence of these extra R_MIPS_NONE entries is not relevant for generic or even some MIPS tests, so optionally match them with the respective dump patterns, also discarding `xfail' annotation for MIPS/OpenBSD targets from gas/elf/missing-build-notes.d, removing these regressions: mips64-openbsd -FAIL: readelf -r bintest mips64-openbsd -FAIL: forward expression mips64-openbsd -FAIL: assignment tests mips64-openbsd -FAIL: gas/all/none mips64-openbsd -XFAIL: gas/elf/missing-build-notes mips64-openbsd -FAIL: macro test 2 mips64-openbsd -FAIL: macro irp mips64-openbsd -FAIL: macro rept mips64-openbsd -FAIL: nested irp/irpc/rept mips64-openbsd -FAIL: macro vararg mips64-openbsd -FAIL: mips jalx mips64-openbsd -FAIL: ST Microelectronics Loongson-2F workarounds of Jump Instruction issue mips64el-openbsd -FAIL: readelf -r bintest mips64el-openbsd -FAIL: forward expression mips64el-openbsd -FAIL: assignment tests mips64el-openbsd -FAIL: gas/all/none mips64el-openbsd -XFAIL: gas/elf/missing-build-notes mips64el-openbsd -FAIL: macro test 2 mips64el-openbsd -FAIL: macro irp mips64el-openbsd -FAIL: macro rept mips64el-openbsd -FAIL: nested irp/irpc/rept mips64el-openbsd -FAIL: macro vararg mips64el-openbsd -FAIL: mips jalx mips64el-openbsd -FAIL: ST Microelectronics Loongson-2F workarounds of Jump Instruction issue Co-Authored-By: Maciej W. Rozycki binutils/ * testsuite/binutils-all/readelf.r-64: Optionally match extra R_MIPS_NONE pairs. gas/ * testsuite/gas/all/assign.d: Optionally match extra R_MIPS_NONE pairs. * testsuite/gas/all/fwdexp.d: Likewise. * testsuite/gas/all/none.d: Likewise. * testsuite/gas/macros/irp.d: Likewise. * testsuite/gas/macros/repeat.d: Likewise. * testsuite/gas/macros/rept.d: Likewise. * testsuite/gas/macros/test2.d: Likewise. * testsuite/gas/macros/vararg.d: Likewise. * testsuite/gas/mips/compact-eh-eb-1.d: Likewise. * testsuite/gas/mips/compact-eh-eb-2.d: Likewise. * testsuite/gas/mips/compact-eh-eb-3.d: Likewise. * testsuite/gas/mips/compact-eh-eb-4.d: Likewise. * testsuite/gas/mips/compact-eh-eb-5.d: Likewise. * testsuite/gas/mips/compact-eh-eb-6.d: Likewise. * testsuite/gas/mips/compact-eh-el-1.d: Likewise. * testsuite/gas/mips/compact-eh-el-2.d: Likewise. * testsuite/gas/mips/compact-eh-el-3.d: Likewise. * testsuite/gas/mips/compact-eh-el-4.d: Likewise. * testsuite/gas/mips/compact-eh-el-5.d: Likewise. * testsuite/gas/mips/compact-eh-el-6.d: Likewise. * testsuite/gas/mips/loongson-2f-3.d: Likewise. * testsuite/gas/mips/mips-jalx.d: Likewise. * testsuite/gas/elf/missing-build-notes.d: Likewise. Remove the `xfail' tag. ld/ * testsuite/ld-mips-elf/reloc-estimate-1.d: Optionally match extra R_MIPS_NONE pairs. --- binutils/testsuite/binutils-all/readelf.r-64 | 2 + gas/testsuite/gas/all/assign.d | 4 ++ gas/testsuite/gas/all/fwdexp.d | 2 + gas/testsuite/gas/all/none.d | 2 + gas/testsuite/gas/elf/missing-build-notes.d | 9 ++- gas/testsuite/gas/macros/irp.d | 12 ++++ gas/testsuite/gas/macros/repeat.d | 72 ++++++++++++++++++++ gas/testsuite/gas/macros/rept.d | 6 ++ gas/testsuite/gas/macros/test2.d | 6 ++ gas/testsuite/gas/macros/vararg.d | 12 ++++ gas/testsuite/gas/mips/compact-eh-eb-1.d | 2 + gas/testsuite/gas/mips/compact-eh-eb-2.d | 8 +++ gas/testsuite/gas/mips/compact-eh-eb-3.d | 4 ++ gas/testsuite/gas/mips/compact-eh-eb-4.d | 4 ++ gas/testsuite/gas/mips/compact-eh-eb-5.d | 8 +++ gas/testsuite/gas/mips/compact-eh-eb-6.d | 4 ++ gas/testsuite/gas/mips/compact-eh-el-1.d | 2 + gas/testsuite/gas/mips/compact-eh-el-2.d | 8 +++ gas/testsuite/gas/mips/compact-eh-el-3.d | 4 ++ gas/testsuite/gas/mips/compact-eh-el-4.d | 4 ++ gas/testsuite/gas/mips/compact-eh-el-5.d | 8 +++ gas/testsuite/gas/mips/compact-eh-el-6.d | 4 ++ gas/testsuite/gas/mips/loongson-2f-3.d | 2 + gas/testsuite/gas/mips/mips-jalx.d | 2 + ld/testsuite/ld-mips-elf/reloc-estimate-1.d | 4 ++ 25 files changed, 194 insertions(+), 1 deletion(-) diff --git a/binutils/testsuite/binutils-all/readelf.r-64 b/binutils/testsuite/binutils-all/readelf.r-64 index e7487f1bece..7f850d9e0db 100644 --- a/binutils/testsuite/binutils-all/readelf.r-64 +++ b/binutils/testsuite/binutils-all/readelf.r-64 @@ -2,3 +2,5 @@ Relocation section '.rel.*text' at offset 0x.* contains 1 entry: Offset Info Type Sym. Value Sym. Name.* 0+04 [0-9A-Fa-f]+ *R_.*0+00 external_symbol.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* diff --git a/gas/testsuite/gas/all/assign.d b/gas/testsuite/gas/all/assign.d index 64b39976ec4..172d0b74f29 100644 --- a/gas/testsuite/gas/all/assign.d +++ b/gas/testsuite/gas/all/assign.d @@ -3,5 +3,9 @@ #... .*zzz.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* .*zzz.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass diff --git a/gas/testsuite/gas/all/fwdexp.d b/gas/testsuite/gas/all/fwdexp.d index e83d05a9a94..9b839314741 100644 --- a/gas/testsuite/gas/all/fwdexp.d +++ b/gas/testsuite/gas/all/fwdexp.d @@ -6,6 +6,8 @@ RELOCATION RECORDS FOR .* OFFSET +TYPE +VALUE 0+ .*(\.data|label_i)(|\+0xf+e|\+0xf+c|\+0xf+8|-0x0*2|-0x0*4|-0x0*8) +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .* 0+ (0+|feff|fffe|fcffffff|fffffffc|f8ffffff|f8ffffff ffffffff|ffffffff fffffff8|0+4) .* diff --git a/gas/testsuite/gas/all/none.d b/gas/testsuite/gas/all/none.d index 374808a4f59..9ea861cbd71 100644 --- a/gas/testsuite/gas/all/none.d +++ b/gas/testsuite/gas/all/none.d @@ -5,3 +5,5 @@ #... 0+ .*(NONE|NULL|UNUSED0) +\*ABS\* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* diff --git a/gas/testsuite/gas/elf/missing-build-notes.d b/gas/testsuite/gas/elf/missing-build-notes.d index 95071baefa7..a1898f185d2 100644 --- a/gas/testsuite/gas/elf/missing-build-notes.d +++ b/gas/testsuite/gas/elf/missing-build-notes.d @@ -1,6 +1,5 @@ # as: --generate-missing-build-notes=yes # objdump: -r -#xfail: mips*-*-openbsd # Check that the relocations are for increasing addresses... @@ -8,7 +7,15 @@ RELOCATION RECORDS FOR \[.gnu.build.attributes\]: OFFSET +TYPE +VALUE 0+014 .*[ ]+.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0(18|1c) .*[ ]+.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0(30|38) .*[ ]+.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0(34|40) .*[ ]+.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass diff --git a/gas/testsuite/gas/macros/irp.d b/gas/testsuite/gas/macros/irp.d index fd98b60cc80..62a5df265a2 100644 --- a/gas/testsuite/gas/macros/irp.d +++ b/gas/testsuite/gas/macros/irp.d @@ -8,9 +8,21 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+foo2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+foo3 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0c[ ]+[a-zA-Z0-9_]+[ ]+bar1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+10[ ]+[a-zA-Z0-9_]+[ ]+bar2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+14[ ]+[a-zA-Z0-9_]+[ ]+bar3 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass diff --git a/gas/testsuite/gas/macros/repeat.d b/gas/testsuite/gas/macros/repeat.d index 8f3bdcf535c..3392bfd7532 100644 --- a/gas/testsuite/gas/macros/repeat.d +++ b/gas/testsuite/gas/macros/repeat.d @@ -8,39 +8,111 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+irp_irp_19 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+irp_irp_18 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+irp_irp_29 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0c[ ]+[a-zA-Z0-9_]+[ ]+irp_irp_28 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+10[ ]+[a-zA-Z0-9_]+[ ]+irp_irpc_19 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+14[ ]+[a-zA-Z0-9_]+[ ]+irp_irpc_18 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+18[ ]+[a-zA-Z0-9_]+[ ]+irp_irpc_29 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+1c[ ]+[a-zA-Z0-9_]+[ ]+irp_irpc_28 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+20[ ]+[a-zA-Z0-9_]+[ ]+irp_rept_1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+24[ ]+[a-zA-Z0-9_]+[ ]+irp_rept_1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+28[ ]+[a-zA-Z0-9_]+[ ]+irp_rept_2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+2c[ ]+[a-zA-Z0-9_]+[ ]+irp_rept_2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+30[ ]+[a-zA-Z0-9_]+[ ]+irpc_irp_19 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+34[ ]+[a-zA-Z0-9_]+[ ]+irpc_irp_18 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+38[ ]+[a-zA-Z0-9_]+[ ]+irpc_irp_29 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+3c[ ]+[a-zA-Z0-9_]+[ ]+irpc_irp_28 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+40[ ]+[a-zA-Z0-9_]+[ ]+irpc_irpc_19 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+44[ ]+[a-zA-Z0-9_]+[ ]+irpc_irpc_18 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+48[ ]+[a-zA-Z0-9_]+[ ]+irpc_irpc_29 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+4c[ ]+[a-zA-Z0-9_]+[ ]+irpc_irpc_28 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+50[ ]+[a-zA-Z0-9_]+[ ]+irpc_rept_1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+54[ ]+[a-zA-Z0-9_]+[ ]+irpc_rept_1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+58[ ]+[a-zA-Z0-9_]+[ ]+irpc_rept_2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+5c[ ]+[a-zA-Z0-9_]+[ ]+irpc_rept_2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+60[ ]+[a-zA-Z0-9_]+[ ]+rept_irp_9 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+64[ ]+[a-zA-Z0-9_]+[ ]+rept_irp_8 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+68[ ]+[a-zA-Z0-9_]+[ ]+rept_irp_9 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+6c[ ]+[a-zA-Z0-9_]+[ ]+rept_irp_8 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+70[ ]+[a-zA-Z0-9_]+[ ]+rept_irpc_9 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+74[ ]+[a-zA-Z0-9_]+[ ]+rept_irpc_8 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+78[ ]+[a-zA-Z0-9_]+[ ]+rept_irpc_9 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+7c[ ]+[a-zA-Z0-9_]+[ ]+rept_irpc_8 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+80[ ]+[a-zA-Z0-9_]+[ ]+rept_rept +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+84[ ]+[a-zA-Z0-9_]+[ ]+rept_rept +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+88[ ]+[a-zA-Z0-9_]+[ ]+rept_rept +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+8c[ ]+[a-zA-Z0-9_]+[ ]+rept_rept +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass diff --git a/gas/testsuite/gas/macros/rept.d b/gas/testsuite/gas/macros/rept.d index 73223490e4f..1e553181601 100644 --- a/gas/testsuite/gas/macros/rept.d +++ b/gas/testsuite/gas/macros/rept.d @@ -8,6 +8,12 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass diff --git a/gas/testsuite/gas/macros/test2.d b/gas/testsuite/gas/macros/test2.d index 08ba703ddd5..9d5cc6c0b14 100644 --- a/gas/testsuite/gas/macros/test2.d +++ b/gas/testsuite/gas/macros/test2.d @@ -8,6 +8,12 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+foo2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+foo3 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass diff --git a/gas/testsuite/gas/macros/vararg.d b/gas/testsuite/gas/macros/vararg.d index f566eae4356..c83d93972cd 100644 --- a/gas/testsuite/gas/macros/vararg.d +++ b/gas/testsuite/gas/macros/vararg.d @@ -8,9 +8,21 @@ RELOCATION RECORDS FOR .* OFFSET[ ]+TYPE[ ]+VALUE.* 0+00[ ]+[a-zA-Z0-9_]+[ ]+foo1 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+04[ ]+[a-zA-Z0-9_]+[ ]+foo2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+08[ ]+[a-zA-Z0-9_]+[ ]+foo3 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+0c[ ]+[a-zA-Z0-9_]+[ ]+foo4 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+10[ ]+[a-zA-Z0-9_]+[ ]+foo5 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+14[ ]+[a-zA-Z0-9_]+[ ]+foo6 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* #pass diff --git a/gas/testsuite/gas/mips/compact-eh-eb-1.d b/gas/testsuite/gas/mips/compact-eh-eb-1.d index 9226d03b459..0e691294963 100644 --- a/gas/testsuite/gas/mips/compact-eh-eb-1.d +++ b/gas/testsuite/gas/mips/compact-eh-eb-1.d @@ -9,6 +9,8 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: diff --git a/gas/testsuite/gas/mips/compact-eh-eb-2.d b/gas/testsuite/gas/mips/compact-eh-eb-2.d index 5e89221f8fb..f83b3bd1384 100644 --- a/gas/testsuite/gas/mips/compact-eh-eb-2.d +++ b/gas/testsuite/gas/mips/compact-eh-eb-2.d @@ -9,17 +9,25 @@ RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_32 __gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.gnu_extab\]: OFFSET +TYPE +VALUE 0+000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .group: diff --git a/gas/testsuite/gas/mips/compact-eh-eb-3.d b/gas/testsuite/gas/mips/compact-eh-eb-3.d index 82f9ba18c2a..59969719ee5 100644 --- a/gas/testsuite/gas/mips/compact-eh-eb-3.d +++ b/gas/testsuite/gas/mips/compact-eh-eb-3.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: diff --git a/gas/testsuite/gas/mips/compact-eh-eb-4.d b/gas/testsuite/gas/mips/compact-eh-eb-4.d index f8c5b13b319..e28a4f501da 100644 --- a/gas/testsuite/gas/mips/compact-eh-eb-4.d +++ b/gas/testsuite/gas/mips/compact-eh-eb-4.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: diff --git a/gas/testsuite/gas/mips/compact-eh-eb-5.d b/gas/testsuite/gas/mips/compact-eh-eb-5.d index 19e2b14ef1c..ff1831e7ff0 100644 --- a/gas/testsuite/gas/mips/compact-eh-eb-5.d +++ b/gas/testsuite/gas/mips/compact-eh-eb-5.d @@ -9,17 +9,25 @@ RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_32 __gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.gnu_extab\]: OFFSET +TYPE +VALUE 0+000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .group: diff --git a/gas/testsuite/gas/mips/compact-eh-eb-6.d b/gas/testsuite/gas/mips/compact-eh-eb-6.d index b568cbee6e1..e55bce7f4cf 100644 --- a/gas/testsuite/gas/mips/compact-eh-eb-6.d +++ b/gas/testsuite/gas/mips/compact-eh-eb-6.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: diff --git a/gas/testsuite/gas/mips/compact-eh-el-1.d b/gas/testsuite/gas/mips/compact-eh-el-1.d index 4c3c675ea3c..9a55b626693 100644 --- a/gas/testsuite/gas/mips/compact-eh-el-1.d +++ b/gas/testsuite/gas/mips/compact-eh-el-1.d @@ -9,6 +9,8 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: diff --git a/gas/testsuite/gas/mips/compact-eh-el-2.d b/gas/testsuite/gas/mips/compact-eh-el-2.d index 76dcc865714..f8b1b9617df 100644 --- a/gas/testsuite/gas/mips/compact-eh-el-2.d +++ b/gas/testsuite/gas/mips/compact-eh-el-2.d @@ -9,17 +9,25 @@ RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_32 __gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.gnu_extab\]: OFFSET +TYPE +VALUE 0+000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .group: diff --git a/gas/testsuite/gas/mips/compact-eh-el-3.d b/gas/testsuite/gas/mips/compact-eh-el-3.d index a1c5e29aad3..9e7f5934e14 100644 --- a/gas/testsuite/gas/mips/compact-eh-el-3.d +++ b/gas/testsuite/gas/mips/compact-eh-el-3.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: diff --git a/gas/testsuite/gas/mips/compact-eh-el-4.d b/gas/testsuite/gas/mips/compact-eh-el-4.d index cc7d514c5a2..784501a512b 100644 --- a/gas/testsuite/gas/mips/compact-eh-el-4.d +++ b/gas/testsuite/gas/mips/compact-eh-el-4.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: diff --git a/gas/testsuite/gas/mips/compact-eh-el-5.d b/gas/testsuite/gas/mips/compact-eh-el-5.d index 935cb505cea..6f87bb89f18 100644 --- a/gas/testsuite/gas/mips/compact-eh-el-5.d +++ b/gas/testsuite/gas/mips/compact-eh-el-5.d @@ -8,17 +8,25 @@ RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_32 __gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.gnu_extab\]: OFFSET +TYPE +VALUE 0+000001 R_MIPS_PC32 DW.ref.__gnu_compact_pr2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .group: diff --git a/gas/testsuite/gas/mips/compact-eh-el-6.d b/gas/testsuite/gas/mips/compact-eh-el-6.d index d71b97684fa..2381b1723ba 100644 --- a/gas/testsuite/gas/mips/compact-eh-el-6.d +++ b/gas/testsuite/gas/mips/compact-eh-el-6.d @@ -9,7 +9,11 @@ RELOCATION RECORDS FOR \[.eh_frame_entry\]: OFFSET +TYPE +VALUE 0+000000 R_MIPS_PC32 .text.* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+000004 R_MIPS_PC32 .gnu_extab +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* Contents of section .text: diff --git a/gas/testsuite/gas/mips/loongson-2f-3.d b/gas/testsuite/gas/mips/loongson-2f-3.d index 5a30ff8eea1..f3ac2c97742 100644 --- a/gas/testsuite/gas/mips/loongson-2f-3.d +++ b/gas/testsuite/gas/mips/loongson-2f-3.d @@ -30,5 +30,7 @@ Disassembly of section .text: 44: 08000000 j 0x0 44: R_MIPS_26 external_label +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 48: 00000000 nop 4c: 00000000 nop diff --git a/gas/testsuite/gas/mips/mips-jalx.d b/gas/testsuite/gas/mips/mips-jalx.d index d322da13d83..374a0a1b51c 100644 --- a/gas/testsuite/gas/mips/mips-jalx.d +++ b/gas/testsuite/gas/mips/mips-jalx.d @@ -6,6 +6,8 @@ Disassembly of section .text: 0+000000 <.text>: 0: 74000000 jalx 0x0 0: R_MIPS_26 external_label +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 4: 00000000 nop 8: 00000000 nop c: 00000000 nop diff --git a/ld/testsuite/ld-mips-elf/reloc-estimate-1.d b/ld/testsuite/ld-mips-elf/reloc-estimate-1.d index fa536f938a7..65094cfaf0d 100644 --- a/ld/testsuite/ld-mips-elf/reloc-estimate-1.d +++ b/ld/testsuite/ld-mips-elf/reloc-estimate-1.d @@ -9,7 +9,11 @@ DYNAMIC RELOCATION RECORDS OFFSET +TYPE +VALUE 0+000000 R_MIPS_NONE \*ABS\* +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* 0+010000 R_MIPS_REL32 foo@@V2 +#?.*R_MIPS_NONE.* +#?.*R_MIPS_NONE.* # The address must be 0x810. We should only ever allocate one dynamic -- 2.30.2