add support for OS X and iOS as host system

Conflicts: README.md cctools/autogen.sh cctools/configure.ac cctools/ld64/src/3rd/helper.c cctools/ld64/src/other/Makefile.am
tpoechtrager · Oct 18, 2014 · ab742fe · ab742fe
1 parent 0139d23
commit ab742fe
Show file tree

Hide file tree

Showing 73 changed files with 510 additions and 275 deletions.
diff --git a/README.md b/README.md
@@ -1,16 +1,33 @@
 # Apple cctools port for Linux, FreeBSD and NetBSD #
 
-Current Version: 855 + ld64-134.9  
-Originally ported by cjacker from the [ios-toolchain-for-linux](https://code.google.com/p/ios-toolchain-based-on-clang-for-linux/) project.
+Current Version: 855 + ld64-134.9.  
+Originally ported by [cjacker](http://ios-toolchain-based-on-clang-for-linux.googlecode.com).
 
-## INSTALLATION ##
+## SUPPORTED HOSTS ##
+
+Linux  
+FreeBSD  
+NetBSD  
+Mac OS X  
+iOS (partially)
+
+## SUPPORTED TARGETS ##
+
+armv4t, armv5, armv6, armv7, armv7f, armv7k, armv7s, i386 and x86_64.
+
+## DEPENDENCIES ##
 
-Make sure you have the following installed on your Linux box:
+`Clang 3.2+`, `automake`, `autogen` and `libtool`.
+
+On Linux / FreeBSD / NetBSD you also need to install:
 
-`Clang 3.2+`, `llvm-devel`, `automake`, `autogen`, `libtool`,  
 `uuid-devel` and `openssl-devel`.
 
-Then type:
+Optional, but recommended deps:
+
+`llvm-devel` (Enables Link Time Optimization)
+
+## INSTALLATION ##
 
 * `cd cctools`
 * `./autogen.sh`
@@ -21,4 +38,4 @@ Then type:
 target = `i386-apple-darwin11`, `x86_64-apple-darwin11`, `arm-apple-darwin11`, ...
 
 If you get compile errors because of `unistd.h`, then please run  
-`../tools/fix-unistd-issue.sh` in the cctools directory and restart compiling.
+`../tools/fix_unistd_issue.sh` and restart compiling.
diff --git a/cctools/Makefile.am b/cctools/Makefile.am
@@ -1,2 +1,7 @@
+if ISDARWIN
+SUBDIRS=libstuff ar as misc otool ld64 $(LD_CLASSIC)
+else
 SUBDIRS=libstuff ar as misc libobjc2 otool ld64 $(LD_CLASSIC)
+endif
+
 ACLOCAL_AMFLAGS = -I m4
diff --git a/cctools/ar/Makefile.am b/cctools/ar/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = ar
 ar_LDADD =  \
         $(top_srcdir)/libstuff/libstuff.la
 
-ar_CFLAGS = -D__DARWIN_UNIX03 -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff $(WARNINGS) $(LTO_DEFS) $(ENDIAN_FLAG)
+ar_CFLAGS = -D__DARWIN_UNIX03 -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff $(WARNINGS) $(LTO_DEF) $(ENDIAN_FLAG)
 
 ar_SOURCES =  \
 	append.c  \

diff --git a/cctools/as/Makefile.am b/cctools/as/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = as
 as_LDADD =  \
         $(top_srcdir)/libstuff/libstuff.la
 
-as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff $(WARNINGS) $(LTO_DEFS) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 $(ENDIAN_FLAG)
+as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 $(ENDIAN_FLAG)
 
 as_SOURCES = driver.c 
diff --git a/cctools/as/arm/Makefile.am b/cctools/as/arm/Makefile.am
@@ -3,7 +3,7 @@ libexec_PROGRAMS = arm-as
 arm_as_LDADD =  \
         $(top_srcdir)/libstuff/libstuff.la
 
-arm_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEFS) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 -DARM
+arm_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 -DARM
 
 arm_as_SOURCES =  ../app.c ../as.c ../atof-generic.c ../atof-ieee.c ../expr.c ../fixes.c ../flonum-const.c \
          ../flonum-copy.c ../flonum-mult.c ../frags.c ../hash.c ../hex-value.c ../input-file.c \

diff --git a/cctools/as/i386/Makefile.am b/cctools/as/i386/Makefile.am
@@ -3,7 +3,7 @@ libexec_PROGRAMS = i386-as
 i386_as_LDADD =  \
         $(top_srcdir)/libstuff/libstuff.la
 
-i386_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEFS) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03  -DI386 -Di486 -Di586 -Di686
+i386_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03  -DI386 -Di486 -Di586 -Di686
 
 i386_as_SOURCES =  ../app.c ../as.c ../atof-generic.c ../atof-ieee.c ../expr.c ../fixes.c ../flonum-const.c \
          ../flonum-copy.c ../flonum-mult.c ../frags.c ../hash.c ../hex-value.c ../input-file.c \

diff --git a/cctools/as/ppc/Makefile.am b/cctools/as/ppc/Makefile.am
@@ -3,7 +3,7 @@ libexec_PROGRAMS = ppc-as
 ppc_as_LDADD =  \
         $(top_srcdir)/libstuff/libstuff.la
 
-ppc_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEFS) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03  -DPPC
+ppc_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03  -DPPC
 
 ppc_as_SOURCES =  ../app.c ../as.c ../atof-generic.c ../atof-ieee.c ../expr.c ../fixes.c ../flonum-const.c \
          ../flonum-copy.c ../flonum-mult.c ../frags.c ../hash.c ../hex-value.c ../input-file.c \

diff --git a/cctools/as/ppc64/Makefile.am b/cctools/as/ppc64/Makefile.am
@@ -3,7 +3,7 @@ libexec_PROGRAMS = ppc64-as
 ppc64_as_LDADD =  \
         $(top_srcdir)/libstuff/libstuff.la
 
-ppc64_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEFS) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03  -DPPC -DARCH64 
+ppc64_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03  -DPPC -DARCH64 
 
 ppc64_as_SOURCES =  ../app.c ../as.c ../atof-generic.c ../atof-ieee.c ../expr.c ../fixes.c ../flonum-const.c \
          ../flonum-copy.c ../flonum-mult.c ../frags.c ../hash.c ../hex-value.c ../input-file.c \

diff --git a/cctools/as/x86_64/Makefile.am b/cctools/as/x86_64/Makefile.am
@@ -3,7 +3,7 @@ libexec_PROGRAMS = x86_64-as
 x86_64_as_LDADD =  \
         $(top_srcdir)/libstuff/libstuff.la
 
-x86_64_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEFS) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03  -DI386 -Di486 -Di586 -Di686 -DARCH64 
+x86_64_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03  -DI386 -Di486 -Di586 -Di686 -DARCH64 
 
 x86_64_as_SOURCES =  ../app.c ../as.c ../atof-generic.c ../atof-ieee.c ../expr.c ../fixes.c ../flonum-const.c \
          ../flonum-copy.c ../flonum-mult.c ../frags.c ../hash.c ../hex-value.c ../input-file.c \

diff --git a/cctools/autogen.sh b/cctools/autogen.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
-test -n "$DISABLE_LTO_SUPPORT" && rm -rf tmp
-
-../tools/find_lto_header.sh || echo "llvm-devel seems not to be installed - disabling LTO support"
+# set -x
 
 grep -n "__block," /usr/include/unistd.h &>/dev/null
 if [ $? -eq 0 ]; then

diff --git a/cctools/configure.ac b/cctools/configure.ac
@@ -6,17 +6,37 @@ AC_CANONICAL_TARGET
 
 AC_ARG_PROGRAM
 
-# force compiler to clang
-CC=clang
-CXX=clang++
-CPP="clang -E"
+case $host_os in
+  darwin* )
+    isdarwin=yes
+    AM_CONDITIONAL([ISDARWIN], [true])
+    ;;
+  * )
+    AM_CONDITIONAL([ISDARWIN], [false])
+    ;;
+esac
+
+if test "x$CFLAGS" = "x"; then
+  CFLAGS="-O3"
+fi
+
+if test "x$CXXFLAGS" = "x"; then
+  CXXFLAGS="-O3"
+fi
 
-CFLAGS="$CFLAGS `cat tmp/cflags 2>/dev/null` -isystem /usr/local/include -isystem /usr/pkg/include -O3"
-CXXFLAGS="$CXXFLAGS `cat tmp/cxxflags 2>/dev/null` -isystem /usr/local/include -isystem /usr/pkg/include -O3"
-LDFLAGS="$LDFLAGS -L/usr/local/lib `cat tmp/ldflags 2>/dev/null`"
+if test "x$build" = "x$host"; then
+  CC="clang"
+  CXX="clang++"
+  CFLAGS="$CFLAGS -isystem /usr/local/include -isystem /usr/pkg/include"
+  CXXFLAGS="$CXXFLAGS -isystem /usr/local/include -isystem /usr/pkg/include"
+  LDFLAGS="$LDFLAGS -L/usr/local/lib"
+else
+  CC="`which ${host_alias}-clang 2>/dev/null || echo clang`"
+  CXX="`which ${host_alias}-clang++ 2>/dev/null || echo clang++`"
+fi
 
-LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`cat tmp/ldpath 2>/dev/null`"
-export LD_LIBRARY_PATH
+CPP="$CC -E"
+OBJC="$CC"
 
 # FIXME 'subdir-objects' breaks dependency tracking
 AM_INIT_AUTOMAKE([1.10 no-define no-dist-gzip dist-bzip2 tar-ustar subdir-objects no-dependencies])
@@ -31,7 +51,6 @@ AC_CONFIG_SRCDIR([APPLE_LICENSE])
 LT_PREREQ([2.2.6])
 LT_INIT(disable-static)
 
-
 AC_PROG_INSTALL
 
 AC_PROG_CC([clang])
@@ -43,8 +62,15 @@ AM_PROG_AS([clang])
 AC_CHECK_TOOL([HOST_RANLIB], [ranlib], :)
 AC_CHECK_TOOL([HOST_AR], [ar], :)
 
-AC_CHECK_HEADERS([openssl/md5.h], [], [AC_MSG_ERROR([*** md5.h not found, Please install ssl dev packages according to your system])])
-AC_CHECK_HEADERS([uuid/uuid.h], [], [AC_MSG_ERROR([*** uuid.h not found, Please install uuid dev packages according to your system])])
+if test "x$isdarwin" != "xyes"; then
+  AC_CHECK_HEADERS([openssl/md5.h], [], [AC_MSG_ERROR([*** md5.h not found, please install ssl dev packages according to your system])])
+  CRYPTO_LIB=-lcrypto
+  SSL_LIB=-lssl
+  AC_SUBST([CRYPTO_LIB])
+  AC_SUBST([SSL_LIB])
+fi
+
+AC_CHECK_HEADERS([uuid/uuid.h], [], [AC_MSG_ERROR([*** uuid.h not found, please install uuid dev packages according to your system])])
 
 #for libstuff emulated.c
 case $target_cpu in
@@ -64,7 +90,11 @@ case $target_cpu in
         AC_DEFINE(EMULATED_HOST_CPU_TYPE, 16777223, [Emulated CPU type])
         AC_DEFINE(EMULATED_HOST_CPU_SUBTYPE, 3, [Emulated CPU subtype])
     ;;
-     arm)
+     arm64*)
+        AC_DEFINE(EMULATED_HOST_CPU_TYPE, 16777228, [Emulated CPU type])
+        AC_DEFINE(EMULATED_HOST_CPU_SUBTYPE, 0, [Emulated CPU subtype])
+    ;;
+     arm*)
         AC_DEFINE(EMULATED_HOST_CPU_TYPE, 12, [Emulated CPU type])
         AC_DEFINE(EMULATED_HOST_CPU_SUBTYPE, 0, [Emulated CPU subtype])
     ;;
@@ -73,23 +103,20 @@ case $target_cpu in
     ;;
 esac
 
-#as reported, some users may use llvm-c/Disassembler.h instead of local copy in include dir.
-#add these macros for avoid compilation failed.
+# as reported, some users may use llvm-c/Disassembler.h instead of a local copy in include dir.
+# add these macros to avoid compilation failures.
 
 AC_DEFINE(__STDC_LIMIT_MACROS)
 AC_DEFINE(__STDC_CONSTANT_MACROS)
 
-
-
-#for as wrapper.
 AC_SUBST([ASLIBEXECDIR], ['${libexecdir}/as'])
 
-#for ld_class involk in ld64 and other command call.
+# set PROGRAM PREFIX
 if test "$target_alias"; then
 AC_SUBST([PROGRAM_PREFIX], ['${target_alias}-'])
 fi
 
-#disable warnings.
+# disable certain warnings.
 
 WARNINGS=""
 
@@ -240,17 +267,18 @@ CFLAGS=$ORIGCFLAGS
 AC_SUBST([WARNINGS], [$WARNINGS])
 
 
-AC_CHECK_LIB([dl],[dlopen],[DL_LIBS=-ldl])
-AC_SUBST(DL_LIBS)
+AC_CHECK_LIB([dl],[dlopen],[DL_LIB=-ldl])
+AC_SUBST(DL_LIB)
 
 AC_CHECK_LIB([pthread],[pthread_create],[PTHREAD_FLAGS=-pthread])
 AC_SUBST(PTHREAD_FLAGS)
 
-AC_CHECK_LIB([uuid],[uuid_generate_random],[UUID_LIBS=-luuid])
-AC_SUBST(UUID_LIBS)
+AC_CHECK_LIB([uuid],[uuid_generate_random],[UUID_LIB=-luuid])
+AC_SUBST(UUID_LIB)
+
+AC_CHECK_FUNCS([strmode])
 
-AC_CHECK_LIB([crypto],[MD5_Init],[CRYPT_LIBS=-lcrypto])
-AC_SUBST(CRYPT_LIBS)
+### Check for __cxa_demangle in various C++ ABI libs ###
 
 AC_CHECK_LIB([c++abi],[__cxa_demangle],[CXXABI_LIB=-lc++abi],[
   AC_CHECK_LIB([supc++],[__cxa_demangle],[CXXABI_LIB=-lsupc++],[
@@ -260,10 +288,26 @@ AC_CHECK_LIB([c++abi],[__cxa_demangle],[CXXABI_LIB=-lc++abi],[
 
 AC_SUBST(CXXABI_LIB)
 
+### Check for libLTO ###
+
+ORIGLDFLAGS=$LDFLAGS
+LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/local/lib,--enable-new-dtags"
+AC_MSG_CHECKING([if -Wl,-rpath,<path>,--enable-new-dtags is supported])
+AC_LINK_IFELSE(
+  [AC_LANG_SOURCE([[int main(){}]])],
+  [rpathlink=yes
+  AC_MSG_RESULT([yes])],
+  [AC_MSG_RESULT([no])]
+)
+LDFLAGS=$ORIGLDFLAGS
+
+CHECK_LLVM
+
+### Check endianness ###
+
 AC_C_BIGENDIAN([AC_SUBST([ENDIAN_FLAG],[-D__BIG_ENDIAN__=1])],
 			[AC_SUBST([ENDIAN_FLAG],[-D__LITTLE_ENDIAN__=1])])
 
-AC_CHECK_FUNCS([strmode])
 
 AC_CONFIG_FILES([Makefile libstuff/Makefile])
 AC_CONFIG_FILES([ar/Makefile])
@@ -276,9 +320,12 @@ AC_CONFIG_FILES([as/ppc64/Makefile])
 #AC_CONFIG_FILES([man/Makefile])
 AC_CONFIG_FILES([misc/Makefile])
 AC_CONFIG_FILES([otool/Makefile])
-AC_CONFIG_FILES([libobjc2/Makefile])
-AC_CONFIG_FILES([ld/Makefile])
 
+if test "x$isdarwin" != "xyes"; then
+  AC_CONFIG_FILES([libobjc2/Makefile])
+fi
+
+AC_CONFIG_FILES([ld/Makefile])
 
 AC_CONFIG_FILES([ld64/Makefile])
 AC_CONFIG_FILES([ld64/src/Makefile])

diff --git a/cctools/include/foreign/CommonCrypto/CommonDigest.h b/cctools/include/foreign/CommonCrypto/CommonDigest.h
@@ -1,3 +1,9 @@
+#ifdef __APPLE__
+
+#include_next <CommonCrypto/CommonDigest.h>
+
+#else
+
 #include <openssl/md5.h>
 
 #define CC_MD5_DIGEST_LENGTH		MD5_DIGEST_LENGTH
@@ -7,3 +13,5 @@
 #define CC_MD5				MD5
 #define CC_MD5_Transform		MD5_Transform
 #define CC_MD5_CTX			MD5_CTX
+
+#endif /* __APPLE__ */
diff --git a/cctools/include/foreign/libkern/OSAtomic.h b/cctools/include/foreign/libkern/OSAtomic.h
@@ -82,7 +82,7 @@ __inline static
 int32_t	OSAtomicDecrement32Barrier( volatile int32_t *__theValue )
             { return OSAtomicAdd32Barrier( -1, __theValue); }
 
-#if defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+#if defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__)
 
 int64_t	OSAtomicAdd64( int64_t __theAmount, volatile int64_t *__theValue );
 int64_t	OSAtomicAdd64Barrier( int64_t __theAmount, volatile int64_t *__theValue );
@@ -101,7 +101,7 @@ __inline static
 int64_t	OSAtomicDecrement64Barrier( volatile int64_t *__theValue )
             { return OSAtomicAdd64Barrier( -1, __theValue); }
 
-#endif  /* defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) */
+#endif  /* defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__) */
 
 
 /* Boolean functions (and, or, xor.)  These come in four versions for each operation:
@@ -138,12 +138,12 @@ bool	OSAtomicCompareAndSwapIntBarrier( int __oldValue, int __newValue, volatile
 bool	OSAtomicCompareAndSwapLong( long __oldValue, long __newValue, volatile long *__theValue );
 bool	OSAtomicCompareAndSwapLongBarrier( long __oldValue, long __newValue, volatile long *__theValue );
 
-#if defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+#if defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__)
 
 bool    OSAtomicCompareAndSwap64( int64_t __oldValue, int64_t __newValue, volatile int64_t *__theValue );
 bool    OSAtomicCompareAndSwap64Barrier( int64_t __oldValue, int64_t __newValue, volatile int64_t *__theValue );
 
-#endif  /* defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) */
+#endif  /* defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__) */
 
 
 /* Test and set.  They return the original value of the bit, and operate on bit (0x80>>(n&7))

diff --git a/cctools/include/foreign/libkern/OSByteOrder.h b/cctools/include/foreign/libkern/OSByteOrder.h
@@ -43,7 +43,7 @@
 #include <libkern/ppc/OSByteOrder.h>
 #elif (defined(__i386__) || defined(__x86_64__))
 #include <libkern/i386/OSByteOrder.h>
-#elif defined(__arm__)
+#elif defined(__arm__) || defined(__arm64__)
 #include <libkern/arm/OSByteOrder.h>
 #else
 #include <libkern/machine/OSByteOrder.h>

diff --git a/cctools/include/foreign/libkern/_OSByteOrder.h b/cctools/include/foreign/libkern/_OSByteOrder.h
@@ -66,7 +66,7 @@
 #include <libkern/i386/_OSByteOrder.h>
 #endif
 
-#if defined(__arm__)
+#if defined(__arm__) || defined(__arm64__)
 #include <libkern/arm/OSByteOrder.h>
 #endif
 

diff --git a/cctools/include/foreign/mach/machine/asm.h b/cctools/include/foreign/mach/machine/asm.h
@@ -29,12 +29,8 @@
 #ifndef _MACH_MACHINE_ASM_H
 #define _MACH_MACHINE_ASM_H
 
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/asm.h"
-#elif defined (__i386__) || defined(__x86_64__)
+#if defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/asm.h"
-#elif defined (__arm__)
-#include "mach/arm/asm.h"
 #else
 #error architecture not supported
 #endif

diff --git a/cctools/include/foreign/mach/machine/boolean.h b/cctools/include/foreign/mach/machine/boolean.h
@@ -33,7 +33,7 @@
 #include "mach/ppc/boolean.h"
 #elif defined (__i386__) || defined(__x86_64__)
 #include "mach/i386/boolean.h"
-#elif defined (__arm__)
+#elif defined (__arm__) || defined(__arm64__)
 #include "mach/arm/boolean.h"
 #else
 #error architecture not supported