From 38a143aa8c633225e000fd006a5a171f0b6c80ee Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 7 Feb 2021 13:11:16 -0800 Subject: [PATCH] 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. --- ld/ChangeLog | 7 ++++ ld/testsuite/ld-i386/i386.exp | 63 ------------------------------- ld/testsuite/ld-x86-64/x86-64.exp | 63 ------------------------------- 3 files changed, 7 insertions(+), 126 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 40b6e076edc..798b8fd19b2 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2021-02-07 H.J. Lu + + 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-01-26 Nick Alcock * ldlang.c (lang_merge_ctf): Set CTF_LINK_NO_FILTER_REPORTED_SYMS diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 0be6b861dab..d9075bf27b5 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -1106,69 +1106,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 662d349d824..232c9dfa3a2 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -1584,69 +1584,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" \ -- 2.30.2