ld: Remove x86 ISA level run-time tests

Remove x86 ISA level run-time tests since with glibc 2.33, they will fail
to run on machines with lesser x86 ISA level:

tmpdir/property-5-pie: CPU ISA level is lower than required

	PR ld/27358
	* testsuite/ld-i386/i386.exp: Remove property 3/4/5 run-time
	tests.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.

(cherry picked from commit 38a143aa8c633225e000fd006a5a171f0b6c80ee)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 97fef18c28e7fbf911b1889c8315d0ab0bdfaef0..bb21b1b8ee607c9ce83a8fb32c52d228bd1417e4 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2021-02-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/27358
+       * testsuite/ld-i386/i386.exp: Remove property 3/4/5 run-time
+       tests.
+       * testsuite/ld-x86-64/x86-64.exp: Likewise.
+
 2021-02-06  Nick Clifton  <nickc@redhat.com>
 
        This is the 2.36.1 release.

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 9bfc70c9fb9d3da17054ca3960977c507bc56e10..24700f813525dffb6eeea6782aa65612ed4c510f 100644 (file)
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -1105,69 +1105,6 @@ if { [isnative]
            {pass.c property-stack.S} \
            "property-3-static" "pass.out" \
        ] \
-       [list \
-           "Run property 3" \
-           "" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-stack.S property-x86-1.S} \
-           "property-3" "pass.out" \
-       ] \
-       [list \
-           "Run property 3 (PIE)" \
-           "-pie" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-x86-1.S property-stack.S} \
-           "property-3-pie" "pass.out" "-fPIE" \
-       ] \
-       [list \
-           "Run property 3 (static)" \
-           "-static" \
-           "-Wa,-mx86-used-note=yes" \
-           {property-x86-1.S pass.c property-stack.S} \
-           "property-3-static" "pass.out" \
-       ] \
-       [list \
-           "Run property 4" \
-           "" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
-           "property-4" "pass.out" \
-       ] \
-       [list \
-           "Run property 4 (PIE)" \
-           "-pie" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           "property-4-pie" "pass.out" "-fPIE" \
-       ] \
-       [list \
-           "Run property 4 (static)" \
-           "-static" \
-           "-Wa,-mx86-used-note=yes" \
-           {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
-           "property-4-static" "pass.out" \
-       ] \
-       [list \
-           "Run property 5" \
-           "-Wl,-z,stack-size=0x900000" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
-           "property-5" "pass.out" \
-       ] \
-       [list \
-           "Run property 5 (PIE)" \
-           "-pie -Wl,-z,stack-size=0x900000" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           "property-5-pie" "pass.out" "-fPIE" \
-       ] \
-       [list \
-           "Run property 5 (static)" \
-           "-static -Wl,-z,stack-size=0x900000" \
-           "-Wa,-mx86-used-note=yes" \
-           {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
-           "property-5-static" "pass.out" \
-       ] \
     ]
 
     undefined_weak "$NOPIE_CFLAGS" "$NOPIE_LDFLAGS"

diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 83fdaa7db6599ce67534ebb3891b9d814ddf346e..da0d2a76f3b0961a98eb17c86b57fc65dcdc2bcc 100644 (file)
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -1582,69 +1582,6 @@ if { [isnative] && [check_compiler_available] } {
            {pass.c property-stack.S} \
            "property-3-static" "pass.out" \
        ] \
-       [list \
-           "Run property 3" \
-           "" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-stack.S property-x86-1.S} \
-           "property-3" "pass.out" \
-       ] \
-       [list \
-           "Run property 3 (PIE)" \
-           "-pie" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-x86-1.S property-stack.S} \
-           "property-3-pie" "pass.out" "-fPIE" \
-       ] \
-       [list \
-           "Run property 3 (static)" \
-           "-static" \
-           "-Wa,-mx86-used-note=yes" \
-           {property-x86-1.S pass.c property-stack.S} \
-           "property-3-static" "pass.out" \
-       ] \
-       [list \
-           "Run property 4" \
-           "" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
-           "property-4" "pass.out" \
-       ] \
-       [list \
-           "Run property 4 (PIE)" \
-           "-pie" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           "property-4-pie" "pass.out" "-fPIE" \
-       ] \
-       [list \
-           "Run property 4 (static)" \
-           "-static" \
-           "-Wa,-mx86-used-note=yes" \
-           {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
-           "property-4-static" "pass.out" \
-       ] \
-       [list \
-           "Run property 5" \
-           "-Wl,-z,stack-size=0x900000" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
-           "property-5" "pass.out" \
-       ] \
-       [list \
-           "Run property 5 (PIE)" \
-           "-pie -Wl,-z,stack-size=0x900000" \
-           "-Wa,-mx86-used-note=yes" \
-           {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           "property-5-pie" "pass.out" "-fPIE" \
-       ] \
-       [list \
-           "Run property 5 (static)" \
-           "-static -Wl,-z,stack-size=0x900000" \
-           "-Wa,-mx86-used-note=yes" \
-           {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
-           "property-5-static" "pass.out" \
-       ] \
        [list \
            "Run pr22001-1a (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \