diff options
| author | DRC <dcommander@users.sourceforge.net> | 2009-10-08 09:41:39 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2009-10-08 09:41:39 +0000 |
| commit | f081381dcabe8fc555cfa7e4339748ff521a7b2b (patch) | |
| tree | 6530e592ed29a6fb4b2d362d24ea99b4488fbbe9 /common | |
| parent | 4eca36021acc9d71652a850e906a2cedcd4c9b93 (diff) | |
| download | tigervnc-f081381dcabe8fc555cfa7e4339748ff521a7b2b.tar.gz tigervnc-f081381dcabe8fc555cfa7e4339748ff521a7b2b.zip | |
Enable 64-bit build on Snow Leopard
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3911 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common')
| -rw-r--r-- | common/jpeg/acinclude.m4 | 10 | ||||
| -rw-r--r-- | common/jpeg/simd/jsimd_x86_64.c | 2 | ||||
| -rwxr-xr-x | common/jpeg/simd/nasm_lt.sh | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/common/jpeg/acinclude.m4 b/common/jpeg/acinclude.m4 index f7d7b690..9b8d3125 100644 --- a/common/jpeg/acinclude.m4 +++ b/common/jpeg/acinclude.m4 @@ -44,7 +44,14 @@ case "$host_os" in objfmt='ELF' ;; darwin* | rhapsody* | nextstep* | openstep* | macos*) - objfmt='Mach-O' + case "$host_cpu" in + x86_64) + objfmt='Mach-O64' + ;; + *) + objfmt='Mach-O' + ;; + esac ;; *) objfmt='ELF ?' @@ -68,6 +75,7 @@ case "$objfmt" in ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';; RDF) NAFLAGS='-frdf -DRDF';; Mach-O) NAFLAGS='-fmacho -DMACHO';; + Mach-O64) NAFLAGS='-fmacho64 -DMACHO -D__x86_64__';; esac AC_MSG_RESULT([$NAFLAGS]) AC_SUBST([NAFLAGS]) diff --git a/common/jpeg/simd/jsimd_x86_64.c b/common/jpeg/simd/jsimd_x86_64.c index 4c1ef7d1..0da564c4 100644 --- a/common/jpeg/simd/jsimd_x86_64.c +++ b/common/jpeg/simd/jsimd_x86_64.c @@ -24,7 +24,7 @@ * In the PIC cases, we have no guarantee that constants will keep * their alignment. This macro allows us to verify it at runtime. */ -#define IS_ALIGNED(ptr, order) (((unsigned)ptr & ((1 << order) - 1)) == 0) +#define IS_ALIGNED(ptr, order) (((unsigned long)ptr & ((1 << order) - 1)) == 0) #define IS_ALIGNED_SSE(ptr) (IS_ALIGNED(ptr, 4)) /* 16 byte alignment */ diff --git a/common/jpeg/simd/nasm_lt.sh b/common/jpeg/simd/nasm_lt.sh index 68893b70..b112862a 100755 --- a/common/jpeg/simd/nasm_lt.sh +++ b/common/jpeg/simd/nasm_lt.sh @@ -12,7 +12,7 @@ while [ $# -gt 0 ]; do fi ;; -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \ - -fobj|-fwin32|-frdf|-fieee|-fmacho) + -fobj|-fwin32|-frdf|-fieee|-fmacho|-fmacho64) # it's a file format specifier for nasm. command="$command $1" ;; |