x86: Adjust linker tests for --disable-separate-code

Adjust linker tests for linker configured with --disable-separate-code:

1. Update expected outputs.
2. Pass -z max-page-size=0x1000 -z separate-code" to linker.

	* testsuite/ld-i386/report-reloc-1.l: Updated.
	* testsuite/ld-x86-64/report-reloc-1.l: Likewise.
	* testsuite/ld-x86-64/pe-x86-64.exp: Pass
	"-z max-page-size=0x1000 -z separate-code" to linker.
	* testsuite/ld-x86-64/pr19609-4e.d: Likewise.
	* testsuite/ld-x86-64/pr19609-6a.d: Likewise.
	* testsuite/ld-x86-64/pr19609-6b.d: Likewise.
	* testsuite/ld-x86-64/pr19609-7b.d: Likewise.
	* testsuite/ld-x86-64/pr19609-7d.d: Likewise.

diff --git a/ld/testsuite/ld-i386/report-reloc-1.l b/ld/testsuite/ld-i386/report-reloc-1.l
index a0293bc4f9640a82c66f1612a1b24aa320db4353..d141e06e08dd1fd3680f6995879b64b1f24b3c16 100644 (file)
--- a/ld/testsuite/ld-i386/report-reloc-1.l
+++ b/ld/testsuite/ld-i386/report-reloc-1.l
@@ -1,2 +1,2 @@
-tmpdir/dump: R_386_IRELATIVE \(offset: 0x0+2000, info: 0x0+2a\) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o
-tmpdir/dump: R_386_RELATIVE \(offset: 0x0+2004, info: 0x0+8\) against '_start' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o
+tmpdir/dump: R_386_IRELATIVE \(offset: 0x[0-9a-f]+, info: 0x0+2a\) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o
+tmpdir/dump: R_386_RELATIVE \(offset: 0x[0-9a-f]+, info: 0x0+8\) against '_start' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o

diff --git a/ld/testsuite/ld-x86-64/pe-x86-64.exp b/ld/testsuite/ld-x86-64/pe-x86-64.exp
index f5d2c84f28380ab275ed93347bc9219af2ab5ffb..473405660020206e6d77c6e3b2ca4342ae226e38 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" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
        "" \
        "" \
        {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" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
        "" \
        "" \
        {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" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
        "" \
        "" \
        {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" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
        "" \
        "" \
        {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" \
+       "-m elf_x86_64 --entry=begin -z max-page-size=0x1000 -z separate-code" \
        "" \
        "" \
        {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" \
+       "-m elf_x86_64 --entry=main -z max-page-size=0x1000 -z separate-code" \
        "" \
        "" \
        {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 48adc947e75555e3491f26d7eaf08e7620833575..ed6e6e0bccab0d4f0e22f0d0a1b2702a35813579 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
+#ld: -melf_x86_64 -Ttext=0x70000000 -Tdata=0xa0000000 --no-relax -z max-page-size=0x1000 -z separate-code
 #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 265825d4c6c15b1496465cbe81a2fe77b2e529f1..3bad8b55fd615d7f31824c1da2a0a71bfe12f9c8 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
+#ld: -melf_x86_64 --defsym foobar=0x80000000 -z max-page-size=0x1000 -z separate-code
 #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 1f769eff4d3cd31140d480bb511b280235ede3d7..2723fb1b98036603c9544b1d3df72ffe0a36234c 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
+#ld: -melf_x86_64 --defsym foobar=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code
 #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 d85e5e9425d84aa82badc9a7e4f32f8ec1ba562c..48d0b01616dae2be6896a09b567b58eab154f1f0 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
+#ld: -melf_x86_64 -Ttext=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code
 #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 6eb511080dd1593c3df03024e7da847aae36d1e6..6e2882af3c9fbdb787c714eac360cf852b2ad69a 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
+#ld: -melf32_x86_64 -Ttext=0x80000000 --no-relax -z max-page-size=0x1000 -z separate-code
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-x86-64/report-reloc-1.l b/ld/testsuite/ld-x86-64/report-reloc-1.l
index 669dff43bd7bf0fa05e8f7b888a7759a994f2249..21e9b1ee87092c2af4bcadcbba34de7a9a2e7035 100644 (file)
--- a/ld/testsuite/ld-x86-64/report-reloc-1.l
+++ b/ld/testsuite/ld-x86-64/report-reloc-1.l
@@ -1,2 +1,2 @@
-tmpdir/dump: R_X86_64_IRELATIVE \(offset: 0x0+2000, info: 0x0+25, addend: 0x0+1007\) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o
-tmpdir/dump: R_X86_64_RELATIVE \(offset: 0x0+2008, info: 0x0+8, addend: 0x0+1000\) against '_start' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o
+tmpdir/dump: R_X86_64_IRELATIVE \(offset: 0x[0-9a-f]+, info: 0x0+25, addend: 0x[0-9a-f]+\) against 'ifunc' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o
+tmpdir/dump: R_X86_64_RELATIVE \(offset: 0x[0-9a-f]+, info: 0x0+8, addend: 0x[0-9a-f]+\) against '_start' for section '.data.rel.ro.local' in tmpdir/report-reloc-1.o