From owner-svn-src-head@FreeBSD.ORG  Wed Feb 16 20:46:57 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E59BD1065679;
	Wed, 16 Feb 2011 20:46:57 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D3FA38FC2C;
	Wed, 16 Feb 2011 20:46:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1GKkvkV083135;
	Wed, 16 Feb 2011 20:46:57 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1GKkvng083133;
	Wed, 16 Feb 2011 20:46:57 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201102162046.p1GKkvng083133@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 16 Feb 2011 20:46:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218748 - head/usr.sbin/uathload
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Feb 2011 20:46:58 -0000

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}