From owner-svn-src-all@freebsd.org  Sun Jul 16 19:21:34 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89DF2C7811A;
 Sun, 16 Jul 2017 19:21:34 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5861563CFC;
 Sun, 16 Jul 2017 19:21:34 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6GJLXcp013808;
 Sun, 16 Jul 2017 19:21:33 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6GJLXZp013807;
 Sun, 16 Jul 2017 19:21:33 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201707161921.v6GJLXZp013807@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 16 Jul 2017 19:21:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r321054 - stable/11/contrib/compiler-rt/lib/tsan/rtl
X-SVN-Group: stable-11
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/11/contrib/compiler-rt/lib/tsan/rtl
X-SVN-Commit-Revision: 321054
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jul 2017 19:21:34 -0000

Author: emaste
Date: Sun Jul 16 19:21:33 2017
New Revision: 321054
URL: https://svnweb.freebsd.org/changeset/base/321054

Log:
  MFC r319516: tsan: set noexec stack on aarch64
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S
==============================================================================
--- stable/11/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S	Sun Jul 16 19:20:15 2017	(r321053)
+++ stable/11/contrib/compiler-rt/lib/tsan/rtl/tsan_rtl_aarch64.S	Sun Jul 16 19:21:33 2017	(r321054)
@@ -252,7 +252,7 @@ __sigsetjmp:
   CFI_ENDPROC
 .size __sigsetjmp, .-__sigsetjmp
 
-#if defined(__linux__)
+#if defined(__FreeBSD__) || defined(__linux__)
 /* We do not need executable stack.  */
 .section        .note.GNU-stack,"",@progbits
 #endif