Merge pull request #2 from fdetro/os-ios

Add support for Apple iOS and improve detection of arm architecture. Thanks to Franz Detro for the changes.
boostorg · Mar 20, 2014 · 699b660 · 699b660
2 parents c161ad4 + 9e5f797
commit 699b660
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 1 deletion.
diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h
@@ -1,5 +1,6 @@
 /*
 Copyright Rene Rivera 2008-2013
+Copyright Franz Detro 2014
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE_1_0.txt or copy at
 http://www.boost.org/LICENSE_1_0.txt)
@@ -20,20 +21,25 @@ Distributed under the Boost Software License, Version 1.0.
     [[__predef_symbol__] [__predef_version__]]
 
     [[`__arm__`] [__predef_detection__]]
+    [[`__arm64`] [__predef_detection__]]
     [[`__thumb__`] [__predef_detection__]]
     [[`__TARGET_ARCH_ARM`] [__predef_detection__]]
     [[`__TARGET_ARCH_THUMB`] [__predef_detection__]]
 
+    [[`__arm64`] [8.0.0]]
     [[`__TARGET_ARCH_ARM`] [V.0.0]]
     [[`__TARGET_ARCH_THUMB`] [V.0.0]]
     ]
  */
 
 #define BOOST_ARCH_ARM BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
-#if defined(__arm__) || defined(__thumb__) || \
+#if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \
     defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB)
 #   undef BOOST_ARCH_ARM
+#   if !defined(BOOST_ARCH_ARM) && defined(__arm64)
+#       define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0)
+#   endif
 #   if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_ARM)
 #       define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_ARM,0,0)
 #   endif

diff --git a/include/boost/predef/os.h b/include/boost/predef/os.h
@@ -1,5 +1,6 @@
 /*
 Copyright Rene Rivera 2008-2012
+Copyright Franz Detro 2014
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE_1_0.txt or copy at
 http://www.boost.org/LICENSE_1_0.txt)
@@ -16,6 +17,7 @@ Distributed under the Boost Software License, Version 1.0.
 #include <boost/predef/os/cygwin.h>
 #include <boost/predef/os/hpux.h>
 #include <boost/predef/os/irix.h>
+#include <boost/predef/os/ios.h>
 #include <boost/predef/os/linux.h>
 #include <boost/predef/os/macos.h>
 #include <boost/predef/os/os400.h>

diff --git a/include/boost/predef/os/ios.h b/include/boost/predef/os/ios.h
@@ -0,0 +1,51 @@
+/*
+Copyright Franz Detro 2014
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE_1_0.txt or copy at
+http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+#ifndef BOOST_PREDEF_OS_IOS_H
+#define BOOST_PREDEF_OS_IOS_H
+
+#include <boost/predef/version_number.h>
+#include <boost/predef/make.h>
+
+/*`
+[heading `BOOST_OS_IOS`]
+
+[@http://en.wikipedia.org/wiki/iOS iOS] operating system.
+
+[table
+    [[__predef_symbol__] [__predef_version__]]
+
+    [[`__APPLE__`] [__predef_detection__]]
+    [[`__MACH__`] [__predef_detection__]]
+    [[`__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__predef_detection__]]
+
+    [[`__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__`] [__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000]]
+    ]
+ */
+
+#define BOOST_OS_IOS BOOST_VERSION_NUMBER_NOT_AVAILABLE
+
+#if !BOOST_PREDEF_DETAIL_OS_DETECTED && ( \
+    defined(__APPLE__) && defined(__MACH__) && \
+    defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) \
+    )
+#   undef BOOST_OS_IOS
+#   define BOOST_OS_IOS (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__*1000)
+#endif
+
+#if BOOST_OS_IOS
+#   define BOOST_OS_IOS_AVAILABLE
+#   include <boost/predef/detail/os_detected.h>
+#endif
+
+#define BOOST_OS_IOS_NAME "iOS"
+
+#include <boost/predef/detail/test.h>
+BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IOS,BOOST_OS_IOS_NAME)
+
+
+#endif
diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h
@@ -1,5 +1,6 @@
 /*
 Copyright Rene Rivera 2008-2013
+Copyright Franz Detro 2014
 Distributed under the Boost Software License, Version 1.0.
 (See accompanying file LICENSE_1_0.txt or copy at
 http://www.boost.org/LICENSE_1_0.txt)
@@ -8,6 +9,13 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_PREDEF_OS_MACOS_H
 #define BOOST_PREDEF_OS_MACOS_H
 
+/* Special case: iOS will define the same predefs as MacOS, and additionally
+ '__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__'. We can guard against that,
+ but only if we detect iOS first. Hence we will force include iOS detection
+ * before doing any MacOS detection.
+ */
+#include <boost/predef/os/ios.h>
+
 #include <boost/predef/version_number.h>
 #include <boost/predef/make.h>