summaryrefslogtreecommitdiffstats
path: root/usr.sbin/uathload
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2011-02-16 20:46:57 +0000
committerdim <dim@FreeBSD.org>2011-02-16 20:46:57 +0000
commit08fa1606e880e4a9b647e294fea72882692d42ed (patch)
tree4115cf9bf697676c6baafdb047185105c084c382 /usr.sbin/uathload
parent65fe494e0a236230fb5cc87a79cc5e45d29f3032 (diff)
downloadFreeBSD-src-08fa1606e880e4a9b647e294fea72882692d42ed.zip
FreeBSD-src-08fa1606e880e4a9b647e294fea72882692d42ed.tar.gz
Fix the last binary in the base system that still has an executable
stack, /usr/sbin/uathload. Since this program links in a .o file containing a firmware blob, and there is no clean way to add a .note.GNU-stack section to this .o file, we simply use the -z noexecstack option to ld here.
Diffstat (limited to 'usr.sbin/uathload')
-rw-r--r--usr.sbin/uathload/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/usr.sbin/uathload/Makefile b/usr.sbin/uathload/Makefile
index 4f9b99d..ee06967 100644
--- a/usr.sbin/uathload/Makefile
+++ b/usr.sbin/uathload/Makefile
@@ -7,6 +7,10 @@ SRCS= uathload.c ar5523.bin
CLEANFILES= ar5523.bin
+.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64"
+LDFLAGS+= -Wl,-z,noexecstack
+.endif
+
ar5523.bin: ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu
uudecode -p ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu > ${.TARGET}
OpenPOWER on IntegriCloud