diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/Makefile | 18 |
2 files changed, 7 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 115cb8cde3..b27fedef73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/elf/Makefile b/elf/Makefile index 5973690be9..2aa5b7118f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -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 @@ -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 |