android: stub out some missing methods on Android, disable split dwarf by default

Author: zhuowei

stdlib/public/runtime/CMakeLists.txt

@@ -86,5 +86,6 @@ foreach(sdk ${SWIFT_CONFIGURED_SDKS})
 
     endforeach()
   endif()
+  # FIXME: Android: make a swift.ld for armv7 android
 endforeach()
 

stdlib/public/runtime/Casting.cpp

@@ -2398,6 +2398,10 @@ static void _addImageProtocolConformances(const mach_header *mh,
   _addImageProtocolConformancesBlock(conformances, conformancesSize);
 }
 #elif defined(__ELF__)
+#ifdef __ANDROID__
+#define RTLD_NOLOAD 0
+#endif
+
 static int _addImageProtocolConformances(struct dl_phdr_info *info,
                                           size_t size, void * /*data*/) {
   void *handle;
@@ -2438,7 +2442,10 @@ static void installCallbacksToInspectDylib() {
     // loaded ones.
     // FIXME: Find a way to have this continue to happen after.
     // rdar://problem/19045112
+    #ifndef __ANDROID__
+    // FIXME: Android: doesn't have dl_iterate_phdr before API 21
     dl_iterate_phdr(_addImageProtocolConformances, nullptr);
+    #endif
   #else
   # error No known mechanism to inspect dynamic libraries on this platform.
   #endif

stdlib/public/stubs/LibcShims.cpp

@@ -17,12 +17,15 @@
 #include <string.h>
 #include "../SwiftShims/LibcShims.h"
 
-#if defined(__linux__)
+#if defined(__linux__) && !defined(__ANDROID__)
 #include <bsd/stdlib.h>
 #endif
 
+// android's ssize_t is an int, which is the same size as long int
+#ifndef __ANDROID__
 static_assert(std::is_same<ssize_t, swift::__swift_ssize_t>::value,
               "__swift_ssize_t is wrong");
+#endif
 
 namespace swift {
 
@@ -50,7 +53,7 @@ int _swift_stdlib_close(int fd) { return close(fd); }
 #if defined(__APPLE__)
 #include <malloc/malloc.h>
 size_t _swift_stdlib_malloc_size(const void *ptr) { return malloc_size(ptr); }
-#elif defined(__GNU_LIBRARY__)
+#elif defined(__GNU_LIBRARY__) || defined(__ANDROID__)
 #include <malloc.h>
 size_t _swift_stdlib_malloc_size(const void *ptr) {
   return malloc_usable_size(const_cast<void *>(ptr));
@@ -59,12 +62,21 @@ size_t _swift_stdlib_malloc_size(const void *ptr) {
 #error No malloc_size analog known for this platform/libc.
 #endif
 
+#ifndef __ANDROID__
 __swift_uint32_t _swift_stdlib_arc4random(void) { return arc4random(); }
 
 __swift_uint32_t
 _swift_stdlib_arc4random_uniform(__swift_uint32_t upper_bound) {
   return arc4random_uniform(upper_bound);
 }
+#else
+// FIXME: Android: chosen by fair dice roll
+__swift_uint32_t _swift_stdlib_arc4random(void) { return 4; }
+__swift_uint32_t
+_swift_stdlib_arc4random_uniform(__swift_uint32_t upper_bound) {
+  return 0;
+}
+#endif
 
 } // namespace swift
 

stdlib/public/stubs/Stubs.cpp

@@ -30,6 +30,11 @@
 #include "swift/Runtime/Debug.h"
 #include "swift/Basic/Lazy.h"
 
+#ifdef __ANDROID__
+#include "getline.inc"
+#define getline swift_getline
+#endif
+
 static uint64_t uint64ToStringImpl(char *Buffer, uint64_t Value,
                                    int64_t Radix, bool Uppercase,
                                    bool Negative) {
@@ -93,7 +98,7 @@ extern "C" uint64_t swift_uint64ToString(char *Buffer, intptr_t BufferLength,
                             /*Negative=*/false);
 }
 
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__)
 static inline locale_t getCLocale() {
   // On these platforms convenience functions from xlocale.h interpret nullptr
   // as C locale.
@@ -113,6 +118,22 @@ static locale_t getCLocale() {
 }
 #endif
 
+#ifdef __ANDROID__
+#define uselocale(a) (nullptr)
+static double swift_strtod_l(const char* a, char** b, locale_t c) {
+	return strtod(a, b);
+}
+static float swift_strtof_l(const char* a, char** b, locale_t c) {
+	return strtof(a, b);
+}
+static long double swift_strtold_l(const char* a, char** b, locale_t c) {
+	return strtold(a, b);
+}
+#define strtod_l swift_strtod_l
+#define strtof_l swift_strtof_l
+#define strtold_l swift_strtold_l
+#endif
+
 #if defined(__APPLE__)
 #define swift_snprintf_l snprintf_l
 #else

stdlib/public/stubs/getline.inc

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2012, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+
+static ssize_t swift_getline(char **lineptr, size_t *n, FILE *stream)
+{
+    char *ptr;
+
+    ptr = fgetln(stream, n);
+
+    if (ptr == NULL) {
+        return -1;
+    }
+
+    /* Free the original ptr */
+    if (*lineptr != NULL) free(*lineptr);
+
+    /* Add one more space for '\0' */
+    size_t len = n[0] + 1;
+
+    /* Update the length */
+    n[0] = len;
+
+    /* Allocate a new buffer */
+    *lineptr = (char*) malloc(len);
+
+    /* Copy over the string */
+    memcpy(*lineptr, ptr, len-1);
+
+    /* Write the NULL character */
+    (*lineptr)[len-1] = '\0';
+
+    /* Return the length of the new buffer */
+    return len;
+}

utils/build-script-impl

@@ -1032,8 +1032,8 @@ COMMON_CMAKE_OPTIONS=(
     -G "${CMAKE_GENERATOR}"
 )
 
-COMMON_C_FLAGS="-gsplit-dwarf"
-COMMON_CXX_FLAGS="-gsplit-dwarf"
+COMMON_C_FLAGS=""
+COMMON_CXX_FLAGS=""
 
 if [[ "${ENABLE_ASAN}" ]] ; then
     COMMON_CMAKE_OPTIONS=(
@@ -1475,8 +1475,8 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
                 # gold linker support.
                 cmake_options=(
                     "${cmake_options[@]}"
-                    -DCMAKE_EXE_LINKER_FLAGS:STRING="-fuse-ld=gold -Wl,--gdb-index"
-                    -DCMAKE_SHARED_LINKER_FLAGS:STRING="-fuse-ld=gold -Wl,--gdb-index"
+                    -DCMAKE_EXE_LINKER_FLAGS:STRING="-fuse-ld=gold"
+                    -DCMAKE_SHARED_LINKER_FLAGS:STRING="-fuse-ld=gold"
                 )
             fi
         else