Author: dim
Date: Wed Feb 16 20:46:57 2011
New Revision: 218748
URL: http://svn.freebsd.org/changeset/base/218748

Log:
  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.

Modified:
  head/usr.sbin/uathload/Makefile

Modified: head/usr.sbin/uathload/Makefile
==============================================================================
--- head/usr.sbin/uathload/Makefile     Wed Feb 16 20:07:44 2011        
(r218747)
+++ head/usr.sbin/uathload/Makefile     Wed Feb 16 20:46:57 2011        
(r218748)
@@ -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}
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to