aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2009-08-29 13:35:23 +0300
committerLasse Collin <lasse.collin@tukaani.org>2009-08-29 13:35:23 +0300
commit43f44160b1ddcbf7e5205c37db09b3bebe7226f9 (patch)
tree9c66c0522c92c32322e4b08aa22bf7c7aa26730d
parent"make dist" fixes (diff)
downloadxz-43f44160b1ddcbf7e5205c37db09b3bebe7226f9.tar.xz
Fix x86 assembler on GCC 3.
Thanks to Karl Berry.
-rw-r--r--src/liblzma/check/crc32_x86.S7
-rw-r--r--src/liblzma/check/crc64_x86.S7
2 files changed, 10 insertions, 4 deletions
diff --git a/src/liblzma/check/crc32_x86.S b/src/liblzma/check/crc32_x86.S
index cca29891..f9574b27 100644
--- a/src/liblzma/check/crc32_x86.S
+++ b/src/liblzma/check/crc32_x86.S
@@ -117,8 +117,11 @@ LZMA_CRC32:
*/
#if (!defined(PIC) && !defined(__PIC__)) \
|| (defined(_WIN32) || defined(__CYGWIN__))
- /* Not PIC */
- movl $LZMA_CRC32_TABLE, %ebx
+ /*
+ * Not PIC.
+ * Using MAKE_SYM since $LZMA_CRC32_TABLE breaks with GCC 3.
+ */
+ movl MAKE_SYM($, LZMA_CRC32_TABLE), %ebx
#elif defined(__MACH__)
/* Mach-O */
call .L_get_pc
diff --git a/src/liblzma/check/crc64_x86.S b/src/liblzma/check/crc64_x86.S
index 17de076a..b8e5ea3f 100644
--- a/src/liblzma/check/crc64_x86.S
+++ b/src/liblzma/check/crc64_x86.S
@@ -108,8 +108,11 @@ LZMA_CRC64:
*/
#if (!defined(PIC) && !defined(__PIC__)) \
|| (defined(_WIN32) || defined(__CYGWIN__))
- /* Not PIC */
- movl $LZMA_CRC64_TABLE, %ebx
+ /*
+ * Not PIC.
+ * Using MAKE_SYM since $LZMA_CRC64_TABLE breaks with GCC 3.
+ */
+ movl MAKE_SYM($, LZMA_CRC64_TABLE), %ebx
#elif defined(__MACH__)
/* Mach-O */
call .L_get_pc