root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use __APPLE__ instead of __MACH__ in ASM files. 

This allows the files to work on HURD.

Thanks to Jonathan Nieder.
This commit is contained in:
Lasse Collin 2010-02-12 12:31:22 +02:00
parent 6503fde658
commit 6b50c9429b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/liblzma/check/crc32_x86.S
View File

@ -67,7 +67,7 @@ init_table(void)
* Solaris assembler doesn't have .p2align, and Darwin uses .align * Solaris assembler doesn't have .p2align, and Darwin uses .align
* differently than GNU/Linux and Solaris. * differently than GNU/Linux and Solaris.
*/ */
#if defined(__MACH__) || defined(__MSDOS__) #if defined(__APPLE__) || defined(__MSDOS__)
# define ALIGN(pow2, abs) .align pow2 # define ALIGN(pow2, abs) .align pow2
#else #else
# define ALIGN(pow2, abs) .align abs # define ALIGN(pow2, abs) .align abs
@ -76,7 +76,7 @@ init_table(void)
.text .text
.globl LZMA_CRC32 .globl LZMA_CRC32
#if !defined(__MACH__) && !defined(_WIN32) && !defined(__CYGWIN__) \ #if !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) \
&& !defined(__MSDOS__) && !defined(__MSDOS__)
.type LZMA_CRC32, @function .type LZMA_CRC32, @function
#endif #endif
@ -119,7 +119,7 @@ LZMA_CRC32:
|| (defined(_WIN32) || defined(__CYGWIN__)) || (defined(_WIN32) || defined(__CYGWIN__))
/* Not PIC */ /* Not PIC */
movl $ LZMA_CRC32_TABLE, %ebx movl $ LZMA_CRC32_TABLE, %ebx
#elif defined(__MACH__) #elif defined(__APPLE__)
/* Mach-O */ /* Mach-O */
call .L_get_pc call .L_get_pc
.L_pic: .L_pic:
@ -275,7 +275,7 @@ LZMA_CRC32:
ret ret
#endif #endif
#if defined(__MACH__) && (defined(PIC) || defined(__PIC__)) #if defined(__APPLE__) && (defined(PIC) || defined(__PIC__))
/* Mach-O PIC */ /* Mach-O PIC */
.section __IMPORT,__pointers,non_lazy_symbol_pointers .section __IMPORT,__pointers,non_lazy_symbol_pointers
.L_lzma_crc32_table$non_lazy_ptr: .L_lzma_crc32_table$non_lazy_ptr:

8
src/liblzma/check/crc64_x86.S
View File

@ -57,7 +57,7 @@ init_table(void)
* Solaris assembler doesn't have .p2align, and Darwin uses .align * Solaris assembler doesn't have .p2align, and Darwin uses .align
* differently than GNU/Linux and Solaris. * differently than GNU/Linux and Solaris.
*/ */
#if defined(__MACH__) || defined(__MSDOS__) #if defined(__APPLE__) || defined(__MSDOS__)
# define ALIGN(pow2, abs) .align pow2 # define ALIGN(pow2, abs) .align pow2
#else #else
# define ALIGN(pow2, abs) .align abs # define ALIGN(pow2, abs) .align abs
@ -66,7 +66,7 @@ init_table(void)
.text .text
.globl LZMA_CRC64 .globl LZMA_CRC64
#if !defined(__MACH__) && !defined(_WIN32) && !defined(__CYGWIN__) \ #if !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) \
&& !defined(__MSDOS__) && !defined(__MSDOS__)
.type LZMA_CRC64, @function .type LZMA_CRC64, @function
#endif #endif
@ -110,7 +110,7 @@ LZMA_CRC64:
|| (defined(_WIN32) || defined(__CYGWIN__)) || (defined(_WIN32) || defined(__CYGWIN__))
/* Not PIC */ /* Not PIC */
movl $ LZMA_CRC64_TABLE, %ebx movl $ LZMA_CRC64_TABLE, %ebx
#elif defined(__MACH__) #elif defined(__APPLE__)
/* Mach-O */ /* Mach-O */
call .L_get_pc call .L_get_pc
.L_pic: .L_pic:
@ -258,7 +258,7 @@ LZMA_CRC64:
ret ret
#endif #endif
#if defined(__MACH__) && (defined(PIC) || defined(__PIC__)) #if defined(__APPLE__) && (defined(PIC) || defined(__PIC__))
/* Mach-O PIC */ /* Mach-O PIC */
.section __IMPORT,__pointers,non_lazy_symbol_pointers .section __IMPORT,__pointers,non_lazy_symbol_pointers
.L_lzma_crc64_table$non_lazy_ptr: .L_lzma_crc64_table$non_lazy_ptr: