From 316be2b229f5bd07ebef48fd1d7b8cb103e4d815 Mon Sep 17 00:00:00 2001 From: YunQiang Su Date: Fri, 28 Jul 2023 06:00:36 +0100 Subject: [PATCH] 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 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. --- gas/testsuite/gas/mips/compact-eh-eb-1.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-eb-2.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-eb-3.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-eb-4.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-eb-5.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-eb-6.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-el-1.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-el-2.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-el-3.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-el-4.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-el-5.d | 5 ++--- gas/testsuite/gas/mips/compact-eh-el-6.d | 5 ++--- 12 files changed, 24 insertions(+), 36 deletions(-) diff --git a/gas/testsuite/gas/mips/compact-eh-eb-1.d b/gas/testsuite/gas/mips/compact-eh-eb-1.d index 0e6912949634..908a41a6840c 100644 --- 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 f83b3bd1384c..db5ad45f51fc 100644 --- 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 59969719ee5f..f318eabb1de1 100644 --- 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 e28a4f501daa..739ff23eba1a 100644 --- 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 ff1831e7ff0f..acf1285016ab 100644 --- 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 e55bce7f4cfa..474b9408bb79 100644 --- 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 9a55b626693c..1b42a9946a33 100644 --- 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 f8b1b9617df6..b4e12404ce84 100644 --- 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 9e7f5934e142..e0262c9a309d 100644 --- 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 784501a512b2..edfc4a9da5c5 100644 --- 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 6f87bb89f18c..5cb6751c07ed 100644 --- 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 2381b1723bad..f48a9167fac1 100644 --- 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: .* .*