Adjust linker tests that are sensitive to --rosegment

diff --git a/ld/testsuite/ld-elf/mbind1b.d b/ld/testsuite/ld-elf/mbind1b.d
index 137f8b67a031f03b3749f0bf9cd52e18ff46b3ec..e1f998a9f899761c36b4e3b170d2ed6a5f12fa4b 100644 (file)
--- a/ld/testsuite/ld-elf/mbind1b.d
+++ b/ld/testsuite/ld-elf/mbind1b.d
@@ -1,5 +1,5 @@
 #source: mbind1.s
-#ld: -shared -z common-page-size=0x1000 -z max-page-size=0x200000
+#ld: -shared -z common-page-size=0x1000 -z max-page-size=0x200000 --no-rosegment
 #readelf: -S -l --wide
 #target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_shared_lib_support] 

diff --git a/ld/testsuite/ld-elf/mbind1c.d b/ld/testsuite/ld-elf/mbind1c.d
index 9cc333e9f7931ac348e1020cdbb5bd5b82fe1e12..dcae3c0f193e644d495880eab6c973480acd640f 100644 (file)
--- a/ld/testsuite/ld-elf/mbind1c.d
+++ b/ld/testsuite/ld-elf/mbind1c.d
@@ -1,5 +1,5 @@
 #source: mbind1.s
-#ld: -pie -z common-page-size=0x1000 -z max-page-size=0x200000
+#ld: -pie -z common-page-size=0x1000 -z max-page-size=0x200000 --no-rosegment
 #readelf: -S -l --wide
 #target: *-*-linux* *-*-gnu* arm*-*-uclinuxfdpiceabi
 #xfail: ![check_pie_support] 

diff --git a/ld/testsuite/ld-elf/pr30508.d b/ld/testsuite/ld-elf/pr30508.d
index aca9a83dcf63d18a083f789e621a82064c9ef323..325ff40f56299b478a1acc3b955fad4bcd469317 100644 (file)
--- a/ld/testsuite/ld-elf/pr30508.d
+++ b/ld/testsuite/ld-elf/pr30508.d
@@ -1,4 +1,4 @@
-#ld: -z separate-code
+#ld: -z separate-code --no-rosegment
 #objcopy_linked_file: -R .foo
 #readelf: -lW
 #target: *-*-linux-gnu *-*-gnu* *-*-nacl* arm*-*-uclinuxfdpiceabi

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 18d1c9198ca9266c5cc9e19248f8d244293ed5c6..940198812641e1ded2dd4097beb22ed08a92d6e6 100644 (file)
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -191,7 +191,7 @@ set i386tests {
     {"Reloc section order"
      "-shared -melf_i386 -z nocombreloc -z notext" "" "--32"
      {reloc.s} {{objdump -hw reloc.d}} "reloc.so"}
-    {"Basic --emit-relocs support" "-shared -melf_i386 --emit-relocs" "" "--32"
+    {"Basic --emit-relocs support" "-shared -melf_i386 --emit-relocs --no-rosegment" "" "--32"
      {emit-relocs.s} {{readelf --relocs emit-relocs.rd}} "emit-relocs.so"}
     {"-z combreloc relocation sections" "-shared -melf_i386 -z combreloc" ""
      "--32" {combreloc.s} {{readelf -r combreloc.d}} "combreloc.so"}

diff --git a/ld/testsuite/ld-x86-64/ilp32-4.d b/ld/testsuite/ld-x86-64/ilp32-4.d
index ad5c9cdf858673edc78025eacb12bbe0554c1dbb..e737aa49b658a160774640b7b9ff9f39f6a99dc2 100644 (file)
--- a/ld/testsuite/ld-x86-64/ilp32-4.d
+++ b/ld/testsuite/ld-x86-64/ilp32-4.d
@@ -1,5 +1,5 @@
 #as: --x32
-#ld: -m elf32_x86_64 -shared --no-ld-generated-unwind-info --hash-style=sysv $NO_DT_RELR_LDFLAGS
+#ld: -m elf32_x86_64 -shared --no-ld-generated-unwind-info --hash-style=sysv $NO_DT_RELR_LDFLAGS --no-rosegment
 #readelf: -d -S --wide
 #target: x86_64-*-linux*
 

diff --git a/ld/testsuite/ld-x86-64/mark-plt-1a-x32.d b/ld/testsuite/ld-x86-64/mark-plt-1a-x32.d
index 2051356be734205bb2484203458c08cdb895f35d..4bef117dd0c3c3471be165f2fbe6cd8751bac680 100644 (file)
--- a/ld/testsuite/ld-x86-64/mark-plt-1a-x32.d
+++ b/ld/testsuite/ld-x86-64/mark-plt-1a-x32.d
@@ -1,6 +1,6 @@
 #source: mark-plt-1.s
 #as: --x32
-#ld: -melf32_x86_64 -shared -z mark-plt
+#ld: -melf32_x86_64 -shared -z mark-plt --no-rosegment
 #readelf: -drW
 
 #...

diff --git a/ld/testsuite/ld-x86-64/mark-plt-1a.d b/ld/testsuite/ld-x86-64/mark-plt-1a.d
index a252e95e7591d646b42e2dd1c8eda9ce71643fd2..f6b246ef23053f285301a42d41ee0971e4b64483 100644 (file)
--- a/ld/testsuite/ld-x86-64/mark-plt-1a.d
+++ b/ld/testsuite/ld-x86-64/mark-plt-1a.d
@@ -1,6 +1,6 @@
 #source: mark-plt-1.s
 #as: --64
-#ld: -melf_x86_64 -shared -z mark-plt
+#ld: -melf_x86_64 -shared -z mark-plt --no-rosegment
 #readelf: -drW
 
 #...

diff --git a/ld/testsuite/ld-x86-64/mark-plt-1b-x32.d b/ld/testsuite/ld-x86-64/mark-plt-1b-x32.d
index 848d45e1e43d5a0349d75b8a4bd33aa6b4ba3c6f..d105768bed3c2c128e1794ad6e729bcc2bb2e3f4 100644 (file)
--- a/ld/testsuite/ld-x86-64/mark-plt-1b-x32.d
+++ b/ld/testsuite/ld-x86-64/mark-plt-1b-x32.d
@@ -1,6 +1,6 @@
 #source: mark-plt-1.s
 #as: --x32
-#ld: -melf32_x86_64 -shared -z mark-plt --hash-style=both
+#ld: -melf32_x86_64 -shared -z mark-plt --hash-style=both --no-rosegment
 #objdump: -dw
 
 #...

diff --git a/ld/testsuite/ld-x86-64/mark-plt-1b.d b/ld/testsuite/ld-x86-64/mark-plt-1b.d
index a5c6931fd2ae4c5f22a1159bcbb459ead2afb813..9af69fdbbb287518547939114c60118a8457f8da 100644 (file)
--- a/ld/testsuite/ld-x86-64/mark-plt-1b.d
+++ b/ld/testsuite/ld-x86-64/mark-plt-1b.d
@@ -1,6 +1,6 @@
 #source: mark-plt-1.s
 #as: --64
-#ld: -melf_x86_64 -shared -z mark-plt --hash-style=both
+#ld: -melf_x86_64 -shared -z mark-plt --hash-style=both --no-rosegment
 #objdump: -dw
 
 #...

diff --git a/ld/testsuite/ld-x86-64/mark-plt-1c-x32.d b/ld/testsuite/ld-x86-64/mark-plt-1c-x32.d
index 6354dc3bd954cfd12bb67a3fcffc493f608fc343..6ea71a1e7f899667b7fa3e5bd4a1efa55d26f1fa 100644 (file)
--- a/ld/testsuite/ld-x86-64/mark-plt-1c-x32.d
+++ b/ld/testsuite/ld-x86-64/mark-plt-1c-x32.d
@@ -1,6 +1,6 @@
 #source: mark-plt-1.s
 #as: --x32
-#ld: -melf32_x86_64 -shared -z mark-plt -z ibtplt
+#ld: -melf32_x86_64 -shared -z mark-plt -z ibtplt --no-rosegment
 #readelf: -drW
 
 #...

diff --git a/ld/testsuite/ld-x86-64/mark-plt-1c.d b/ld/testsuite/ld-x86-64/mark-plt-1c.d
index e11e0b7a75834901c8c332475438b8b2c2ce38af..1713c8863f844652214961647ac128ebecb3dfd0 100644 (file)
--- a/ld/testsuite/ld-x86-64/mark-plt-1c.d
+++ b/ld/testsuite/ld-x86-64/mark-plt-1c.d
@@ -1,6 +1,6 @@
 #source: mark-plt-1.s
 #as: --64
-#ld: -melf_x86_64 -shared -z mark-plt -z ibtplt
+#ld: -melf_x86_64 -shared -z mark-plt -z ibtplt --no-rosegment
 #readelf: -drW
 
 #...

diff --git a/ld/testsuite/ld-x86-64/mark-plt-1d-x32.d b/ld/testsuite/ld-x86-64/mark-plt-1d-x32.d
index f08c99ea9cd0a3c37357ef275cdc66fecca2fdde..0e709d6306e42cbf0fd46e4b18907567dccfe491 100644 (file)
--- a/ld/testsuite/ld-x86-64/mark-plt-1d-x32.d
+++ b/ld/testsuite/ld-x86-64/mark-plt-1d-x32.d
@@ -1,6 +1,6 @@
 #source: mark-plt-1.s
 #as: --x32
-#ld: -melf32_x86_64 -shared -z mark-plt -z ibtplt --hash-style=both
+#ld: -melf32_x86_64 -shared -z mark-plt -z ibtplt --hash-style=both --no-rosegment
 #objdump: -dw
 
 #...

diff --git a/ld/testsuite/ld-x86-64/mark-plt-1d.d b/ld/testsuite/ld-x86-64/mark-plt-1d.d
index 9ca8d654324d4e2ea4c3f7d855a57f55acb0dba1..1ec9a9cacb47f3ab9f7adb222e0d7137695b21d4 100644 (file)
--- a/ld/testsuite/ld-x86-64/mark-plt-1d.d
+++ b/ld/testsuite/ld-x86-64/mark-plt-1d.d
@@ -1,6 +1,6 @@
 #source: mark-plt-1.s
 #as: --64
-#ld: -melf_x86_64 -shared -z mark-plt -z ibtplt --hash-style=both
+#ld: -melf_x86_64 -shared -z mark-plt -z ibtplt --hash-style=both --no-rosegment
 #objdump: -dw
 
 #...

diff --git a/ld/testsuite/ld-x86-64/pe-x86-64.exp b/ld/testsuite/ld-x86-64/pe-x86-64.exp
index 6244061be9768ca210e32a5719b23f9417f795ae..2dfbb16a2190ca34bb5acc384281deb17c6d9be7 100644 (file)
--- a/ld/testsuite/ld-x86-64/pe-x86-64.exp
+++ b/ld/testsuite/ld-x86-64/pe-x86-64.exp
@@ -27,7 +27,7 @@ if {![istarget "x86_64-*-linux*"] } {
 run_ld_link_tests [list \
     [list \
        "Build pe-x86-64-1" \
-       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code --no-rosegment" \
        "" \
        "" \
        {pe-x86-64-1a.obj.bz2 pe-x86-64-1b.obj.bz2 pe-x86-64-1c.obj.bz2} \
@@ -36,7 +36,7 @@ run_ld_link_tests [list \
     ] \
     [list \
        "Build pe-x86-64-2" \
-       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code --no-rosegment" \
        "" \
        "" \
        {pe-x86-64-2a.obj.bz2 pe-x86-64-2b.obj.bz2 pe-x86-64-2c.obj.bz2} \
@@ -45,7 +45,7 @@ run_ld_link_tests [list \
     ] \
     [list \
        "Build pe-x86-64-3" \
-       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code --no-rosegment" \
        "" \
        "" \
        {pe-x86-64-3a.obj.bz2 pe-x86-64-3b.obj.bz2 pe-x86-64-3c.obj.bz2 \
@@ -55,7 +55,7 @@ run_ld_link_tests [list \
     ] \
     [list \
        "Build pe-x86-64-4" \
-       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code --no-rosegment" \
        "" \
        "" \
        {pe-x86-64-4a.obj.bz2 pe-x86-64-4b.obj.bz2 pe-x86-64-4c.obj.bz2 \
@@ -65,7 +65,7 @@ run_ld_link_tests [list \
     ] \
     [list \
        "Build pe-x86-64-5" \
-       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code --no-rosegment" \
        "" \
        "" \
        {pe-x86-64-5.obj.bz2 } \
@@ -75,7 +75,7 @@ run_ld_link_tests [list \
     ] \
     [list \
        "Build pe-x86-64-6" \
-       "-m elf_x86_64 --entry=main -z max-page-size=0x1000 -z separate-code" \
+       "-m elf_x86_64 --entry=main -z max-page-size=0x1000 -z separate-code --no-rosegment" \
        "" \
        "" \
        {pe-x86-64-6.obj.bz2 } \

diff --git a/ld/testsuite/ld-x86-64/pr19609-4e.d b/ld/testsuite/ld-x86-64/pr19609-4e.d
index ed6e6e0bccab0d4f0e22f0d0a1b2702a35813579..39be216c23b3e0c470c1dbdcb4d1b3b11846c150 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19609-4e.d
+++ b/ld/testsuite/ld-x86-64/pr19609-4e.d
@@ -1,6 +1,6 @@
 #source: pr19609-4.s
 #as: --64 -mrelax-relocations=yes
-#ld: -melf_x86_64 -Ttext=0x70000000 -Tdata=0xa0000000 --no-relax -z max-page-size=0x1000 -z separate-code
+#ld: -melf_x86_64 -Ttext=0x70000000 -Tdata=0xa0000000 --no-relax -z max-page-size=0x1000 -z separate-code --no-rosegment
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-x86-64/pr19609-6a.d b/ld/testsuite/ld-x86-64/pr19609-6a.d
index 3bad8b55fd615d7f31824c1da2a0a71bfe12f9c8..ef76dd6a0c001b55dbbfd65c359e8151c1c7501b 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19609-6a.d
+++ b/ld/testsuite/ld-x86-64/pr19609-6a.d
@@ -1,6 +1,6 @@
 #source: pr19609-6.s
 #as: --64 -mrelax-relocations=yes
-#ld: -melf_x86_64 --defsym foobar=0x80000000 -z max-page-size=0x1000 -z separate-code
+#ld: -melf_x86_64 --defsym foobar=0x80000000 -z max-page-size=0x1000 -z separate-code --no-rosegment
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-x86-64/pr19609-6b.d b/ld/testsuite/ld-x86-64/pr19609-6b.d
index 2723fb1b98036603c9544b1d3df72ffe0a36234c..e6a266422fbc38c9976baea16b724c6cd45887ca 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19609-6b.d
+++ b/ld/testsuite/ld-x86-64/pr19609-6b.d
@@ -1,6 +1,6 @@
 #source: pr19609-6.s
 #as: --64 -mrelax-relocations=yes
-#ld: -melf_x86_64 --defsym foobar=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code
+#ld: -melf_x86_64 --defsym foobar=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code --no-rosegment
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-x86-64/pr19609-7b.d b/ld/testsuite/ld-x86-64/pr19609-7b.d
index 48d0b01616dae2be6896a09b567b58eab154f1f0..875d963ce0e466502f82fbaaf860f894ac4ac06a 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19609-7b.d
+++ b/ld/testsuite/ld-x86-64/pr19609-7b.d
@@ -1,6 +1,6 @@
 #source: pr19609-7.s
 #as: --64 -mrelax-relocations=yes
-#ld: -melf_x86_64 -Ttext=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code
+#ld: -melf_x86_64 -Ttext=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code --no-rosegment
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-x86-64/pr19609-7d.d b/ld/testsuite/ld-x86-64/pr19609-7d.d
index 6e2882af3c9fbdb787c714eac360cf852b2ad69a..294b2c96bccc36407023f82b6afb6ec33e960596 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19609-7d.d
+++ b/ld/testsuite/ld-x86-64/pr19609-7d.d
@@ -1,6 +1,6 @@
 #source: pr19609-7.s
 #as: --x32 -mrelax-relocations=yes
-#ld: -melf32_x86_64 -Ttext=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code
+#ld: -melf32_x86_64 -Ttext=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code --no-rosegment
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-x86-64/sframe-plt-1.d b/ld/testsuite/ld-x86-64/sframe-plt-1.d
index 5e734610b97097f929fd136a23e14a97869b3d74..ca82cf20ca91eca5c30713192a57413e7a5051d5 100644 (file)
--- a/ld/testsuite/ld-x86-64/sframe-plt-1.d
+++ b/ld/testsuite/ld-x86-64/sframe-plt-1.d
@@ -2,7 +2,7 @@
 #source: sframe-foo.s
 #source: sframe-bar.s
 #objdump: --sframe=.sframe
-#ld: -shared
+#ld: -shared --no-rosegment
 #name: SFrame for plt0 and pltN
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-x86-64/sframe-simple-1.d b/ld/testsuite/ld-x86-64/sframe-simple-1.d
index 7f4db31fe1b71e422bf0f51ae0461be9a5454c2a..adc4b74193077986fc2de229f8f29e338d805baa 100644 (file)
--- a/ld/testsuite/ld-x86-64/sframe-simple-1.d
+++ b/ld/testsuite/ld-x86-64/sframe-simple-1.d
@@ -2,7 +2,7 @@
 #source: sframe-foo.s
 #source: sframe-bar.s
 #objdump: --sframe=.sframe
-#ld: -shared
+#ld: -shared --no-rosegment
 #name: SFrame simple link
 
 .*: +file format .*