From owner-svn-src-head@FreeBSD.ORG  Fri Jan  7 14:35:46 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 3BA11106564A;
	Fri,  7 Jan 2011 14:35:46 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B1B38FC12;
	Fri,  7 Jan 2011 14:35:46 +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 p07EZkHD055562;
	Fri, 7 Jan 2011 14:35:46 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p07EZkNU055560;
	Fri, 7 Jan 2011 14:35:46 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201101071435.p07EZkNU055560@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 7 Jan 2011 14:35:46 +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: r217101 - head/lib/libcompiler_rt
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: Fri, 07 Jan 2011 14:35:46 -0000

Author: kib
Date: Fri Jan  7 14:35:45 2011
New Revision: 217101
URL: http://svn.freebsd.org/changeset/base/217101

Log:
  On amd64 and i386, force assembler to mark objects compiled from the
  assembler source for libcompiler_rt as not needed executable stack. This
  is done with a hammer instead of properly marking each assembly file
  with section .note.GNU-stack to avoid modifying contributed source.
  
  Discussed with:	ed

Modified:
  head/lib/libcompiler_rt/Makefile

Modified: head/lib/libcompiler_rt/Makefile
==============================================================================
--- head/lib/libcompiler_rt/Makefile	Fri Jan  7 14:32:29 2011	(r217100)
+++ head/lib/libcompiler_rt/Makefile	Fri Jan  7 14:35:45 2011	(r217101)
@@ -156,4 +156,10 @@ SYMLINKS+=libcompiler_rt_p.a ${LIBDIR}/l
 . endif
 .endif
 
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+AFLAGS+=--noexecstack
+ACFLAGS+=-Wl,a,--noexecstack
+.endif
+
+
 .include <bsd.lib.mk>