aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2022-02-11 15:25:46 +0000
committerLasse Collin <lasse.collin@tukaani.org>2022-02-22 01:23:34 +0200
commit865e0a3689a25a7ee8eecae1a34c1775e3aa676e (patch)
treef213fdddb63a48a0c9036a51cd436fdd06e984cf /src
parentliblzma: Make Block decoder catch certain types of errors better. (diff)
downloadxz-865e0a3689a25a7ee8eecae1a34c1775e3aa676e.tar.xz
liblzma: Use non-executable stack on FreeBSD as on Linux
Diffstat (limited to '')
-rw-r--r--src/liblzma/check/crc32_x86.S4
-rw-r--r--src/liblzma/check/crc64_x86.S4
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