about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-08-02 10:27:14 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-08-02 10:27:34 -0700
commit5b736bc9b55115e67129e77db4de6cf193054cd2 (patch)
treec5baa73b9a7eaa3491dae05949c0f956a831461d
parentdfc93c41eebef639ba2d1f304f4d52ab6b834684 (diff)
downloadglibc-5b736bc9b55115e67129e77db4de6cf193054cd2.tar.gz
glibc-5b736bc9b55115e67129e77db4de6cf193054cd2.tar.xz
glibc-5b736bc9b55115e67129e77db4de6cf193054cd2.zip
x86-64: Check PIC instead of SHARED in start.S
Since start.o may be compiled as PIC, we should check PIC instead of
SHARED.

	* sysdeps/x86_64/start.S (_start): Check PIC instead of SHARED.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/x86_64/start.S2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b3be5a7d19..0618954834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-08-02  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/x86_64/start.S (_start): Check PIC instead of SHARED.
+
+2017-08-02  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/i386/i686/multiarch/memcmp-sse4.S: Check PIC instead
 	of SHARED.
 	* sysdeps/i386/i686/multiarch/memcpy-sse2-unaligned.S: Likewise.
diff --git a/sysdeps/x86_64/start.S b/sysdeps/x86_64/start.S
index 62a00eaeaa..9edd17b60c 100644
--- a/sysdeps/x86_64/start.S
+++ b/sysdeps/x86_64/start.S
@@ -96,7 +96,7 @@ ENTRY (_start)
 	   which grow downwards).  */
 	pushq %rsp
 
-#ifdef SHARED
+#ifdef PIC
 	/* Pass address of our own entry points to .fini and .init.  */
 	mov __libc_csu_fini@GOTPCREL(%rip), %R8_LP
 	mov __libc_csu_init@GOTPCREL(%rip), %RCX_LP