aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2009-08-31 21:59:25 +0300
committerLasse Collin <lasse.collin@tukaani.org>2009-08-31 21:59:25 +0300
commit655457b9ada5ec7db398c5392e41290f3f332ea8 (patch)
treed0b88cfe11348d951c01d2b9e5eb51c5e8f2c8f5
parentUpdated THANKS. (diff)
downloadxz-655457b9ada5ec7db398c5392e41290f3f332ea8.tar.xz
Revert 43f44160b1ddcbf7e5205c37db09b3bebe7226f9
and use a fix that works on all systems using GNU assembler. Maybe the assembler code is used e.g. on Solaris x86 but let's worry about it if this doesn't work on it.
-rw-r--r--src/liblzma/check/crc32_x86.S7
-rw-r--r--src/liblzma/check/crc64_x86.S7
2 files changed, 4 insertions, 10 deletions
diff --git a/src/liblzma/check/crc32_x86.S b/src/liblzma/check/crc32_x86.S
index f9574b27..4737a544 100644
--- a/src/liblzma/check/crc32_x86.S
+++ b/src/liblzma/check/crc32_x86.S
@@ -117,11 +117,8 @@ LZMA_CRC32:
*/
#if (!defined(PIC) && !defined(__PIC__)) \
|| (defined(_WIN32) || defined(__CYGWIN__))
- /*
- * Not PIC.
- * Using MAKE_SYM since $LZMA_CRC32_TABLE breaks with GCC 3.
- */
- movl MAKE_SYM($, LZMA_CRC32_TABLE), %ebx
+ /* Not PIC */
+ movl $ 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 b8e5ea3f..9a63726e 100644
--- a/src/liblzma/check/crc64_x86.S
+++ b/src/liblzma/check/crc64_x86.S
@@ -108,11 +108,8 @@ LZMA_CRC64:
*/
#if (!defined(PIC) && !defined(__PIC__)) \
|| (defined(_WIN32) || defined(__CYGWIN__))
- /*
- * Not PIC.
- * Using MAKE_SYM since $LZMA_CRC64_TABLE breaks with GCC 3.
- */
- movl MAKE_SYM($, LZMA_CRC64_TABLE), %ebx
+ /* Not PIC */
+ movl $ LZMA_CRC64_TABLE, %ebx
#elif defined(__MACH__)
/* Mach-O */
call .L_get_pc