From owner-svn-src-all@freebsd.org Tue Mar 20 02:54:32 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC15DF672F8; Tue, 20 Mar 2018 02:54:32 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7CF7E77B30; Tue, 20 Mar 2018 02:54:32 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74F351727B; Tue, 20 Mar 2018 02:54:32 +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 w2K2sWa2007445; Tue, 20 Mar 2018 02:54:32 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2K2sWAH007443; Tue, 20 Mar 2018 02:54:32 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201803200254.w2K2sWAH007443@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 20 Mar 2018 02:54:32 +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: r331235 - stable/11/contrib/xz/src/liblzma/check X-SVN-Group: stable-11 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/11/contrib/xz/src/liblzma/check X-SVN-Commit-Revision: 331235 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.25 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: Tue, 20 Mar 2018 02:54:33 -0000 Author: emaste Date: Tue Mar 20 02:54:32 2018 New Revision: 331235 URL: https://svnweb.freebsd.org/changeset/base/331235 Log: MFC r319510: xz: set noexec stack flag on FreeBSD Modified: stable/11/contrib/xz/src/liblzma/check/crc32_x86.S stable/11/contrib/xz/src/liblzma/check/crc64_x86.S Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/xz/src/liblzma/check/crc32_x86.S ============================================================================== --- stable/11/contrib/xz/src/liblzma/check/crc32_x86.S Tue Mar 20 02:50:11 2018 (r331234) +++ stable/11/contrib/xz/src/liblzma/check/crc32_x86.S Tue Mar 20 02:54:32 2018 (r331235) @@ -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: stable/11/contrib/xz/src/liblzma/check/crc64_x86.S ============================================================================== --- stable/11/contrib/xz/src/liblzma/check/crc64_x86.S Tue Mar 20 02:50:11 2018 (r331234) +++ stable/11/contrib/xz/src/liblzma/check/crc64_x86.S Tue Mar 20 02:54:32 2018 (r331235) @@ -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