[commits] r8568 - in /fsf/trunk/libc: ChangeLog elf/Makefile

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Jun 18 00:06:16 2009
New Revision: 8568

Log:
Import glibc-mainline for 2009-06-18

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/elf/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Jun 18 00:06:16 2009
@@ -1,3 +1,8 @@
+2009-06-17  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+	* elf/Makefile ($(objpfx)ifuncmain1pie): Use $(+link-pie).
+	($(objpfx)ifuncmain1vispie): Likewise.
+
 2009-06-16  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* login/Makefile: Build pt_chown as PIE.

Modified: fsf/trunk/libc/elf/Makefile
==============================================================================
--- fsf/trunk/libc/elf/Makefile (original)
+++ fsf/trunk/libc/elf/Makefile Thu Jun 18 00:06:16 2009
@@ -993,14 +993,7 @@
 	  $< > $@
 
 $(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: $(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