about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-10-04 17:15:50 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-10-04 17:16:04 -0700
commita67029ff12319300458a502be1d12aa2065c48da (patch)
tree394daa0847e40e5b2888c45016a2047b879da038 /elf
parent5dba84b3246961ea3032ce48ac72c1ac9364cf2b (diff)
downloadglibc-a67029ff12319300458a502be1d12aa2065c48da.tar.gz
glibc-a67029ff12319300458a502be1d12aa2065c48da.tar.xz
glibc-a67029ff12319300458a502be1d12aa2065c48da.zip
Use $(DEFAULT-LDFLAGS-$(@F)) in +link-static-before-libc
Use $(LDFLAGS-$(@F)) with tst-tls1-static-non-pie may not be sufficient
when static PIE is built by default.  Use $(DEFAULT-LDFLAGS-$(@F)) in
+link-static-before-libc to make sure that tst-tls1-static-non-pie is
always built as non-PIE static executable and make sure that crt1.o is
used with tst-tls1-static-non-pie.

	* Makeconfig (+link-static-before-libc): Use
	$(DEFAULT-LDFLAGS-$(@F)).
	* elf/Makefile (CRT-tst-tls1-static-non-pie): New.
	(LDFLAGS-tst-tls1-static-non-pie): Renamed to ...
	(DEFAULT-LDFLAGS-tst-tls1-static-non-pie): This.
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 0dcbf2f3de..a31fb72498 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -152,7 +152,8 @@ tests-static-internal := tst-tls1-static tst-tls2-static \
 	       tst-ptrguard1-static tst-stackguard1-static \
 	       tst-tls1-static-non-pie
 
-LDFLAGS-tst-tls1-static-non-pie = $(no-pie-ldflag)
+CRT-tst-tls1-static-non-pie := $(csu-objpfx)crt1.o
+DEFAULT-LDFLAGS-tst-tls1-static-non-pie = $(no-pie-ldflag)
 
 tests := tst-tls9 tst-leaks1 \
 	tst-array1 tst-array2 tst-array3 tst-array4 tst-array5 \