Hopefully improved portability of the assembler code in

Autotools based builds on Windows.

diff --git a/src/liblzma/check/crc32_x86.S b/src/liblzma/check/crc32_x86.S
index 2342168b6c30c4aaa56d9a01cae2aa7857ea92ce..cca29891f8248ed6edafe4e6f4109005ef09d194 100644 (file)
--- a/src/liblzma/check/crc32_x86.S
+++ b/src/liblzma/check/crc32_x86.S
@@ -109,8 +109,14 @@ LZMA_CRC32:
         * by GCC but only on some systems. Testing for both makes it simpler
         * to test this code without libtool, and keeps the code working also
         * when built with libtool but using something else than GCC.
+        *
+        * I understood that libtool may define PIC on Windows even though
+        * the code in Windows DLLs is not PIC in sense that it is in ELF
+        * binaries, so we need a separate check to always use the non-PIC
+        * code on Windows.
         */
-#if !defined(PIC) && !defined(__PIC__)
+#if (!defined(PIC) && !defined(__PIC__)) \
+               || (defined(_WIN32) || defined(__CYGWIN__))
        /* Not PIC */
        movl    $LZMA_CRC32_TABLE, %ebx
 #elif defined(__MACH__)

diff --git a/src/liblzma/check/crc64_x86.S b/src/liblzma/check/crc64_x86.S
index 8b0a42dbf3190c53a6ba66754cb619e0c7b8c498..17de076ac9ae49947ac623c7329cd8abcf80aab0 100644 (file)
--- a/src/liblzma/check/crc64_x86.S
+++ b/src/liblzma/check/crc64_x86.S
@@ -100,8 +100,14 @@ LZMA_CRC64:
         * by GCC but only on some systems. Testing for both makes it simpler
         * to test this code without libtool, and keeps the code working also
         * when built with libtool but using something else than GCC.
+        *
+        * I understood that libtool may define PIC on Windows even though
+        * the code in Windows DLLs is not PIC in sense that it is in ELF
+        * binaries, so we need a separate check to always use the non-PIC
+        * code on Windows.
         */
-#if !defined(PIC) && !defined(__PIC__)
+#if (!defined(PIC) && !defined(__PIC__)) \
+               || (defined(_WIN32) || defined(__CYGWIN__))
        /* Not PIC */
        movl    $LZMA_CRC64_TABLE, %ebx
 #elif defined(__MACH__)