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

diff --git a/common/jpeg/acinclude.m4 b/common/jpeg/acinclude.m4
index f7d7b690b4e351aae262fd2d768709bb102db64f..9b8d31252e0dffc21ba68c472e88767cbb942487 100644 (file)
--- 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 4c1ef7d154dde7505758132645a53a261a284fc5..0da564c44ea5395c04d566ceb747d559a81a8f2e 100644 (file)
--- 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 68893b70e2a588d9a95c6e85ac48b76df640950e..b112862ac18370fec03ed0604985117c0f090821 100755 (executable)
--- 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"
             ;;