Android target issues (swiftlang#755)

* Adding checkint shims for 32-bits also.

* Removing line changed in a possible failed diff apply.

* Adjusting system includes to bionic.

* Socks stream is a define to a number literal in bionic.

* getpagesize() should be used for android to get NSPageSize.

Author: Gonzalo Larralde

CoreFoundation/Base.subproj/CFSortFunctions.c

@@ -48,8 +48,10 @@ enum {
 #define __check_int64_div(x, y, err)            (x / y)
 #define __check_uint64_div(x, y, err)           (x / y)
 
-#define __checkint_int64_mul(x, y, err)         (x * y)
-#define __checkint_uint64_add(x, y, err)        (x + y)
+#define __checkint_int64_mul(x, y, err)         __check_int64_mul(x, y, err)
+#define __checkint_int32_mul(x, y, err)         __check_int32_mul(x, y, err)
+#define __checkint_uint64_add(x, y, err)        __check_uint64_add(x, y, err)
+#define __checkint_uint32_add(x, y, err)        __check_uint32_add(x, y, err)
 
 #endif
 

CoreFoundation/Base.subproj/CFUtilities.c

@@ -894,7 +894,6 @@ void CFLog1(CFLogLevel lev, CFStringRef message) {
     if (maxLength > sizeof(stack_buffer) / sizeof(stack_buffer[0])) {
         buffer = calloc(sizeof(char), maxLength);
         if (!buffer) {
-            -            __android_log_print(ANDROID_LOG_ERROR, tag, "Unable to allocate %d bytes for log message - truncating.", (int)axLength);
             maxLength = sizeof(stack_buffer) / sizeof(stack_buffer[0]);
             buffer = &stack_buffer[0];
             buffer[maxLength-1] = '\000';

CoreFoundation/NumberDate.subproj/CFTimeZone.c

@@ -27,8 +27,10 @@
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
 #include <dirent.h>
 #include <unistd.h>
+#if !TARGET_OS_ANDROID
 #include <sys/fcntl.h>
 #endif
+#endif
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
 #include <tzfile.h>
 #elif DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD

CoreFoundation/PlugIn.subproj/CFBundle_InfoPlist.c

@@ -19,7 +19,9 @@
 #if TARGET_OS_CYGWIN
 #else
 #include <dirent.h>
+#if !TARGET_OS_ANDROID
 #include <sys/sysctl.h>
+#endif
 #include <sys/mman.h>
 #endif
 #endif

CoreFoundation/PlugIn.subproj/CFBundle_Resources.c

@@ -27,7 +27,9 @@
 
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX
 #include <unistd.h>
+#if !TARGET_OS_ANDROID
 #include <sys/sysctl.h>
+#endif
 #include <sys/stat.h>
 #include <dirent.h>
 #endif

Foundation/NSHost.swift

@@ -74,7 +74,7 @@ open class Host: NSObject {
             }
             var hints = addrinfo()
             hints.ai_family = PF_UNSPEC
-#if os(OSX) || os(iOS)
+#if os(OSX) || os(iOS) || os(Android)
             hints.ai_socktype = SOCK_STREAM
 #else
             hints.ai_socktype = Int32(SOCK_STREAM.rawValue)

Foundation/NSPlatform.swift

@@ -15,7 +15,7 @@ import Glibc
 
 #if os(OSX) || os(iOS)
 fileprivate let _NSPageSize = Int(vm_page_size)
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
 fileprivate let _NSPageSize = Int(getpagesize())
 #endif