diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2017-06-03 02:42:49 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2017-06-03 02:42:49 +0000 |
| commit | 953111c9c536daf5304062914c0083cea5efb46b (patch) | |
| tree | f0c9891ad569bcd8fdf557410749f34e63d71f8f /contrib/xz | |
| parent | ebb2cc40d1f62e204166a72f9141416c16c11210 (diff) | |
| download | src-953111c9c536daf5304062914c0083cea5efb46b.tar.gz src-953111c9c536daf5304062914c0083cea5efb46b.zip | |
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
Notes
Notes:
svn path=/head/; revision=319510
Diffstat (limited to 'contrib/xz')
| -rw-r--r-- | contrib/xz/src/liblzma/check/crc32_x86.S | 2 | ||||
| -rw-r--r-- | contrib/xz/src/liblzma/check/crc64_x86.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/xz/src/liblzma/check/crc32_x86.S b/contrib/xz/src/liblzma/check/crc32_x86.S index 67f68a4145f8..1ef7f7e37ae9 100644 --- a/contrib/xz/src/liblzma/check/crc32_x86.S +++ b/contrib/xz/src/liblzma/check/crc32_x86.S @@ -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 diff --git a/contrib/xz/src/liblzma/check/crc64_x86.S b/contrib/xz/src/liblzma/check/crc64_x86.S index f5bb84b97e0a..81e06261e0f2 100644 --- a/contrib/xz/src/liblzma/check/crc64_x86.S +++ b/contrib/xz/src/liblzma/check/crc64_x86.S @@ -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 |