diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-02-11 15:25:46 +0000 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2022-07-12 19:30:40 +0300 |
| commit | 748ef0833821f1ea4ff5d57abc3cab1ae76266d3 (patch) | |
| tree | 1469c9ab4b38cd8ee0fa7e542b5c465ea9c2c264 | |
| parent | liblzma: Make Block decoder catch certain types of errors better. (diff) | |
| download | xz-748ef0833821f1ea4ff5d57abc3cab1ae76266d3.tar.xz | |
liblzma: Use non-executable stack on FreeBSD as on Linux
| -rw-r--r-- | src/liblzma/check/crc32_x86.S | 4 | ||||
| -rw-r--r-- | src/liblzma/check/crc64_x86.S | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/liblzma/check/crc32_x86.S b/src/liblzma/check/crc32_x86.S index 7814beca..4f395df8 100644 --- a/src/liblzma/check/crc32_x86.S +++ b/src/liblzma/check/crc32_x86.S @@ -305,9 +305,9 @@ LZMA_CRC32: /* * This is needed to support non-executable stack. It's ugly to - * use __linux__ here, but I don't know a way to detect when + * use __FreeBSD__ and __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/src/liblzma/check/crc64_x86.S b/src/liblzma/check/crc64_x86.S index 7ee08f64..9aecf586 100644 --- a/src/liblzma/check/crc64_x86.S +++ b/src/liblzma/check/crc64_x86.S @@ -288,9 +288,9 @@ LZMA_CRC64: /* * This is needed to support non-executable stack. It's ugly to - * use __linux__ here, but I don't know a way to detect when + * use __FreeBSD__ and __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 |