MIPS/GAS/testsuite: Fix n64 compact EH failures

Expect a `.MIPS.options' section alternatively to `.reginfo' and ignore
contents of either as irrelevant for all the affected compact EH tests,
removing these regressions:

mips64-openbsd  -FAIL: Compact EH EB #1 with personality ID and FDE data
mips64-openbsd  -FAIL: Compact EH EB #2 with personality routine and FDE data
mips64-openbsd  -FAIL: Compact EH EB #3 with personality id and large FDE data
mips64-openbsd  -FAIL: Compact EH EB #4 with personality id, FDE data and LSDA
mips64-openbsd  -FAIL: Compact EH EB #5 with personality routine, FDE data and LSDA
mips64-openbsd  -FAIL: Compact EH EB #6 with personality id, LSDA and large FDE data
mips64-openbsd  -FAIL: Compact EH EL #1 with personality ID and FDE data
mips64-openbsd  -FAIL: Compact EH EL #2 with personality routine and FDE data
mips64-openbsd  -FAIL: Compact EH EL #3 with personality id and large FDE data
mips64-openbsd  -FAIL: Compact EH EL #4 with personality id, FDE data and LSDA
mips64-openbsd  -FAIL: Compact EH EL #5 with personality routine, FDE data and LSDA
mips64-openbsd  -FAIL: Compact EH EL #6 with personality id, LSDA and large FDE data
mips64el-openbsd  -FAIL: Compact EH EB #1 with personality ID and FDE data
mips64el-openbsd  -FAIL: Compact EH EB #2 with personality routine and FDE data
mips64el-openbsd  -FAIL: Compact EH EB #3 with personality id and large FDE data
mips64el-openbsd  -FAIL: Compact EH EB #4 with personality id, FDE data and LSDA
mips64el-openbsd  -FAIL: Compact EH EB #5 with personality routine, FDE data and LSDA
mips64el-openbsd  -FAIL: Compact EH EB #6 with personality id, LSDA and large FDE data
mips64el-openbsd  -FAIL: Compact EH EL #1 with personality ID and FDE data
mips64el-openbsd  -FAIL: Compact EH EL #2 with personality routine and FDE data
mips64el-openbsd  -FAIL: Compact EH EL #3 with personality id and large FDE data
mips64el-openbsd  -FAIL: Compact EH EL #4 with personality id, FDE data and LSDA
mips64el-openbsd  -FAIL: Compact EH EL #5 with personality routine, FDE data and LSDA
mips64el-openbsd  -FAIL: Compact EH EL #6 with personality id, LSDA and large FDE data

Co-Authored-By: Maciej W. Rozycki <macro@orcam.me.uk>
	gas/
	* testsuite/gas/mips/compact-eh-eb-1.d: Accept `.MIPS.options'
	section as an alternative to `.reginfo' and ignore contents of
	either.
	* 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.

diff --git a/gas/testsuite/gas/mips/compact-eh-eb-1.d b/gas/testsuite/gas/mips/compact-eh-eb-1.d
index 0e69129..908a41a 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-eb-1.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-1.d
@@ -15,9 +15,8 @@ OFFSET +TYPE +VALUE
 
 Contents of section .text:
  0000 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-eb-2.d b/gas/testsuite/gas/mips/compact-eh-eb-2.d
index f83b3bd..db5ad45 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-eb-2.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-2.d
@@ -34,9 +34,8 @@ Contents of section .group:
  0000 00000001 00000007 00000008          .*
 Contents of section .text:
  0000 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-eb-3.d b/gas/testsuite/gas/mips/compact-eh-eb-3.d
index 5996971..f318eab 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-eb-3.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-3.d
@@ -18,9 +18,8 @@ OFFSET +TYPE +VALUE
 
 Contents of section .text:
  0000 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-eb-4.d b/gas/testsuite/gas/mips/compact-eh-eb-4.d
index e28a4f5..739ff23 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-eb-4.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-4.d
@@ -19,9 +19,8 @@ OFFSET +TYPE +VALUE
 Contents of section .text:
  0000 00000000 00000000 00000000 00000000  .*
  0010 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-eb-5.d b/gas/testsuite/gas/mips/compact-eh-eb-5.d
index ff1831e..acf1285 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-eb-5.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-5.d
@@ -35,9 +35,8 @@ Contents of section .group:
 Contents of section .text:
  0000 00000000 00000000 00000000 00000000  .*
  0010 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-eb-6.d b/gas/testsuite/gas/mips/compact-eh-eb-6.d
index e55bce7..474b940 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-eb-6.d
+++ b/gas/testsuite/gas/mips/compact-eh-eb-6.d
@@ -19,9 +19,8 @@ OFFSET +TYPE +VALUE
 Contents of section .text:
  0000 00000000 00000000 00000000 00000000  .*
  0010 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-el-1.d b/gas/testsuite/gas/mips/compact-eh-el-1.d
index 9a55b62..1b42a99 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-el-1.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-1.d
@@ -15,9 +15,8 @@ OFFSET +TYPE +VALUE
 
 Contents of section .text:
  0000 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-el-2.d b/gas/testsuite/gas/mips/compact-eh-el-2.d
index f8b1b96..b4e1240 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-el-2.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-2.d
@@ -34,9 +34,8 @@ Contents of section .group:
  0000 01000000 07000000 08000000           .*
 Contents of section .text:
  0000 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-el-3.d b/gas/testsuite/gas/mips/compact-eh-el-3.d
index 9e7f593..e0262c9 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-el-3.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-3.d
@@ -18,9 +18,8 @@ OFFSET +TYPE +VALUE
 
 Contents of section .text:
  0000 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-el-4.d b/gas/testsuite/gas/mips/compact-eh-el-4.d
index 784501a..edfc4a9 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-el-4.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-4.d
@@ -19,9 +19,8 @@ OFFSET +TYPE +VALUE
 Contents of section .text:
  0000 00000000 00000000 00000000 00000000  .*
  0010 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-el-5.d b/gas/testsuite/gas/mips/compact-eh-el-5.d
index 6f87bb8..5cb6751 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-el-5.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-5.d
@@ -34,9 +34,8 @@ Contents of section .group:
 Contents of section .text:
  0000 00000000 00000000 00000000 00000000  .*
  0010 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*

diff --git a/gas/testsuite/gas/mips/compact-eh-el-6.d b/gas/testsuite/gas/mips/compact-eh-el-6.d
index 2381b17..f48a916 100644 (file)
--- a/gas/testsuite/gas/mips/compact-eh-el-6.d
+++ b/gas/testsuite/gas/mips/compact-eh-el-6.d
@@ -19,9 +19,8 @@ OFFSET +TYPE +VALUE
 Contents of section .text:
  0000 00000000 00000000 00000000 00000000  .*
  0010 00000000.*
-Contents of section .reginfo:
- 0000 00000000 00000000 00000000 00000000  .*
- 0010 00000000 00000000                    .*
+Contents of section (.reginfo|.MIPS.options):
+#...
 Contents of section .MIPS.abiflags:
  .*
  .*