From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 17 Jun 2009 03:46:42 +0000 (-0700)
Subject: Build pt_chown as PIE.
X-Git-Tag: upstream/2.30~13513
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f051ddfe22d3db4e77d6a545d5363be8b986cb96;p=external%2Fglibc.git

Build pt_chown as PIE.
---

diff --git a/ChangeLog b/ChangeLog
index c91fe1f..115cb8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* login/Makefile: Build pt_chown as PIE.
+
 2009-06-15  Andreas Schwab  <aschwab@redhat.com>
 
 	* debug/xtrace.sh (do_help): Don't treat bug reporting message as
diff --git a/login/Makefile b/login/Makefile
index 427c050..beb2a5c 100644
--- a/login/Makefile
+++ b/login/Makefile
@@ -54,10 +54,23 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
 	     $(resolvobjdir)/libresolv.a $(common-objpfx)libc.a
 endif
 
+ifeq (yesyes,$(have-fpie)$(build-shared))
+pt_chown-cflags += $(pie-ccflag)
+endif
+ifeq (yes,$(have-ssp))
+pt_chown-cflags += -fstack-protector
+endif
 ifeq (yes,$(have-libcap))
 libcap = -lcap
 endif
+CFLAGS-pt_chown.c = $(pt_chown-cflags)
 LDLIBS-pt_chown = $(libcap)
+ifeq (yesyes,$(have-fpie)$(build-shared))
+LDFLAGS-pt_chown = -Wl,-z,now
+
+$(objpfx)pt_chown: $(objpfx)pt_chown.o
+	$(+link-pie)
+endif
 
 # pt_chown needs to be setuid root.
 $(inst_libexecdir)/pt_chown: $(objpfx)pt_chown $(+force)