about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-09-29 16:20:26 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-09-29 16:20:39 -0700
commitf6c5e5bce0a71680f90a4d6983b7233d461b5f86 (patch)
treecd502ba500a8748ce9a98243e627b73904da36e6
parent2f92505d207aa2baca29f96bf1a1ea0baea3787e (diff)
downloadglibc-f6c5e5bce0a71680f90a4d6983b7233d461b5f86.tar.gz
glibc-f6c5e5bce0a71680f90a4d6983b7233d461b5f86.tar.xz
glibc-f6c5e5bce0a71680f90a4d6983b7233d461b5f86.zip
arm: Check PIC instead of SHARED in start.S
Since start.o may be compiled as PIC, we should check PIC instead of
SHARED.

	* sysdeps/arm/start.S (_start): Check PIC instead of SHARED.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/arm/start.S4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ffe4ce1fda..728df95d05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/arm/start.S (_start): Check PIC instead of SHARED.
+
 2017-09-29  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/x86_64/fpu/libm-test-ulps: Update.
diff --git a/sysdeps/arm/start.S b/sysdeps/arm/start.S
index 4973878f05..a5c678b6c5 100644
--- a/sysdeps/arm/start.S
+++ b/sysdeps/arm/start.S
@@ -89,7 +89,7 @@ _start:
 	/* Push rtld_fini */
 	push { a1 }
 
-#ifdef SHARED
+#ifdef PIC
 	ldr sl, .L_GOT
 	adr a4, .L_GOT
 	add sl, sl, a4
@@ -127,7 +127,7 @@ _start:
 	/* should never get here....*/
 	bl abort
 
-#ifdef SHARED
+#ifdef PIC
 	.align 2
 .L_GOT:
 	.word _GLOBAL_OFFSET_TABLE_ - .L_GOT