blob: 10013ff1e9da3ccada79466c1dabd26b6e4a6891 [file] [log] [blame]
diff -aruN a/CFBase.c b/CFBase.c
--- a/CFBase.c 2009-02-19 16:25:06.000000000 -0800
+++ b/CFBase.c 2010-10-01 14:31:38.286830645 -0700
@@ -1062,4 +1062,20 @@
#endif
#endif
-
+#if defined(__arm__)
+__asm__ (
+".text\n"
+" .align 2\n"
+#if DEPLOYMENT_TARGET_MACOSX
+".private_extern ___HALT\n"
+"___HALT:\n"
+#elif DEPLOYMENT_TARGET_LINUX
+".globl __HALT\n"
+"__HALT:\n"
+#else
+".globl ___HALT\n"
+"___HALT:\n"
+#endif
+" bkpt\n"
+);
+#endif /* defined(__arm__) */
diff -aruN a/CFBase.h b/CFBase.h
--- a/CFBase.h 2009-02-19 16:25:06.000000000 -0800
+++ b/CFBase.h 2010-10-01 14:30:23.799644073 -0700
@@ -50,6 +50,10 @@
#define __LITTLE_ENDIAN__ 1
#endif
+#if (defined(__ARMEL__) && !defined(__LITTLE_ENDIAN__))
+ #define __LITTLE_ENDIAN__ 1
+#endif
+
#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
#error Do not know the endianess of this architecture
#endif
diff -aruN a/CFInternal.h b/CFInternal.h
--- a/CFInternal.h 2009-02-19 16:25:06.000000000 -0800
+++ b/CFInternal.h 2010-10-01 14:05:48.926799829 -0700
@@ -121,6 +121,8 @@
#else
#error Compiler not supported
#endif
+#elif defined(__arm__)
+ #define HALT asm __volatile__("bkpt")
#endif
#if defined(DEBUG)
diff -aruN a/include/AvailabilityMacros.h b/include/AvailabilityMacros.h
--- a/include/AvailabilityMacros.h 2009-02-04 10:42:19.000000000 -0800
+++ b/include/AvailabilityMacros.h 2010-10-01 14:07:14.999780293 -0700
@@ -84,7 +84,7 @@
#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
#define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
#else
- #if __ppc64__ || __i386__ || __x86_64__
+ #if __ppc64__ || __i386__ || __x86_64__ || __arm__
#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4
#else
#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_1