X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Ftestsuite%2Fld-x86-64%2Fx86-64.exp;h=db65810f1f3f2566412875a7119227caaf928306;hb=6c0d3bdec7f1728a064a916145c6d79058e6e3d7;hp=e58d7c89749fa64700ccc80eaf23fc278e72c621;hpb=43083a502b8d658b8d096111e54afcc73b0215a4;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index e58d7c8974..db65810f1f 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -1,5 +1,5 @@ # Expect script for ld-x86_64 tests -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -34,6 +34,10 @@ if [istarget "*-*-nacl*"] { set emul "elf_x86_64" } +global ASFLAGS +set saved_ASFLAGS "$ASFLAGS" +set ASFLAGS "$ASFLAGS -mx86-used-note=no" + # List contains test-items with 3 items followed by 2 lists: # 0:name 1:ld early options 2:ld late options 3:assembler options # 4:filenames of assembler files 5: action and options. 6: name of output file @@ -50,20 +54,23 @@ set x86_64tests { "-melf_x86_64 tmpdir/libpltlib.so" "" "--64" {plt.s} {{objdump -drj.plt plt.pd}} "plt"} {"TLS -fpic -shared transitions" - "-shared -melf_x86_64 --no-ld-generated-unwind-info --hash-style=sysv" "" + "-shared -melf_x86_64 --no-ld-generated-unwind-info \ + -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "--64" {tlspic1.s tlspic2.s} {{readelf -WSsrl tlspic.rd} {objdump -drj.text\ -Mintel64 tlspic.dd} {objdump -sj.got tlspic.sd} {objdump -sj.tdata tlspic.td}} "libtlspic.so"} {"TLS -fpic -shared transitions with r15 as GOT base" - "-shared -melf_x86_64 --no-ld-generated-unwind-info --hash-style=sysv" "" + "-shared -melf_x86_64 --no-ld-generated-unwind-info \ + -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "--64 -mrelax-relocations=yes" {tlspic3.s tlspic2.s} {{readelf -WSsrl tlspic2.rd} {objdump -drj.text\ -Mintel64 tlspic2.dd} {objdump -sj.got tlspic2.sd} {objdump -sj.tdata tlspic2.td}} "libtlspic2.so"} {"TLS descriptor -fpic -shared transitions" - "-shared -melf_x86_64 --no-ld-generated-unwind-info --hash-style=sysv" "" + "-shared -melf_x86_64 --no-ld-generated-unwind-info \ + -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "--64" {tlsdesc.s tlspic2.s} {{readelf -WSsrld tlsdesc.rd} {objdump -drj.text tlsdesc.dd} {objdump "-s -j.got -j.got.plt" tlsdesc.sd} {objdump -sj.tdata tlsdesc.td} @@ -71,25 +78,29 @@ set x86_64tests { {"Helper shared library" "-shared -melf_x86_64" "" "--64" {tlslib.s} {} "libtlslib.so"} {"TLS -fpic and -fno-pic exec transitions" - "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info --hash-style=sysv" "" + "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info \ + -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "--64" {tlsbinpic.s tlsbin.s} {{readelf -WSsrl tlsbin.rd} {objdump -drj.text tlsbin.dd} {objdump -sj.got tlsbin.sd} {objdump -sj.tdata tlsbin.td}} "tlsbin"} {"TLS -fpic and -fno-pic exec transitions without PLT" - "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info --hash-style=sysv" "" + "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info \ + -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "-mrelax-relocations=yes --64" {tlsbinpic2.s tlsbin.s} {{readelf -WSsrl tlsbin2.rd} {objdump -drj.text tlsbin2.dd} {objdump -sj.got tlsbin2.sd} {objdump -sj.tdata tlsbin2.td}} "tlsbin2"} {"TLS descriptor -fpic and -fno-pic exec transitions" - "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info --hash-style=sysv" "" + "-melf_x86_64 tmpdir/libtlslib.so --no-ld-generated-unwind-info \ + -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "--64" {tlsbindesc.s tlsbin.s} {{readelf -WSsrl tlsbindesc.rd} {objdump -drj.text tlsbindesc.dd} {objdump -sj.got tlsbindesc.sd} {objdump -sj.tdata tlsbindesc.td}} "tlsbindesc"} {"TLS with global dynamic and descriptors" - "-shared -melf_x86_64 --no-ld-generated-unwind-info --hash-style=sysv" "" + "-shared -melf_x86_64 --no-ld-generated-unwind-info \ + -z noseparate-code -z max-page-size=0x200000 --hash-style=sysv" "" "--64" {tlsgdesc.s} {{readelf -WSsrl tlsgdesc.rd} {objdump -drj.text\ -Mintel64 tlsgdesc.dd}} "libtlsgdesc.so"} @@ -226,6 +237,13 @@ if [istarget "*-*-nacl*"] { # Change all the -melf_x86_64 to -melf_x86_64_nacl so linking can succeed. regsub -all -- $lhs $x86_64tests $rhs x86_64tests + set zlhs {-z noseparate-code -z max-page-size=0x200000} + set zrhs {} + + # Remove -z max-page-size=0x200000 -z noseparate-code since they + # generate different addresses for nacl targets. + regsub -all -- $zlhs $x86_64tests $zrhs x86_64tests + # Same, applied to all the run_dump_test cases. set options_regsub(ld) [list $lhs $rhs] @@ -339,6 +357,8 @@ run_dump_test "property-x86-4b" run_dump_test "property-x86-3-x32" run_dump_test "property-x86-4a-x32" run_dump_test "property-x86-4b-x32" +run_dump_test "property-x86-5" +run_dump_test "property-x86-5-x32" run_dump_test "property-x86-ibt1a" run_dump_test "property-x86-ibt1b" run_dump_test "property-x86-ibt1a-x32" @@ -379,6 +399,28 @@ run_dump_test "pr22115-1c-x32" run_dump_test "pr22115-1d" run_dump_test "pr22115-1d-x32" run_dump_test "pr22135" +run_dump_test "pr22782a" +run_dump_test "pr22782b" +run_dump_test "pr23189" +run_dump_test "pr23194" +run_dump_test "pr23324a" +run_dump_test "pr23324b" +run_dump_test "pr23372a" +run_dump_test "pr23372a-x32" +run_dump_test "pr23372b" +run_dump_test "pr23372b-x32" +run_dump_test "pr23372c" +run_dump_test "pr23372c-x32" +run_dump_test "pr23372d" +run_dump_test "pr23372d-x32" +run_dump_test "pr23486a" +run_dump_test "pr23486a-x32" +run_dump_test "pr23486b" +run_dump_test "pr23486b-x32" +run_dump_test "pr23486c" +run_dump_test "pr23486c-x32" +run_dump_test "pr23486d" +run_dump_test "pr23486d-x32" if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { return @@ -589,6 +631,7 @@ run_dump_test "pr20253-5a" run_dump_test "pr20253-5b" run_dump_test "tlsdesc2" run_dump_test "pr22048" +run_dump_test "pr22929" proc undefined_weak {cflags ldflags} { set testname "Undefined weak symbol" @@ -669,7 +712,8 @@ if { [isnative] && [which $CC] != 0 } { run_ld_link_tests { {"X32 DSO from x86-64 object" - "-shared -melf32_x86_64 tmpdir/simple-x32.o" "" "--x32" + "-shared -melf32_x86_64 tmpdir/simple-x32.o" "" + "--x32 -mx86-used-note=yes" {dummy.s} {{readelf {-s --wide} x86-64-x32.rd}} "x86-64-x32"} } @@ -677,7 +721,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-lib.so" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { plt-lib.c } \ {} \ "libplt-lib.so" \ @@ -685,7 +729,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build libplt-main1.a" \ "" \ - "-fPIC -Wa,-mrelax-relocations=yes" \ + "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \ { plt-main1.c } \ {{readelf {-Wr} plt-main1.rd}} \ "libplt-main1.a" \ @@ -693,7 +737,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build libplt-main2.a" \ "" \ - "-fPIC -Wa,-mrelax-relocations=yes" \ + "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \ { plt-main2.c } \ {{readelf {-Wr} plt-main2.rd}} \ "libplt-main2.a" \ @@ -701,7 +745,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build libplt-main3.a" \ "" \ - "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \ + "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes $PLT_CFLAGS" \ { plt-main3.c } \ {{readelf {-Wr} plt-main3.rd}} \ "libplt-main3.a" \ @@ -709,7 +753,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build libplt-main4.a" \ "" \ - "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \ + "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes $PLT_CFLAGS" \ { plt-main4.c } \ {{readelf {-Wr} plt-main4.rd}} \ "libplt-main4.a" \ @@ -727,7 +771,7 @@ if { [isnative] && [which $CC] != 0 } { "Build plt-main with PIE" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so -pie" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { plt-main5.c } \ {{readelf {-Wr} plt-main.rd}} \ "plt-main" \ @@ -735,7 +779,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build copyreloc-lib.so" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { copyreloc-lib.c } \ {} \ "copyreloc-lib.so" \ @@ -743,7 +787,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build libcopyreloc-main.a" \ "" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { copyreloc-main.S } \ {} \ "libcopyreloc-main.a" \ @@ -751,7 +795,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build copyreloc-main with PIE without -fPIE (1)" \ "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ {{readelf {-Wr} copyreloc-main1.rd}} \ "copyreloc-main" \ @@ -759,7 +803,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build copyreloc-main with PIE without -fPIE (2)" \ "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ {{readelf {-Wr} copyreloc-main2.rd}} \ "copyreloc-main" \ @@ -767,7 +811,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr17689.so" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { pr17689a.c } \ {} \ "pr17689.so" \ @@ -775,7 +819,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr17689now.so with -z now" \ "-shared -Wl,-z,now" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { pr17689a.c } \ {{readelf {-Wr} pr17689now.rd}} \ "pr17689now.so" \ @@ -783,14 +827,14 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr17689b.o" \ "" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr17689b.S } \ {} \ ] \ [list \ "Build pr17689 with PIE without -fPIE" \ "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ {{readelf {-Wr} pr17689.rd}} \ "pr17689" \ @@ -798,7 +842,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr17689 with PIE -z now without -fPIE" \ "tmpdir/pr17689b.o tmpdir/pr17689.so -pie -Wl,-z,now" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ {{readelf {-Wr} pr17689now.rd}} \ "pr17689now" \ @@ -806,7 +850,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr17827 with PIE without -fPIE" \ "-Wl,--as-needed tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ {{readelf {-Wr} pr17827.rd}} \ "pr17827" \ @@ -814,7 +858,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr18900.so" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { pr18900a.c } \ "" \ "pr18900.so" \ @@ -822,7 +866,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr18900.o" \ "-r -nostdlib" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr18900b.c pr18900c.c } \ "" \ "pr18900.o" \ @@ -830,7 +874,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr18900a" \ "tmpdir/pr18900.o tmpdir/pr18900.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ {{readelf {-Wrd} pr18900a.rd}} \ "pr18900a" \ @@ -838,7 +882,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr18900b" \ "-Wl,--as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ {{readelf {-Wrd} pr18900b.rd}} \ "pr18900b" \ @@ -846,7 +890,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr19031.so" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { pr19031a.c } \ "" \ "pr19031.so" \ @@ -854,7 +898,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build gotpcrel1d.so" \ "-shared" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { gotpcrel1d.S } \ "" \ "gotpcrel1d.so" \ @@ -862,7 +906,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build gotpcrel1a.o gotpcrel1b.o gotpcrel1c.o" \ "" \ - "-Wa,-mrelax-relocations=yes" \ + "-Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \ { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \ ] \ [list \ @@ -870,15 +914,15 @@ if { [isnative] && [which $CC] != 0 } { "$NOPIE_LDFLAGS -Wl,--as-needed tmpdir/gotpcrel1a.o \ tmpdir/gotpcrel1b.o tmpdir/gotpcrel1c.o \ tmpdir/gotpcrel1d.so" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ - "" \ {{objdump {-dw} gotpcrel1.dd}} \ "gotpcrel1" \ ] \ [list \ "Build pr19319.so" \ "-shared" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr19319a.S } \ "" \ "pr19319.so" \ @@ -886,7 +930,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr19319" \ "-pie -nostdlib -nostartfiles tmpdir/pr19319.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr19319b.S } \ {{objdump {-dw} pr19319.dd}} \ "pr19319" \ @@ -894,7 +938,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 1" \ "" \ - "" \ + "-Wa,-mx86-used-note=no" \ {pass.c property-no-copy.S} \ {{readelf {-n} property-1.r}} \ "property-1" \ @@ -902,15 +946,15 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 1 (.o)" \ "-r -nostdlib" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-no-copy.S} \ - {{readelf {-n} property-1.r}} \ + {{readelf {-n} property-1a.r}} \ "property-1.o" \ ] \ [list \ "Build property 1 (.so)" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=no" \ {pass.c property-no-copy.S} \ {{readelf {-n} property-1.r}} \ "property-1.so" \ @@ -918,7 +962,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 2" \ "" \ - "" \ + "-Wa,-mx86-used-note=no" \ {pass.c property-stack.S} \ {{readelf {-n} property-2.r}} \ "property-2" \ @@ -926,15 +970,15 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 2 (.o)" \ "-r -nostdlib" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-stack.S} \ - {{readelf {-n} property-2.r}} \ + {{readelf {-n} property-2a.r}} \ "property-2.o" \ ] \ [list \ "Build property 2 (.so)" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ {pass.c property-stack.S} \ {{readelf {-n} property-2.r}} \ "property-2.so" \ @@ -942,7 +986,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 3" \ "" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-stack.S property-x86-1.S} \ {{readelf {-n} property-3.r}} \ "property-3" \ @@ -950,15 +994,15 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 3 (.o)" \ "-r -nostdlib" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-x86-1.S property-stack.S} \ - {{readelf {-n} property-3.r}} \ + {{readelf {-n} property-3a.r}} \ "property-3.o" \ ] \ [list \ "Build property 3 (.so)" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ {property-x86-1.S pass.c property-stack.S} \ {{readelf {-n} property-3.r}} \ "property-3.so" \ @@ -966,7 +1010,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 4" \ "" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-stack.S property-x86-1.S property-x86-2.S} \ {{readelf {-n} property-4.r}} \ "property-4" \ @@ -974,15 +1018,15 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 4 (.o)" \ "-r -nostdlib" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-x86-2.S property-x86-1.S property-stack.S} \ - {{readelf {-n} property-4.r}} \ + {{readelf {-n} property-4a.r}} \ "property-4.o" \ ] \ [list \ "Build property 4 (.so)" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ {property-x86-2.S property-x86-1.S pass.c property-stack.S} \ {{readelf {-n} property-4.r}} \ "property-4.so" \ @@ -990,7 +1034,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 4 (-Wl,-z,stack-size=0)" \ "-Wl,-z,stack-size=0" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-stack.S property-x86-1.S property-x86-2.S} \ {{readelf {-n} property-4.r}} \ "property-4" \ @@ -998,7 +1042,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build 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} \ {{readelf {-n} property-5.r}} \ "property-5" \ @@ -1006,15 +1050,15 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property 5 (.o)" \ "-r -nostdlib -Wl,-z,stack-size=0x900000" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-x86-2.S property-x86-1.S property-stack.S} \ - {{readelf {-n} property-5.r}} \ + {{readelf {-n} property-5a.r}} \ "property-5.o" \ ] \ [list \ "Build property 5 (.so)" \ "-shared -Wl,-z,stack-size=0x900000" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ {property-x86-2.S property-x86-1.S pass.c property-stack.S} \ {{readelf {-n} property-5.r}} \ "property-5.so" \ @@ -1022,7 +1066,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property-6.so" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ {property-6a.c property-6c.S} \ {{readelf {-n} property-6.r}} \ "property-6.so" \ @@ -1030,39 +1074,39 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build property-6.o" \ "-r -nostdlib" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {property-6b.c property-stack.S} \ - {{readelf {-n} property-2.r}} \ + {{readelf {-n} property-2a.r}} \ "property-6.o" \ ] \ [list \ "Build property-6" \ "-Wl,--as-needed tmpdir/property-6.o tmpdir/property-6.so" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ - "" \ {{readelf {-n} property-2.r}} \ "property-6" \ ] \ [list \ "Build property 7a (.o)" \ "-r -nostdlib" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {property-unsorted-1.S} \ - {{readelf {-n} property-7.r}} \ + {{readelf {-n} property-7a.r}} \ "property-7a.o" \ ] \ [list \ "Build property 7b (.o)" \ "-r -nostdlib" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {property-unsorted-2.S} \ - {{readelf {-n} property-7.r}} \ + {{readelf {-n} property-7a.r}} \ "property-7b.o" \ ] \ [list \ "Build pr22001-1.so" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { pr22001-1a.c } \ {} \ "pr22001-1.so" \ @@ -1070,7 +1114,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr22001-1a" \ "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ - "$NOPIE_CFLAGS" \ + "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ { pr22001-1b.c } \ {{error_output "pr22001-1a.err"}} \ "pr22001-1a" \ @@ -1078,7 +1122,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr21997-1.so" \ "-shared" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { property-stack.S property-no-copy.S pr21997-1a.S } \ {} \ "pr21997-1.so" \ @@ -1086,7 +1130,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr21997-1a" \ "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \ - "$NOPIE_CFLAGS" \ + "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ { pr21997-1b.c } \ {{error_output "pr21997-1a.err"}} \ "pr21997-1a" \ @@ -1094,17 +1138,117 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr22064a.o" \ "" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr22064a.S } \ ] \ [list \ "Build pr22064.so" \ "-shared" \ - "-fPIC" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { pr22064b.c } \ {} \ "pr22064.so" \ ] \ + [list \ + "Build pr22393-3a.so" \ + "-shared -Wl,-z,separate-code,-z,max-page-size=0x1000" \ + "-fPIC -Wa,-mx86-used-note=yes" \ + {pr22393-3a.c} \ + {{readelf -lW pr22393-3a.rd} \ + {readelf -lW pr22393-3b.rd}} \ + "pr22393-3a.so" \ + ] \ + [list \ + "Build pr22393-3a-now.so" \ + "-shared -Wl,-z,separate-code,-z,now,-z,max-page-size=0x1000" \ + "-fPIC -Wa,-mx86-used-note=yes" \ + {pr22393-3a.c} \ + {{readelf -lW pr22393-3a.rd} \ + {readelf -lW pr22393-3b.rd}} \ + "pr22393-3a-now.so" \ + ] \ + [list \ + "Build pr22393-3" \ + "$NOPIE_LDFLAGS -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a.so" \ + "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ + {pr22393-3b.c} \ + {{readelf -lW pr22393-3a.rd} \ + {readelf -lW pr22393-3b.rd}} \ + "pr22393-3" \ + ] \ + [list \ + "Build pr22393-3 (PIE)" \ + "-pie -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a-now.so" \ + "-fPIE -Wa,-mx86-used-note=yes" \ + {pr22393-3b.c} \ + {{readelf -lW pr22393-3a.rd} \ + {readelf -lW pr22393-3b.rd}} \ + "pr22393-3-pie" \ + ] \ + [list \ + "Build pr22393-3 (static)" \ + "-static -Wl,-z,separate-code,-z,max-page-size=0x1000" \ + "-Wa,-mx86-used-note=yes" \ + {pr22393-3a.c pr22393-3b.c} \ + {{readelf -lW pr22393-3a.rd} \ + {readelf -lW pr22393-3b.rd}} \ + "pr22393-3-static" \ + ] \ + [list \ + "Build pr22791-1.so" \ + "-shared" \ + "-fPIC -Wa,-mx86-used-note=yes" \ + { pr22791-1a.c } \ + {} \ + "pr22791-1.so" \ + ] \ + [list \ + "Build pr22791-1" \ + "-pie -Wl,--no-as-needed tmpdir/pr22791-1.so" \ + "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ + { pr22791-1b.s } \ + {{error_output "pr22791-1.err"}} \ + "pr22791-1" \ + ] \ + [list \ + "Build pr22791-2a.o" \ + "" \ + "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ + { pr22791-2a.s } \ + ] \ + [list \ + "Build pr22791-2.so" \ + "-shared tmpdir/pr22791-2a.o" \ + "-fPIC -Wa,-mx86-used-note=yes" \ + { pr22791-2b.c } \ + {{readelf -drW pr22791-2.rd}} \ + "pr22791-2.so" \ + ] \ + [list \ + "Build pr22791-2" \ + "-pie -Wl,--no-as-needed tmpdir/pr22791-2.so" \ + "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ + { pr22791-2c.s } \ + {{readelf -drW pr22791-2.rd}} \ + "pr22791-2" \ + ] \ + [list \ + "Build pr22842.so" \ + "-shared" \ + "-fPIC -Wa,-mx86-used-note=yes" \ + { pr22842a.c } \ + {} \ + "pr22842.so" \ + ] \ + [list \ + "Build pr22842" \ + "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \ + "-Wa,-mx86-used-note=yes" \ + { pr22842b.S } \ + {{readelf -rW pr22842a.rd} \ + {readelf -rW pr22842b.rd}} \ + "pr22842" \ + ] \ ] if {[istarget "x86_64-*-linux*-gnux32"]} { @@ -1112,7 +1256,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr22001-1b" \ "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr22001-1c.c } \ "pr22001-1b" \ "pass.out" \ @@ -1121,7 +1265,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21997-1b" \ "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21997-1c.c } \ "pr21997-1b" \ "pass.out" \ @@ -1133,7 +1277,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr22001-1b" \ "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ - "$NOPIE_CFLAGS" \ + "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ { pr22001-1c.c } \ {{error_output "pr22001-1b.err"}} \ "pr22001-1b" \ @@ -1141,7 +1285,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr21997-1b" \ "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \ - "$NOPIE_CFLAGS" \ + "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \ { pr21997-1c.c } \ {{error_output "pr21997-1b.err"}} \ "pr21997-1b" \ @@ -1154,7 +1298,7 @@ if { [isnative] && [which $CC] != 0 } { "Run plt-main" \ "-Wl,--no-as-needed tmpdir/plt-main1.o tmpdir/plt-main2.o \ tmpdir/plt-main3.o tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main" \ "plt-main.out" \ @@ -1163,7 +1307,7 @@ if { [isnative] && [which $CC] != 0 } { "Run plt-main with PIE" \ "-Wl,--no-as-needed -pie tmpdir/plt-main1.o tmpdir/plt-main2.o \ tmpdir/plt-main3.o tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-pie" \ "plt-main.out" \ @@ -1172,7 +1316,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run copyreloc-main with PIE without -fPIE" \ "-Wl,--as-needed -pie tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ "copyreloc-main" \ "copyreloc-main.out" \ @@ -1180,7 +1324,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr17689 with PIE without -fPIE" \ "-Wl,--no-as-needed -pie tmpdir/pr17689b.o tmpdir/pr17689.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ "pr17689" \ "pr17689.out" \ @@ -1188,7 +1332,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr17689 with PIE -z now without -fPIE" \ "-Wl,--as-needed,-z,now -pie tmpdir/pr17689b.o tmpdir/pr17689.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ "pr17689now" \ "pr17689.out" \ @@ -1196,7 +1340,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr18900" \ "-Wl,--no-as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ "pr18900" \ "pr18900.out" \ @@ -1204,7 +1348,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr19031" \ "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr19031.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr19031b.S pr19031c.c } \ "pr19031" \ "pr19031.out" \ @@ -1213,7 +1357,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run gotpcrel1" \ "-Wl,--no-as-needed tmpdir/gotpcrel1d.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \ "gotpcrel1" \ "gotpcrel1.out" \ @@ -1221,112 +1365,112 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run property 1" \ "" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-no-copy.S} \ "property-1" "pass.out" \ ] \ [list \ "Run property 1 (PIE)" \ "-pie" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-no-copy.S} \ "property-1-pie" "pass.out" "-fPIE" \ ] \ [list \ "Run property 1 (static)" \ "-static" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-no-copy.S} \ "property-1-static" "pass.out" \ ] \ [list \ "Run property 2" \ "" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-stack.S} \ "property-2" "pass.out" \ ] \ [list \ "Run property 2 (PIE)" \ "-pie" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {pass.c property-stack.S} \ "property-2-pie" "pass.out" "-fPIE" \ ] \ [list \ "Run property 2 (static)" \ "-static" \ - "" \ + "-Wa,-mx86-used-note=yes" \ {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" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr22001-1b.c } \ "pr22001-1a-pic-1" \ "pass.out" \ @@ -1335,7 +1479,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr22001-1a (PIC 2)" \ "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr22001-1b.c } \ "pr22001-1a-pic-2" \ "pass.out" \ @@ -1344,7 +1488,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr22001-1b (PIC 1)" \ "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr22001-1c.c } \ "pr22001-1b-pic-1" \ "pass.out" \ @@ -1353,7 +1497,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr22001-1b (PIC 2)" \ "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr22001-1c.c } \ "pr22001-1b-pic-2" \ "pass.out" \ @@ -1362,7 +1506,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21997-1a (PIC 1)" \ "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21997-1b.c } \ "pr21997-1a-pic-1" \ "pass.out" \ @@ -1371,7 +1515,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21997-1a (PIC 2)" \ "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21997-1b.c } \ "pr21997-1a-pic-2" \ "pass.out" \ @@ -1380,7 +1524,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21997-1b (PIC 1)" \ "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21997-1c.c } \ "pr21997-1b-pic-1" \ "pass.out" \ @@ -1389,7 +1533,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21997-1b (PIC 2)" \ "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21997-1c.c } \ "pr21997-1b-pic-2" \ "pass.out" \ @@ -1398,12 +1542,55 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr22064" \ "-pie -Wl,--no-as-needed tmpdir/pr22064a.o tmpdir/pr22064.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ "pr22064-pie" \ "pass.out" \ "-fPIE" \ ] \ + [list \ + "Run pr22393-3" \ + "$NOPIE_LDFLAGS -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a.so" \ + "-Wa,-mx86-used-note=yes" \ + {pr22393-3b.c} \ + "pr22393-3" \ + "pass.out" \ + "$NOPIE_CFLAGS" \ + ] \ + [list \ + "Run pr22393-3 (PIE)" \ + "-pie -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a-now.so" \ + "-Wa,-mx86-used-note=yes" \ + {pr22393-3b.c} \ + "pr22393-3-pie" \ + "pass.out" \ + "-fPIE" \ + ] \ + [list \ + "Run pr22393-3 (static)" \ + "-static -Wl,-z,separate-code,-z,max-page-size=0x1000" \ + "-Wa,-mx86-used-note=yes" \ + {pr22393-3a.c pr22393-3b.c} \ + "pr22393-3-static" \ + "pass.out" \ + ] \ + [list \ + "Run pr22791-2" \ + "-pie -Wl,--no-as-needed tmpdir/pr22791-2.so" \ + "-Wa,-mx86-used-note=yes" \ + { pr22791-2c.s } \ + "pr22791-2" \ + "pass.out" \ + "$NOPIE_CFLAGS" \ + ] \ + [list \ + "Build pr22842" \ + "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \ + "-Wa,-mx86-used-note=yes" \ + { pr22842b.S } \ + "pr22842" \ + "pass.out" \ + ] \ ] # Run-time tests which require working ifunc attribute support. @@ -1412,7 +1599,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build libpr19784a.so" \ "-shared -Wl,-Bsymbolic-functions" \ - "-fPIC -O2 -g" \ + "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \ { pr19784b.c pr19784c.c } \ {} \ "libpr19784a.so" \ @@ -1420,7 +1607,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build libpr19784b.so" \ "-shared -Wl,-Bsymbolic-functions" \ - "-fPIC -O2 -g" \ + "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \ { pr19784c.c pr19784b.c } \ {} \ "libpr19784b.so" \ @@ -1428,7 +1615,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build pr19784a.o" \ "" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr19784a.c } \ ] \ ] @@ -1437,7 +1624,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr19784a" \ "-Wl,--no-as-needed tmpdir/pr19784a.o tmpdir/libpr19784a.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ "pr19784a" \ "pass.out" \ @@ -1445,7 +1632,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr19784b" \ "-Wl,--as-needed tmpdir/pr19784a.o tmpdir/libpr19784b.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { dummy.s } \ "pr19784b" \ "pass.out" \ @@ -1460,8 +1647,9 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-main with -z bndplt" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ - tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt" \ - "" \ + tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt \ + -z noseparate-code -z max-page-size=0x200000" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ {{objdump {-drw} plt-main-bnd.dd}} \ "plt-main-bnd" \ @@ -1469,8 +1657,9 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-main with PIE and -z bndplt" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ - tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -pie" \ - "-fPIC" \ + tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -pie \ + -z noseparate-code -z max-page-size=0x200000" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { plt-main5.c } \ {{objdump {-drw} plt-main-bnd.dd}} \ "plt-main-pie-bnd" \ @@ -1478,8 +1667,9 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-main with -z bndplt -z now" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ - tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now" \ - "" \ + tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now \ + -z noseparate-code -z max-page-size=0x200000" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \ "plt-main-bnd-now" \ @@ -1487,8 +1677,9 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-main with PIE and -z bndplt -z now" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ - tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now -pie" \ - "-fPIC" \ + tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now -pie \ + -z noseparate-code -z max-page-size=0x200000" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { plt-main5.c } \ {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \ "plt-main-pie-bnd-now" \ @@ -1501,7 +1692,7 @@ if { [isnative] && [which $CC] != 0 } { "-Wl,--no-as-needed,-z,bndplt tmpdir/plt-main1.o \ tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-bnd" \ "plt-main.out" \ @@ -1511,7 +1702,7 @@ if { [isnative] && [which $CC] != 0 } { "-Wl,--no-as-needed,-z,bndplt -pie tmpdir/plt-main1.o \ tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-pie-bnd" \ "plt-main.out" \ @@ -1522,7 +1713,7 @@ if { [isnative] && [which $CC] != 0 } { "-Wl,--no-as-needed,-z,bndplt,-z,now tmpdir/plt-main1.o \ tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-bnd-now" \ "plt-main.out" \ @@ -1532,7 +1723,7 @@ if { [isnative] && [which $CC] != 0 } { "-Wl,--no-as-needed,-z,bndplt,-z,now -pie tmpdir/plt-main1.o \ tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-pie-bnd-now" \ "plt-main.out" \ @@ -1541,7 +1732,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr20800" \ "-Wl,-z,now -pie" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr20800a.S pr20800b.S } \ "pr20800" \ "pass.out" \ @@ -1552,7 +1743,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21481a" \ "$NOPIE_LDFLAGS -Wl,-z,bndplt" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21481a.c pr21481b.S } \ "pr21481a" \ "pass.out" \ @@ -1561,7 +1752,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21481b" \ "$NOPIE_LDFLAGS -Wl,-z,bndplt,-z,now" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21481a.c pr21481b.S } \ "pr21481b" \ "pass.out" \ @@ -1583,8 +1774,9 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-main with -z ibtplt" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ - tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt" \ - "" \ + tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt \ + -z noseparate-code -z max-page-size=0x200000" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ $pltdump \ "plt-main-ibt" \ @@ -1592,8 +1784,9 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-main with PIE and -z ibtplt" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ - tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -pie" \ - "-fPIC" \ + tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -pie \ + -z noseparate-code -z max-page-size=0x200000" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { plt-main5.c } \ $pltdump \ "plt-main-pie-ibt" \ @@ -1601,8 +1794,9 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-main with -z ibtplt -z now" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ - tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now" \ - "" \ + tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now \ + -z noseparate-code -z max-page-size=0x200000" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ $pltsecdump \ "plt-main-ibt-now" \ @@ -1610,24 +1804,27 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Build plt-main with PIE and -z ibtplt -z now" \ "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \ - tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now -pie" \ - "-fPIC" \ + tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now -pie \ + -z noseparate-code -z max-page-size=0x200000" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { plt-main5.c } \ $pltsecdump \ "plt-main-pie-ibt-now" \ ] \ [list \ "Build libibtplt-lib.so with -z ibtplt" \ - "-shared -z ibtplt" \ - "-fPIC" \ + "-shared -z ibtplt \ + -z noseparate-code -z max-page-size=0x200000" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \ $pltdump \ "libibtplt-lib.so" \ ] \ [list \ "Build libibtplt--now-lib.so with -z ibtplt -z now" \ - "-shared -z ibtplt -z now" \ - "-fPIC" \ + "-shared -z ibtplt -z now \ + -z noseparate-code -z max-page-size=0x200000" \ + "-fPIC -Wa,-mx86-used-note=yes" \ { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \ $pltdump \ "libibtplt-now-lib.so" \ @@ -1640,7 +1837,7 @@ if { [isnative] && [which $CC] != 0 } { "-Wl,--no-as-needed,-z,ibtplt tmpdir/plt-main1.o \ tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-ibt" \ "plt-main.out" \ @@ -1650,7 +1847,7 @@ if { [isnative] && [which $CC] != 0 } { "-Wl,--no-as-needed,-z,ibtplt -pie tmpdir/plt-main1.o \ tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-pie-ibt" \ "plt-main.out" \ @@ -1661,7 +1858,7 @@ if { [isnative] && [which $CC] != 0 } { "-Wl,--no-as-needed,-z,ibtplt,-z,now tmpdir/plt-main1.o \ tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-ibt-now" \ "plt-main.out" \ @@ -1671,7 +1868,7 @@ if { [isnative] && [which $CC] != 0 } { "-Wl,--no-as-needed,-z,ibtplt,-z,now -pie tmpdir/plt-main1.o \ tmpdir/plt-main2.o tmpdir/plt-main3.o \ tmpdir/plt-main4.o tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-pie-ibt-now" \ "plt-main.out" \ @@ -1681,7 +1878,7 @@ if { [isnative] && [which $CC] != 0 } { "Run plt-main with libibtplt-lib.so -z ibtplt" \ "-Wl,--no-as-needed,-z,ibtplt tmpdir/libibtplt-lib.so \ tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-ibt-lib" \ "plt-main.out" \ @@ -1690,7 +1887,7 @@ if { [isnative] && [which $CC] != 0 } { "Run plt-main with libibtplt-lib.so -z ibtplt -z now" \ "-Wl,--no-as-needed,-z,ibtplt,-z,now \ tmpdir/libibtplt-now-lib.so tmpdir/libplt-lib.so" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { plt-main5.c } \ "plt-main-ibt-now-lib" \ "plt-main.out" \ @@ -1702,7 +1899,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21481a" \ "$NOPIE_LDFLAGS -Wl,-z,ibtplt" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21481a.c pr21481b.S } \ "pr21481a" \ "pass.out" \ @@ -1711,7 +1908,7 @@ if { [isnative] && [which $CC] != 0 } { [list \ "Run pr21481b" \ "$NOPIE_LDFLAGS -Wl,-z,ibtplt,-z,now" \ - "" \ + "-Wa,-mx86-used-note=yes" \ { pr21481a.c pr21481b.S } \ "pr21481b" \ "pass.out" \ @@ -1729,13 +1926,15 @@ if { [isnative] && [which $CC] != 0 } { } if { ![istarget "x86_64-*-linux*"]} { + set ASFLAGS "$saved_ASFLAGS" return } run_ld_link_tests [list \ [list \ "basic PLT generation (-z now)" \ - "-z now -melf_x86_64 --hash-style=sysv tmpdir/libpltlib.so" \ + "-z now -melf_x86_64 --hash-style=sysv tmpdir/libpltlib.so \ + -z noseparate-code -z max-page-size=0x200000" \ "" \ "--64" \ {plt2.s} \ @@ -1746,7 +1945,7 @@ run_ld_link_tests [list \ "Build pr21626.so" \ "-shared -melf_x86_64" \ "" \ - "--64 -defsym __64_bit__=1" \ + "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \ {property-x86-3.s} \ "" \ "pr21626.so" \ @@ -1755,7 +1954,7 @@ run_ld_link_tests [list \ "Build pr21626" \ "-melf_x86_64 tmpdir/pr21626.so" \ "" \ - "--64" \ + "--64 -mx86-used-note=yes" \ {start.s foo.s} \ "" \ "pr21626" \ @@ -1798,3 +1997,5 @@ run_dump_test "ibt-plt-3a-x32" run_dump_test "ibt-plt-3b-x32" run_dump_test "ibt-plt-3c-x32" run_dump_test "ibt-plt-3d-x32" + +set ASFLAGS "$saved_ASFLAGS"