diff mbox series

ld: testsuite: adjust property-{3, 4{, a}, 5} test cases for glibc baseline

Message ID 20230817042241.2987128-1-sam@gentoo.org
State New
Headers
Series ld: testsuite: adjust property-{3, 4{, a}, 5} test cases for glibc baseline |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Testing passed

Commit Message

Sam James Aug. 17, 2023, 4:21 a.m. UTC 
  PR30722
	* ld/testsuite/ld-x86-64/property-3.r: Tolerate x86-64-v3 if present
	  in the x86 ISA notes.
	* ld/testsuite/ld-x86-64/property-4.r: Ditto.
	* ld/testsuite/ld-x86-64/property-4a.r: Ditto.
	* ld/testsuite/ld-x86-64/property-5.r: Ditto.

Signed-off-by: Sam James <sam@gentoo.org>
---
H.J, could you check this?

Please see https://sourceware.org/bugzilla/show_bug.cgi?id=30722#c9
and https://sourceware.org/bugzilla/show_bug.cgi?id=30722#c10 for why this is happening
on my system. I'd like to double check this explanation makes sense to you and
the patch looks OK.

Thanks!

 ld/testsuite/ld-x86-64/property-3.r  | 2 +-
 ld/testsuite/ld-x86-64/property-4.r  | 2 +-
 ld/testsuite/ld-x86-64/property-4a.r | 2 +-
 ld/testsuite/ld-x86-64/property-5.r  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r
index 1bdb47c7b6b..19cdef7b889 100644
--- a/ld/testsuite/ld-x86-64/property-3.r
+++ b/ld/testsuite/ld-x86-64/property-3.r
@@ -4,5 +4,5 @@  Displaying notes found in: .note.gnu.property
   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
       Properties: stack size: 0x800000
 #...
-	x86 ISA needed: x86-64-baseline, x86-64-v2
+	x86 ISA needed: x86-64-baseline, x86-64-v2(, x86-64-v3)?
 #pass
diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r
index 8cc618cbfad..a81596185e9 100644
--- a/ld/testsuite/ld-x86-64/property-4.r
+++ b/ld/testsuite/ld-x86-64/property-4.r
@@ -4,5 +4,5 @@  Displaying notes found in: .note.gnu.property
   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
       Properties: stack size: 0x800000
 #...
-	x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4
+	x86 ISA needed: x86-64-baseline, x86-64-v2, (x86-64-v3, )?x86-64-v4
 #pass
diff --git a/ld/testsuite/ld-x86-64/property-4a.r b/ld/testsuite/ld-x86-64/property-4a.r
index 64e58a7563c..1d463bf0c66 100644
--- a/ld/testsuite/ld-x86-64/property-4a.r
+++ b/ld/testsuite/ld-x86-64/property-4a.r
@@ -3,7 +3,7 @@  Displaying notes found in: .note.gnu.property
 [ 	]+Owner[ 	]+Data size[ 	]+Description
   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
       Properties: stack size: 0x800000
-	x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4
+	x86 ISA needed: x86-64-baseline, x86-64-v2, (x86-64-v3, )?x86-64-v4
 	x86 feature used: x86
 	x86 ISA used: x86-64-baseline, x86-64-v2, x86-64-v4
 #pass
diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r
index e3ba4f659b9..1444b8dae76 100644
--- a/ld/testsuite/ld-x86-64/property-5.r
+++ b/ld/testsuite/ld-x86-64/property-5.r
@@ -4,5 +4,5 @@  Displaying notes found in: .note.gnu.property
   GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
       Properties: stack size: 0x900000
 #...
-	x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4
+	x86 ISA needed: x86-64-baseline, x86-64-v2, (x86-64-v3, )?x86-64-v4
 #pass