Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.226.2.3
retrieving revision 1.250
diff -u -p -r1.226.2.3 -r1.250
--- src/share/mk/bsd.prog.mk	2008/10/05 20:11:24	1.226.2.3
+++ src/share/mk/bsd.prog.mk	2010/10/31 11:52:53	1.250
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.226.2.3 2008/10/05 20:11:24 mjf Exp $
+#	$NetBSD: bsd.prog.mk,v 1.250 2010/10/31 11:52:53 mbalmer Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -27,11 +27,6 @@ clean:		cleanprog
 	echo "source ${__gdbinit}" >> .gdbinit
 .endfor
 
-cleanextra: .PHONY
-.if defined(CLEANFILES) && !empty(CLEANFILES)
-	rm -f ${CLEANFILES}
-.endif
-
 cleanobjs: .PHONY
 
 cleanprog: .PHONY cleanobjs cleanextra
@@ -51,15 +46,30 @@ CLEANFILES+=strings
 	@rm -f x.cc
 .endif
 
+.if defined(MKPIE) && (${MKPIE} != "no")
+CFLAGS+=	${PIE_CFLAGS}
+AFLAGS+=	${PIE_AFLAGS}
+LDFLAGS+=	${PIE_LDFLAGS}
+.endif
+
 ##### Default values
+.if empty(CPPFLAGS:M-nostdinc)
 CPPFLAGS+=	${DESTDIR:D-nostdinc ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include}
+.endif
+.if empty(CXXFLAGS:M-nostdinc++)
 CXXFLAGS+=	${DESTDIR:D-nostdinc++ ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++}
+.endif
 CFLAGS+=	${COPTS}
 OBJCFLAGS+=	${OBJCOPTS}
 MKDEP_SUFFIXES?=	.o .ln
 
+# CTF preserve debug symbols
+.if defined(MKDTRACE) && (${MKDTRACE} != "no") && (${CFLAGS:M-g} != "")
+CTFFLAGS+= -g
+CTFMFLAGS+= -g
+.endif
+
 # ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
-.if ${OBJECT_FMT} == "ELF"
 .ifndef LIBCRTBEGIN
 LIBCRTBEGIN=	${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}
 .MADE: ${LIBCRTBEGIN}
@@ -69,11 +79,6 @@ LIBCRTEND=	${_GCC_CRTEND} ${DESTDIR}/usr
 .MADE: ${LIBCRTEND}
 .endif
 _SHLINKER=	${SHLINKDIR}/ld.elf_so
-.else
-LIBCRTBEGIN?=
-LIBCRTEND?=
-_SHLINKER=	${SHLINKDIR}/ld.so
-.endif
 
 .ifndef LIBCRT0
 LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
@@ -92,9 +97,9 @@ LIBCRT0=	${DESTDIR}/usr/lib/crt0.o
 	crypt crypto crypto_idea crypto_mdc2 crypto_rc5 \
 	curses dbm des edit event \
 	fetch form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \
-	kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r \
+	kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r lua \
 	m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
-	puffs radius resolv rmt roken rpcsvc rt rump rumpuser sdp skey sl ss \
+	puffs radius resolv rmt roken rpcsvc rt rump rumpuser skey sl ss \
 	ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \
 	\
 	rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \
@@ -156,10 +161,8 @@ CPPFLAGS+=	-DRESCUEDIR=\"${RESCUEDIR}\"
 
 _PROGLDOPTS=
 .if ${SHLINKDIR} != "/usr/libexec"	# XXX: change or remove if ld.so moves
-.if ${OBJECT_FMT} == "ELF"
 _PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHLINKER}
 .endif
-.endif
 .if ${SHLIBDIR} != "/usr/lib"
 _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \
 		-R${SHLIBDIR} \
@@ -251,7 +254,7 @@ _CCLINK.${_P}=	${CXX} ${_CCLINKFLAGS}
 BINDIR.${_P}?=		${BINDIR}
 PROGNAME.${_P}?=	${_P}
 
-.if ${MKDEBUG} != "no" && ${OBJECT_FMT} == "ELF" && !commands(${_P})
+.if ${MKDEBUG} != "no" && !commands(${_P})
 _PROGDEBUG.${_P}:=	${PROGNAME.${_P}}.debug
 .endif
 
@@ -260,18 +263,7 @@ PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
 .endif
 
 ##### PROG specific flags.
-COPTS+=     ${COPTS.${_P}}
-CPPFLAGS+=  ${CPPFLAGS.${_P}}
-CXXFLAGS+=  ${CXXFLAGS.${_P}}
-OBJCOPTS+=  ${OBJCOPTS.${_P}}
-LDADD+=     ${LDADD.${_P}}
-LDFLAGS+=   ${LDFLAGS.${_P}}
-LDSTATIC+=  ${LDSTATIC.${_P}}
-
-_COPTS.${_P}=		${COPTS}    ${COPTS.${_P}}
-_CPPFLAGS.${_P}=	${CPPFLAGS} ${CPPFLAGS.${_P}}
-_CXXFLAGS.${_P}=	${CXXFLAGS} ${CXXFLAGS.${_P}}
-_OBJCOPTS.${_P}=	${OBJCOPTS} ${OBJCOPTS.${_P}}
+
 _LDADD.${_P}=		${LDADD}    ${LDADD.${_P}}
 _LDFLAGS.${_P}=		${LDFLAGS}  ${LDFLAGS.${_P}}
 _LDSTATIC.${_P}=	${LDSTATIC} ${LDSTATIC.${_P}}
@@ -305,6 +297,9 @@ ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
 	    ${OBJS.${_P}} ${_LDADD.${_P}} \
 	    ${DESTDIR:D-L${_GCC_LIBGCCDIR}} \
 	    ${_PROGLDOPTS}
+.if defined(CTFMERGE)
+	${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
+.endif
 .if defined(PAXCTL_FLAGS.${_P})
 	${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
 .endif
@@ -315,13 +310,13 @@ ${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}}
 
 ${_P}.ro: ${OBJS.${_P}} ${DPADD}
 	${_MKTARGET_LINK}
-	${LD} -r -dc -o ${.TARGET} ${OBJS.${_P}}
+	${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
 
 .if defined(_PROGDEBUG.${_P})
 ${_PROGDEBUG.${_P}}: ${_P}
 	${_MKTARGET_CREATE}
 	${OBJCOPY} --only-keep-debug ${_P} ${_PROGDEBUG.${_P}}
-	${OBJCOPY} -R .gnu_debuglink --add-gnu-debuglink=${_PROGDEBUG.${_P}} ${_P} \
+	${OBJCOPY} --strip-debug -R .gnu_debuglink --add-gnu-debuglink=${_PROGDEBUG.${_P}} ${_P} \
 	    || rm -f ${_PROGDEBUG.${_P}}
 .endif
 
@@ -441,6 +436,9 @@ scriptsinstall::
 .PHONY:		scriptsinstall
 
 ##### Pull in related .mk logic
+LINKSOWN?= ${BINOWN}
+LINKSGRP?= ${BINGRP}
+LINKSMODE?= ${BINMODE}
 .include <bsd.man.mk>
 .include <bsd.nls.mk>
 .include <bsd.files.mk>
@@ -449,6 +447,11 @@ scriptsinstall::
 .include <bsd.sys.mk>
 .include <bsd.dep.mk>
 
+cleanextra: .PHONY
+.if defined(CLEANFILES) && !empty(CLEANFILES)
+	rm -f ${CLEANFILES}
+.endif
+
 ${TARGETS}:	# ensure existence
 
 .endif	# HOSTPROG