i386: Add -z noseparate-code to linker tests

Add -z noseparate-code since these tests check for exact addresses.

	* testsuite/ld-i386/ibt-plt-1.d: Add -z noseparate-code.
	* testsuite/ld-i386/ibt-plt-2a.d: Likewise.
	* testsuite/ld-i386/ibt-plt-2b.d: Likewise.
	* testsuite/ld-i386/ibt-plt-2c.d: Likewise.
	* testsuite/ld-i386/ibt-plt-2d.d: Likewise.
	* testsuite/ld-i386/ibt-plt-3a.d: Likewise.
	* testsuite/ld-i386/ibt-plt-3b.d: Likewise.
	* testsuite/ld-i386/ibt-plt-3c.d: Likewise.
	* testsuite/ld-i386/ibt-plt-3d.d: Likewise.
	* testsuite/ld-i386/load1.d: Likewise.
	* testsuite/ld-i386/pie1.d: Likewise.
	* testsuite/ld-i386/pr20244-1a.d: Likewise.
	* testsuite/ld-i386/pr20244-1b.d: Likewise.
	* testsuite/ld-i386/pr20244-2a.d: Likewise.
	* testsuite/ld-i386/pr20244-2b.d: Likewise.
	* testsuite/ld-i386/pr20244-2c.d: Likewise.
	* testsuite/ld-i386/pr20244-4a.d: Likewise.
	* testsuite/ld-i386/pr20244-4b.d: Likewise.
	* testsuite/ld-i386/pr20830.d: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 42e188459dc47f2df9f63e2749ab601490f78408..fc64ea2d9fd4e69808e31ec897b37f68e41696ce 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,25 @@
+2018-02-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/ld-i386/ibt-plt-1.d: Add -z noseparate-code.
+       * testsuite/ld-i386/ibt-plt-2a.d: Likewise.
+       * testsuite/ld-i386/ibt-plt-2b.d: Likewise.
+       * testsuite/ld-i386/ibt-plt-2c.d: Likewise.
+       * testsuite/ld-i386/ibt-plt-2d.d: Likewise.
+       * testsuite/ld-i386/ibt-plt-3a.d: Likewise.
+       * testsuite/ld-i386/ibt-plt-3b.d: Likewise.
+       * testsuite/ld-i386/ibt-plt-3c.d: Likewise.
+       * testsuite/ld-i386/ibt-plt-3d.d: Likewise.
+       * testsuite/ld-i386/load1.d: Likewise.
+       * testsuite/ld-i386/pie1.d: Likewise.
+       * testsuite/ld-i386/pr20244-1a.d: Likewise.
+       * testsuite/ld-i386/pr20244-1b.d: Likewise.
+       * testsuite/ld-i386/pr20244-2a.d: Likewise.
+       * testsuite/ld-i386/pr20244-2b.d: Likewise.
+       * testsuite/ld-i386/pr20244-2c.d: Likewise.
+       * testsuite/ld-i386/pr20244-4a.d: Likewise.
+       * testsuite/ld-i386/pr20244-4b.d: Likewise.
+       * testsuite/ld-i386/pr20830.d: Likewise.
+
 2018-02-16  H.J. Lu  <hongjiu.lu@intel.com>
 
        * testsuite/ld-i386/pr19636-1a.d: Updated.

diff --git a/ld/testsuite/ld-i386/ibt-plt-1.d b/ld/testsuite/ld-i386/ibt-plt-1.d
index a131675328642cccbe810b9f1a797472666c3ba9..e164095e446cd4c1dee64c6b36392349df7533d8 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-1.d
+++ b/ld/testsuite/ld-i386/ibt-plt-1.d
@@ -1,5 +1,5 @@
 #as: --32
-#ld: -shared -m elf_i386 --hash-style=sysv
+#ld: -shared -m elf_i386 --hash-style=sysv -z noseparate-code
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-i386/ibt-plt-2a.d b/ld/testsuite/ld-i386/ibt-plt-2a.d
index 13c6949e0d49e926823800629901c3a4bbadb5bd..6b84a3a1d4e0bcc793ddb3d5cfdbeff09a30e38a 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-2a.d
+++ b/ld/testsuite/ld-i386/ibt-plt-2a.d
@@ -1,6 +1,6 @@
 #source: ibt-plt-2.s
 #as: --32
-#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv
+#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv -z noseparate-code
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-i386/ibt-plt-2b.d b/ld/testsuite/ld-i386/ibt-plt-2b.d
index 90541f19f6d8f60ae6923b12af4839633e09587d..2927290b352e866c04d4dc3aac7d211b6108ecd7 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-2b.d
+++ b/ld/testsuite/ld-i386/ibt-plt-2b.d
@@ -1,6 +1,6 @@
 #source: ibt-plt-2.s
 #as: --32
-#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv
+#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv -z noseparate-code
 #readelf: -n -wf
 
 Contents of the .eh_frame section:

diff --git a/ld/testsuite/ld-i386/ibt-plt-2c.d b/ld/testsuite/ld-i386/ibt-plt-2c.d
index 63f442722125efea9cfbfe9a3eeb1eb70459d884..f3d9fafd70843762685d2837ce30d6fdd23992ad 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-2c.d
+++ b/ld/testsuite/ld-i386/ibt-plt-2c.d
@@ -1,6 +1,6 @@
 #source: ibt-plt-2.s
 #as: --32
-#ld: -shared -m elf_i386 -z ibt --hash-style=sysv
+#ld: -shared -m elf_i386 -z ibt --hash-style=sysv -z noseparate-code
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-i386/ibt-plt-2d.d b/ld/testsuite/ld-i386/ibt-plt-2d.d
index f57c7e84e340ead796b5241ef91aefdda4f6062e..efd0cd864421771b02968afdce7f6cfc9fe8fa50 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-2d.d
+++ b/ld/testsuite/ld-i386/ibt-plt-2d.d
@@ -1,6 +1,6 @@
 #source: ibt-plt-2.s
 #as: --32
-#ld: -shared -m elf_i386 -z ibt --hash-style=sysv
+#ld: -shared -m elf_i386 -z ibt --hash-style=sysv -z noseparate-code
 #readelf: -n -wf
 
 Contents of the .eh_frame section:

diff --git a/ld/testsuite/ld-i386/ibt-plt-3a.d b/ld/testsuite/ld-i386/ibt-plt-3a.d
index 5455c928eb7a754b5ed5cfb7522dc14ff6312683..a9c0f53a1160de95aba20edbbd62462ec37aae13 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-3a.d
+++ b/ld/testsuite/ld-i386/ibt-plt-3a.d
@@ -1,6 +1,6 @@
 #source: ibt-plt-3.s
 #as: --32
-#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv
+#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv -z noseparate-code
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-i386/ibt-plt-3b.d b/ld/testsuite/ld-i386/ibt-plt-3b.d
index 6e6637ff9a23dcf266753292d1e404b8d48b87e0..fa66d63860518c6544b1e68608572de1f75efaba 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-3b.d
+++ b/ld/testsuite/ld-i386/ibt-plt-3b.d
@@ -1,6 +1,6 @@
 #source: ibt-plt-3.s
 #as: --32
-#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv
+#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv -z noseparate-code
 #readelf: -wf -n
 
 Contents of the .eh_frame section:

diff --git a/ld/testsuite/ld-i386/ibt-plt-3c.d b/ld/testsuite/ld-i386/ibt-plt-3c.d
index 5455c928eb7a754b5ed5cfb7522dc14ff6312683..a9c0f53a1160de95aba20edbbd62462ec37aae13 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-3c.d
+++ b/ld/testsuite/ld-i386/ibt-plt-3c.d
@@ -1,6 +1,6 @@
 #source: ibt-plt-3.s
 #as: --32
-#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv
+#ld: -shared -m elf_i386 -z ibtplt --hash-style=sysv -z noseparate-code
 #objdump: -dw
 
 .*: +file format .*

diff --git a/ld/testsuite/ld-i386/ibt-plt-3d.d b/ld/testsuite/ld-i386/ibt-plt-3d.d
index 1ef91db7fce6dc9984644d6782dcb312f7a7bc4e..231798c02b36198234da123a25d4cd3e53d4d474 100644 (file)
--- a/ld/testsuite/ld-i386/ibt-plt-3d.d
+++ b/ld/testsuite/ld-i386/ibt-plt-3d.d
@@ -1,6 +1,6 @@
 #source: ibt-plt-3.s
 #as: --32
-#ld: -shared -m elf_i386 -z ibt --hash-style=sysv
+#ld: -shared -m elf_i386 -z ibt --hash-style=sysv -z noseparate-code
 #readelf: -wf -n
 
 Contents of the .eh_frame section:

diff --git a/ld/testsuite/ld-i386/load1.d b/ld/testsuite/ld-i386/load1.d
index 2e4957b0ada7c3cecfec5552ffd1b045f1a0606a..8e8db9f43be737ab43c9e888e0aa64dc423fd4e5 100644 (file)
--- a/ld/testsuite/ld-i386/load1.d
+++ b/ld/testsuite/ld-i386/load1.d
@@ -1,5 +1,5 @@
 #as: --32 -mrelax-relocations=yes
-#ld: -melf_i386
+#ld: -melf_i386 -z noseparate-code
 #objdump: -dw --sym
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pie1.d b/ld/testsuite/ld-i386/pie1.d
index e77b8dc04f967446c05aeb37a8dbf91aeab358db..e7beaa2400a8dc48fe990a16211ba0c04f40471a 100644 (file)
--- a/ld/testsuite/ld-i386/pie1.d
+++ b/ld/testsuite/ld-i386/pie1.d
@@ -1,5 +1,5 @@
 #as: --32
-#ld: -pie -melf_i386 -z relro
+#ld: -pie -melf_i386 -z relro -z noseparate-code
 #objdump: -dw --sym
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pr20244-1a.d b/ld/testsuite/ld-i386/pr20244-1a.d
index 46ae4beb47002eeb50f1343041b30a47410333b9..98aaa9e01bbb5b88fa1fca559368453ec3a70d9a 100644 (file)
--- a/ld/testsuite/ld-i386/pr20244-1a.d
+++ b/ld/testsuite/ld-i386/pr20244-1a.d
@@ -1,6 +1,6 @@
 #source: pr20244-1.s
 #as: --32
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #objdump: --sym -dw
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pr20244-1b.d b/ld/testsuite/ld-i386/pr20244-1b.d
index d8ac4aaffda12815d85ef7ba9ca087746065b46c..f5a1a61ca7e7ad5acaa06b8423c18fda3e6f86e7 100644 (file)
--- a/ld/testsuite/ld-i386/pr20244-1b.d
+++ b/ld/testsuite/ld-i386/pr20244-1b.d
@@ -1,6 +1,6 @@
 #source: pr20244-1.s
 #as: --32
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #objdump: -s -j .got
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pr20244-2a.d b/ld/testsuite/ld-i386/pr20244-2a.d
index ec3948e5bc04b345acd6916f3150d0cd54262b3f..40c6e32c94fe218e8516932059fcdc877eca65a5 100644 (file)
--- a/ld/testsuite/ld-i386/pr20244-2a.d
+++ b/ld/testsuite/ld-i386/pr20244-2a.d
@@ -1,6 +1,6 @@
 #source: pr20244-2.s
 #as: --32
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #objdump: --sym -dw
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pr20244-2b.d b/ld/testsuite/ld-i386/pr20244-2b.d
index f23a406553fdaf35c3e57b40490efcbc0c2349c4..406d3bd3a7309b734cdfb5b19bdbf25fbbbaf464 100644 (file)
--- a/ld/testsuite/ld-i386/pr20244-2b.d
+++ b/ld/testsuite/ld-i386/pr20244-2b.d
@@ -1,6 +1,6 @@
 #source: pr20244-2.s
 #as: --32
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #objdump: -s -j .got.plt
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pr20244-2c.d b/ld/testsuite/ld-i386/pr20244-2c.d
index acca56000098e7eaf97c131ef13347e905527ca9..142ec2748b3e614b01a7366ac6996501615fc308 100644 (file)
--- a/ld/testsuite/ld-i386/pr20244-2c.d
+++ b/ld/testsuite/ld-i386/pr20244-2c.d
@@ -1,6 +1,6 @@
 #source: pr20244-2.s
 #as: --32
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #readelf: -rW
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pr20244-4a.d b/ld/testsuite/ld-i386/pr20244-4a.d
index 420d179a609f9eb414d6dff8f95a60b4975aa8f8..7e6fe3690df9ba0a3faf773b28e7046b66eb0093 100644 (file)
--- a/ld/testsuite/ld-i386/pr20244-4a.d
+++ b/ld/testsuite/ld-i386/pr20244-4a.d
@@ -1,6 +1,6 @@
 #source: pr20244-4.s
 #as: --32
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #objdump: -dw
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pr20244-4b.d b/ld/testsuite/ld-i386/pr20244-4b.d
index 16e524353a5cd26381f1c291546d7fca2f3e2d9f..946f56b0d1883b4d39665f0f8e2587e64f851705 100644 (file)
--- a/ld/testsuite/ld-i386/pr20244-4b.d
+++ b/ld/testsuite/ld-i386/pr20244-4b.d
@@ -1,6 +1,6 @@
 #source: pr20244-4.s
 #as: --32
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #objdump: -s -j .got
 #notarget: i?86-*-nacl* x86_64-*-nacl*
 

diff --git a/ld/testsuite/ld-i386/pr20830.d b/ld/testsuite/ld-i386/pr20830.d
index 26caabb95057f59f3d77b01e3d56a261e187d215..a16ea67c49c36d3abbb7b88f342c12c8287b7366 100644 (file)
--- a/ld/testsuite/ld-i386/pr20830.d
+++ b/ld/testsuite/ld-i386/pr20830.d
@@ -1,6 +1,6 @@
 #name: PR ld/20830 (.plt.got)
 #as: --32
-#ld: -melf_i386 -shared -z relro --ld-generated-unwind-info --hash-style=sysv
+#ld: -melf_i386 -shared -z relro --ld-generated-unwind-info --hash-style=sysv -z noseparate-code
 #objdump: -dw -Wf
 
 .*: +file format .*