[7/8] i386: Add -z noseparate-code to IFUNC tests

Message ID 20180215142643.32242-7-hjl.tools@gmail.com
State New
Headers show
Series
  • [1/8] Add -z noseparate-code to ld-elf tests
Related show

Commit Message

H.J. Lu Feb. 15, 2018, 2:26 p.m.
Add -z noseparate-code since these tests check for exact addresses.

	* testsuite/ld-ifunc/ifunc-2-i386-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-local-i386-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-local-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-21-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-22-i386.d: Likewise.
	* testsuite/ld-ifunc/pr17154-i386-now.d: Likewise.
	* testsuite/ld-ifunc/pr17154-i386.d: Likewise.
---
 ld/testsuite/ld-ifunc/ifunc-2-i386-now.d       | 2 +-
 ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d | 2 +-
 ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d   | 2 +-
 ld/testsuite/ld-ifunc/ifunc-21-i386.d          | 2 +-
 ld/testsuite/ld-ifunc/ifunc-22-i386.d          | 2 +-
 ld/testsuite/ld-ifunc/pr17154-i386-now.d       | 2 +-
 ld/testsuite/ld-ifunc/pr17154-i386.d           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

-- 
2.14.3

Comments

H.J. Lu Feb. 16, 2018, 5:46 p.m. | #1
On Thu, Feb 15, 2018 at 6:26 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> Add -z noseparate-code since these tests check for exact addresses.

>

>         * testsuite/ld-ifunc/ifunc-2-i386-now.d: Likewise.

>         * testsuite/ld-ifunc/ifunc-2-local-i386-now.d: Likewise.

>         * testsuite/ld-ifunc/ifunc-2-local-x86-64.d: Likewise.

>         * testsuite/ld-ifunc/ifunc-21-i386.d: Likewise.

>         * testsuite/ld-ifunc/ifunc-22-i386.d: Likewise.

>         * testsuite/ld-ifunc/pr17154-i386-now.d: Likewise.

>         * testsuite/ld-ifunc/pr17154-i386.d: Likewise.


This is what I am checking in.


-- 
H.J.
From c9d3eb5f61c5756b78e5aebe1822df7ff977eb74 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Fri, 16 Feb 2018 09:45:02 -0800
Subject: [PATCH] x86: Add -z noseparate-code to IFUNC tests

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

	* testsuite/ld-ifunc/ifunc-2-i386-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-local-i386-now.d: Likewise.
	* testsuite/ld-ifunc/ifunc-2-local-x86-64.d: Likewise.
	* testsuite/ld-ifunc/ifunc-21-i386.d: Likewise.
	* testsuite/ld-ifunc/ifunc-22-i386.d: Likewise.
	* testsuite/ld-ifunc/pr17154-i386-now.d: Likewise.
	* testsuite/ld-ifunc/pr17154-i386.d: Likewise.
---
 ld/ChangeLog                                   | 10 ++++++++++
 ld/testsuite/ld-ifunc/ifunc-2-i386-now.d       |  2 +-
 ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d |  2 +-
 ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d   |  2 +-
 ld/testsuite/ld-ifunc/ifunc-21-i386.d          |  2 +-
 ld/testsuite/ld-ifunc/ifunc-22-i386.d          |  2 +-
 ld/testsuite/ld-ifunc/pr17154-i386-now.d       |  2 +-
 ld/testsuite/ld-ifunc/pr17154-i386.d           |  2 +-
 8 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 79298f3725..5818ea4633 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2018-02-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/ld-ifunc/ifunc-2-i386-now.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-local-i386-now.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-2-local-x86-64.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-21-i386.d: Likewise.
+	* testsuite/ld-ifunc/ifunc-22-i386.d: Likewise.
+	* testsuite/ld-ifunc/pr17154-i386-now.d: Likewise.
+	* testsuite/ld-ifunc/pr17154-i386.d: Likewise.
+
 2018-02-16  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/ld-ifunc/ifunc-2-local-x86-64-now.d: Add
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
index b4dfcec338..7157d5fc5a 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
@@ -1,5 +1,5 @@
 #source: ifunc-2-i386.s
-#ld: -z now -m elf_i386 -shared --hash-style=sysv
+#ld: -z now -m elf_i386 -shared --hash-style=sysv -z noseparate-code
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
index 8888e7c682..d5400a2754 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
@@ -1,5 +1,5 @@
 #source: ifunc-2-local-i386.s
-#ld: -z now -m elf_i386 -shared --hash-style=sysv
+#ld: -z now -m elf_i386 -shared --hash-style=sysv -z noseparate-code
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
index b776b33907..3cea6f76fc 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
@@ -1,5 +1,5 @@
 #as: --64
-#ld: -shared -melf_x86_64 --hash-style=sysv
+#ld: -shared -melf_x86_64 --hash-style=sysv -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-21-i386.d b/ld/testsuite/ld-ifunc/ifunc-21-i386.d
index d61ccd0d9a..f28af7782f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-21-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-21-i386.d
@@ -1,4 +1,4 @@
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #as: --32 -mrelax-relocations=yes
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/ifunc-22-i386.d b/ld/testsuite/ld-ifunc/ifunc-22-i386.d
index d61ccd0d9a..f28af7782f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-22-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-22-i386.d
@@ -1,4 +1,4 @@
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #as: --32 -mrelax-relocations=yes
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/pr17154-i386-now.d b/ld/testsuite/ld-ifunc/pr17154-i386-now.d
index b7afdd04d6..10d270c659 100644
--- a/ld/testsuite/ld-ifunc/pr17154-i386-now.d
+++ b/ld/testsuite/ld-ifunc/pr17154-i386-now.d
@@ -1,5 +1,5 @@
 #source: pr17154-x86.s
-#ld: -z now -m elf_i386 -shared --hash-style=sysv
+#ld: -z now -m elf_i386 -shared --hash-style=sysv -z noseparate-code
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/pr17154-i386.d b/ld/testsuite/ld-ifunc/pr17154-i386.d
index 6b309b9f1e..854d73abd8 100644
--- a/ld/testsuite/ld-ifunc/pr17154-i386.d
+++ b/ld/testsuite/ld-ifunc/pr17154-i386.d
@@ -1,5 +1,5 @@
 #source: pr17154-x86.s
-#ld: -m elf_i386 -shared --hash-style=sysv
+#ld: -m elf_i386 -shared --hash-style=sysv -z noseparate-code
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*

Patch

diff --git a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
index b4dfcec338..7157d5fc5a 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d
@@ -1,5 +1,5 @@ 
 #source: ifunc-2-i386.s
-#ld: -z now -m elf_i386 -shared --hash-style=sysv
+#ld: -z now -m elf_i386 -shared --hash-style=sysv -z noseparate-code
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
index 8888e7c682..d5400a2754 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d
@@ -1,5 +1,5 @@ 
 #source: ifunc-2-local-i386.s
-#ld: -z now -m elf_i386 -shared --hash-style=sysv
+#ld: -z now -m elf_i386 -shared --hash-style=sysv -z noseparate-code
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
index b776b33907..3cea6f76fc 100644
--- a/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
+++ b/ld/testsuite/ld-ifunc/ifunc-2-local-x86-64.d
@@ -1,5 +1,5 @@ 
 #as: --64
-#ld: -shared -melf_x86_64 --hash-style=sysv
+#ld: -shared -melf_x86_64 --hash-style=sysv -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-21-i386.d b/ld/testsuite/ld-ifunc/ifunc-21-i386.d
index d61ccd0d9a..b4bb3e6797 100644
--- a/ld/testsuite/ld-ifunc/ifunc-21-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-21-i386.d
@@ -1,5 +1,5 @@ 
 #ld: -m elf_i386
-#as: --32 -mrelax-relocations=yes
+#as: --32 -mrelax-relocations=yes -z noseparate-code
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-22-i386.d b/ld/testsuite/ld-ifunc/ifunc-22-i386.d
index d61ccd0d9a..f28af7782f 100644
--- a/ld/testsuite/ld-ifunc/ifunc-22-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-22-i386.d
@@ -1,4 +1,4 @@ 
-#ld: -m elf_i386
+#ld: -m elf_i386 -z noseparate-code
 #as: --32 -mrelax-relocations=yes
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/pr17154-i386-now.d b/ld/testsuite/ld-ifunc/pr17154-i386-now.d
index b7afdd04d6..10d270c659 100644
--- a/ld/testsuite/ld-ifunc/pr17154-i386-now.d
+++ b/ld/testsuite/ld-ifunc/pr17154-i386-now.d
@@ -1,5 +1,5 @@ 
 #source: pr17154-x86.s
-#ld: -z now -m elf_i386 -shared --hash-style=sysv
+#ld: -z now -m elf_i386 -shared --hash-style=sysv -z noseparate-code
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
diff --git a/ld/testsuite/ld-ifunc/pr17154-i386.d b/ld/testsuite/ld-ifunc/pr17154-i386.d
index 6b309b9f1e..854d73abd8 100644
--- a/ld/testsuite/ld-ifunc/pr17154-i386.d
+++ b/ld/testsuite/ld-ifunc/pr17154-i386.d
@@ -1,5 +1,5 @@ 
 #source: pr17154-x86.s
-#ld: -m elf_i386 -shared --hash-style=sysv
+#ld: -m elf_i386 -shared --hash-style=sysv -z noseparate-code
 #as: --32
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*