Added note.GNU-stack to x86 assembler files. It is needed

when using non-executable stack.

diff --git a/src/liblzma/check/crc32_x86.S b/src/liblzma/check/crc32_x86.S
index f1ae7f7..82cfb94 100644 (file)
--- a/src/liblzma/check/crc32_x86.S
+++ b/src/liblzma/check/crc32_x86.S
@@ -215,3 +215,12 @@ lzma_crc32:
        ret
 
        .size   lzma_crc32, .-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
+ * we are using GNU assembler.
+ */
+#if defined(__ELF__) && 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 7ad3d88..78935e6 100644 (file)
--- a/src/liblzma/check/crc64_x86.S
+++ b/src/liblzma/check/crc64_x86.S
@@ -201,3 +201,12 @@ lzma_crc64:
        ret
 
        .size   lzma_crc64, .-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
+ * we are using GNU assembler.
+ */
+#if defined(__ELF__) && defined(__linux__)
+       .section        .note.GNU-stack,"",@progbits
+#endif