Skip to content

Commit

Permalink
Use +link-pie Makefile rule to link PIE ifunc tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
H.J. Lu authored and Ulrich Drepper committed Jun 18, 2009
1 parent f051ddf commit d8366b0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2009-06-17 H.J. Lu <hongjiu.lu@intel.com>

* elf/Makefile ($(objpfx)ifuncmain1pie): Use $(+link-pie).
($(objpfx)ifuncmain1vispie): Likewise.

2009-06-16 Ulrich Drepper <drepper@redhat.com>

* login/Makefile: Build pt_chown as PIE.
Expand Down
18 changes: 2 additions & 16 deletions elf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -993,14 +993,7 @@ $(objpfx)ifuncmain1pie.out: $(objpfx)ifuncmain1pie
$< > $@

$(objpfx)ifuncmain1pie: $(objpfx)ifuncmain1pie.o $(objpfx)ifuncmod1.so
$(LINK.o) -pie -Wl,-O1 \
$(sysdep-LDFLAGS) $(config-LDFLAGS) \
$(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
$(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
$(LDFLAGS) $(LDFLAGS-$(@F)) \
-L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
-o $@ $(objpfx)tst-pie1.o $(objpfx)tst-piemod1.so \
$(common-objpfx)libc_nonshared.a
$(+link-pie)

generated += ifuncmain1pie ifuncmain1pie.out

Expand All @@ -1010,14 +1003,7 @@ $(objpfx)ifuncmain1vispie.out: $(objpfx)ifuncmain1vispie
$< > $@

$(objpfx)ifuncmain1vispie: $(objpfx)ifuncmain1vispie.o $(objpfx)ifuncmod1.so
$(LINK.o) -pie -Wl,-O1 \
$(sysdep-LDFLAGS) $(config-LDFLAGS) \
$(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
$(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
$(LDFLAGS) $(LDFLAGS-$(@F)) \
-L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
-o $@ $(objpfx)tst-pie1.o $(objpfx)tst-piemod1.so \
$(common-objpfx)libc_nonshared.a
$(+link-pie)

generated += ifuncmain1vispie ifuncmain1vispie.out
endif
Expand Down

0 comments on commit d8366b0

Please sign in to comment.