From owner-svn-src-all@FreeBSD.ORG  Wed Feb 16 21:04:47 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 652751065693;
	Wed, 16 Feb 2011 21:04:47 +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 53D598FC19;
	Wed, 16 Feb 2011 21:04:47 +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 p1GL4lRK083636;
	Wed, 16 Feb 2011 21:04:47 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1GL4liR083634;
	Wed, 16 Feb 2011 21:04:47 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201102162104.p1GL4liR083634@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 16 Feb 2011 21:04:47 +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: r218749 - head/usr.sbin/uathload
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Feb 2011 21:04:47 -0000

Author: dim
Date: Wed Feb 16 21:04:47 2011
New Revision: 218749
URL: http://svn.freebsd.org/changeset/base/218749

Log:
  Only use -z noexecstack for these explicit arches: i386, amd64, powerpc
  and powerpc64.  Other arches currently do not support this feature.
  
  Reminded by:	kib

Modified:
  head/usr.sbin/uathload/Makefile

Modified: head/usr.sbin/uathload/Makefile
==============================================================================
--- head/usr.sbin/uathload/Makefile	Wed Feb 16 20:46:57 2011	(r218748)
+++ head/usr.sbin/uathload/Makefile	Wed Feb 16 21:04:47 2011	(r218749)
@@ -7,7 +7,7 @@ SRCS=	uathload.c ar5523.bin
 
 CLEANFILES=	ar5523.bin
 
-.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64"
 LDFLAGS+=	-Wl,-z,noexecstack
 .endif