From owner-svn-src-all@freebsd.org Sat Jun 3 02:42:50 2017 Return-Path: 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 99D76B7BBE3; Sat, 3 Jun 2017 02:42:50 +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 662CC7FFAC; Sat, 3 Jun 2017 02:42:50 +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 v532gnXG072042; Sat, 3 Jun 2017 02:42:49 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v532gni4072040; Sat, 3 Jun 2017 02:42:49 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201706030242.v532gni4072040@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sat, 3 Jun 2017 02:42:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r319510 - head/contrib/xz/src/liblzma/check X-SVN-Group: head 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jun 2017 02:42:50 -0000 Author: emaste Date: Sat Jun 3 02:42:49 2017 New Revision: 319510 URL: https://svnweb.freebsd.org/changeset/base/319510 Log: xz: set noexec stack flag on FreeBSD Will also be proposed upstream. Reviewed by: delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D11033 Modified: head/contrib/xz/src/liblzma/check/crc32_x86.S head/contrib/xz/src/liblzma/check/crc64_x86.S Modified: head/contrib/xz/src/liblzma/check/crc32_x86.S ============================================================================== --- head/contrib/xz/src/liblzma/check/crc32_x86.S Fri Jun 2 22:35:18 2017 (r319509) +++ head/contrib/xz/src/liblzma/check/crc32_x86.S Sat Jun 3 02:42:49 2017 (r319510) @@ -299,6 +299,6 @@ LZMA_CRC32: * use __linux__ here, but I don't know a way to detect when * we are using GNU assembler. */ -#if defined(__ELF__) && defined(__linux__) +#if defined(__ELF__) && (defined(__FreeBSD__) || defined(__linux__)) .section .note.GNU-stack,"",@progbits #endif Modified: head/contrib/xz/src/liblzma/check/crc64_x86.S ============================================================================== --- head/contrib/xz/src/liblzma/check/crc64_x86.S Fri Jun 2 22:35:18 2017 (r319509) +++ head/contrib/xz/src/liblzma/check/crc64_x86.S Sat Jun 3 02:42:49 2017 (r319510) @@ -282,6 +282,6 @@ LZMA_CRC64: * use __linux__ here, but I don't know a way to detect when * we are using GNU assembler. */ -#if defined(__ELF__) && defined(__linux__) +#if defined(__ELF__) && (defined(__FreeBSD__) || defined(__linux__)) .section .note.GNU-stack,"",@progbits #endif