Patchwork Use $(DEFAULT-LDFLAGS-$(@F)) in +link-static-before-libc

login
register
mail settings
Submitter H.J. Lu
Date Oct. 3, 2017, 10:47 p.m.
Message ID <20171003224751.GA23183@gmail.com>
Download mbox | patch
Permalink /patch/23310/
State New
Headers show

Comments

H.J. Lu - Oct. 3, 2017, 10:47 p.m.
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.

Any comments?

H.J.
---
	* Makeconfig (+link-static-before-libc): Use
	$(DEFAULT-LDFLAGS-$(@F)).
	* elf/Makefile (LDFLAGS-tst-tls1-static-non-pie): Renamed to ...
	(DEFAULT-LDFLAGS-tst-tls1-static-non-pie): This.
---
 Makeconfig   | 1 +
 elf/Makefile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/Makeconfig b/Makeconfig
index b51904b797..0ceff92a3d 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -435,6 +435,7 @@  endif
 # Command for statically linking programs with the C library.
 ifndef +link-static
 +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
+	      $(DEFAULT-LDFLAGS-$(@F)) \
 	      $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F))  \
 	      $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
 	      $(+preinit) $(+prectorT) \
diff --git a/elf/Makefile b/elf/Makefile
index c6edebd4ee..06e2e4cd08 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -152,7 +152,7 @@  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)
+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 \