From 50df0f438e8c9e840e0e8b90e64c70fcf5acf7f4 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 7 Nov 2023 13:54:57 +0100 Subject: [PATCH] Revert "ld x86_64 tests: Accept x86-64-v3 as a needed ISA" This reverts commit bf77f42f6708d8b5ba92336d876042826d8d29c1. It wrongly altered testcase expectations; the issue will need taking care of differently. --- ld/ChangeLog | 7 +++++++ ld/testsuite/ld-x86-64/property-3.r | 2 +- ld/testsuite/ld-x86-64/property-4.r | 2 +- ld/testsuite/ld-x86-64/property-5.r | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index bc74287e73e..53bb9c3cee4 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2023-11-06 Jan Beulich + + PR 30722 + * testsuite/ld-x86-64/property-3.r: Revert commit bf77f42f6708. + * testsuite/ld-x86-64/property-4.r: Likewise. + * testsuite/ld-x86-64/property-5.r: Likewise. + 2023-11-06 Nick Clifton PR 30865 diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r index 1e4a24c6fbe..1bdb47c7b6b 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 #pass diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r index 031a1d280ad..8cc618cbfad 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-v4 #pass diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r index 58b274b9772..e3ba4f659b9 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-v4 #pass -- 2.39.2