[binutils-gdb/binutils-2_41-branch] testsuite: Also discard the `.MIPS.options' section

[binutils-gdb/binutils-2_41-branch] testsuite: Also discard the `.MIPS.options' section

[Maciej W. Rozycki]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fe11a31f534e34290f09c2bb484b526fb0770b09

commit fe11a31f534e34290f09c2bb484b526fb0770b09
Author: YunQiang Su <yunqiang.su@cipunited.com>
Date:   Fri Jul 28 06:00:36 2023 +0100

    testsuite: Also discard the `.MIPS.options' section
    
    Also discard the `.MIPS.options' section, used with n64 MIPS binaries,
    along with similar other MIPS sections (`.reginfo', `.MIPS.abiflags')
    not relevant for the test cases concerned, fixing these regressions:
    
    mips64-openbsd  -FAIL: ld-elf/group3a
    mips64-openbsd  -FAIL: ld-elf/group3b
    mips64-openbsd  -FAIL: Place orphan sections (map file check)
    mips64-openbsd  -FAIL: ld-elf/orphan-region
    mips64-openbsd  -FAIL: ld-elf/orphan
    mips64-openbsd  -FAIL: overlay size (map file check)
    mips64-openbsd  -FAIL: overlay size
    mips64el-openbsd  -FAIL: ld-elf/group3a
    mips64el-openbsd  -FAIL: ld-elf/group3b
    mips64el-openbsd  -FAIL: Place orphan sections (map file check)
    mips64el-openbsd  -FAIL: ld-elf/orphan-region
    mips64el-openbsd  -FAIL: ld-elf/orphan
    mips64el-openbsd  -FAIL: overlay size (map file check)
    mips64el-openbsd  -FAIL: overlay size
    
    Co-Authored-By: Maciej W. Rozycki <macro@orcam.me.uk>
    
            binutils/
            * testsuite/binutils-all/strip-3.d: Add `-R .MIPS.options' to
            the `strip' tag.
    
            ld/
            * testsuite/ld-elf/group.ld: Also discard `.MIPS.options'.
            * testsuite/ld-elf/orphan-region.ld: Likewise.
            * testsuite/ld-elf/orphan.ld: Likewise.
            * testsuite/ld-mips-elf/got-page-1.ld: Likewise.
            * testsuite/ld-scripts/overlay-size.t: Likewise.
    
    (cherry picked from commit 60ec8306db150e687fc05870949056bae6c8d635)

Diff:
---
 binutils/testsuite/binutils-all/strip-3.d | 2 +-
 ld/testsuite/ld-elf/group.ld              | 2 +-
 ld/testsuite/ld-elf/orphan-region.ld      | 2 +-
 ld/testsuite/ld-elf/orphan.ld             | 2 +-
 ld/testsuite/ld-mips-elf/got-page-1.ld    | 2 +-
 ld/testsuite/ld-scripts/overlay-size.t    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/binutils/testsuite/binutils-all/strip-3.d b/binutils/testsuite/binutils-all/strip-3.d
index cb2f78eef5c..89c75ae6992 100644
--- a/binutils/testsuite/binutils-all/strip-3.d
+++ b/binutils/testsuite/binutils-all/strip-3.d
@@ -1,6 +1,6 @@
 #PROG: strip
 #source: empty.s
-#strip: -R .text -R .data -R .bss -R .ARM.attributes -R .reginfo -R .gnu.attributes -R .MIPS.abiflags -R .pdr -R .xtensa.info -R .ARC.attributes -R .note.gnu.property -R .riscv.attributes -R .csky.attributes
+#strip: -R .text -R .data -R .bss -R .ARM.attributes -R .reginfo -R .gnu.attributes -R .MIPS.abiflags -R .MIPS.options -R .pdr -R .xtensa.info -R .ARC.attributes -R .note.gnu.property -R .riscv.attributes -R .csky.attributes
 #readelf: -S --wide
 #name: strip empty file
 #target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
diff --git a/ld/testsuite/ld-elf/group.ld b/ld/testsuite/ld-elf/group.ld
index 53e27903563..1c561b6aa0e 100644
--- a/ld/testsuite/ld-elf/group.ld
+++ b/ld/testsuite/ld-elf/group.ld
@@ -8,5 +8,5 @@ SECTIONS
 {
   . = 0x1000;
   .text : { *(.text) *(.rodata.brlt) } :image :header
-  /DISCARD/ : { *(.dropme) *(.reginfo) *(.MIPS.abiflags) }
+  /DISCARD/ : { *(.dropme) *(.reginfo) *(.MIPS.abiflags) *(.MIPS.options) }
 }
diff --git a/ld/testsuite/ld-elf/orphan-region.ld b/ld/testsuite/ld-elf/orphan-region.ld
index 71834df647a..f4f7e1846d7 100644
--- a/ld/testsuite/ld-elf/orphan-region.ld
+++ b/ld/testsuite/ld-elf/orphan-region.ld
@@ -7,5 +7,5 @@ SECTIONS
 {
 	.text : ALIGN (4) { *(.text) } > region
 	.rodata : ALIGN (4) { *(.rodata) } > region
-	/DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) *(.trampolines) *(.riscv.attributes) }
+	/DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) *(.MIPS.options) *(.trampolines) *(.riscv.attributes) }
 }
diff --git a/ld/testsuite/ld-elf/orphan.ld b/ld/testsuite/ld-elf/orphan.ld
index 8b5015e157e..86c0b8959c9 100644
--- a/ld/testsuite/ld-elf/orphan.ld
+++ b/ld/testsuite/ld-elf/orphan.ld
@@ -6,5 +6,5 @@ SECTIONS
   .bss : { *(.bss) *(COMMON) }
   .sbss : { *(.sbss) }
   .note : { *(.note) }
-  /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) *(.trampolines) }
+  /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) *(.MIPS.options) *(.trampolines) }
 }
diff --git a/ld/testsuite/ld-mips-elf/got-page-1.ld b/ld/testsuite/ld-mips-elf/got-page-1.ld
index cfe7c1fb77d..b87abbfd6be 100644
--- a/ld/testsuite/ld-mips-elf/got-page-1.ld
+++ b/ld/testsuite/ld-mips-elf/got-page-1.ld
@@ -22,7 +22,7 @@ SECTIONS
   . = ALIGN (0x400);
   .bss : { *(.bss .bss.*) }
 
-  /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) }
+  /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) *(.MIPS.options) }
 }
 
 VERSION
diff --git a/ld/testsuite/ld-scripts/overlay-size.t b/ld/testsuite/ld-scripts/overlay-size.t
index 68c09861b63..452e97cdf46 100644
--- a/ld/testsuite/ld-scripts/overlay-size.t
+++ b/ld/testsuite/ld-scripts/overlay-size.t
@@ -60,5 +60,5 @@ SECTIONS
   end_of_data_overlays = . ;
   
   . = 0x8000;
-  /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) }
+  /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) *(.MIPS.options) }
 }