Date: Tue, 20 Mar 2018 02:54:32 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> 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 Message-ID: <201803200254.w2K2sWAH007443@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803200254.w2K2sWAH007443>