Merge pull request #2242 from joakim-noah/android

Add fixes to get Android/AArch64 working
merged-on-behalf-of: Steven Schveighoffer <schveiguy@users.noreply.github.com>

Author: dlang-bot

src/core/stdc/stdlib.d

@@ -135,17 +135,9 @@ else version (MinGW)
     ///
     alias __mingw_strtold strtold;
 }
-else version (CRuntime_Bionic)
-{
-    ///
-    real strtold(scope inout(char)* nptr, scope inout(char)** endptr)
-    {   // Fake it again till we make it
-        return strtod(nptr, endptr);
-    }
-}
 else
 {
-    ///
+    /// Added to Bionic since Lollipop.
     real strtold(scope inout(char)* nptr, scope inout(char)** endptr);
 }
 

src/core/sys/posix/sys/types.d

@@ -1056,37 +1056,40 @@ else version( CRuntime_Bionic )
         size_t  guard_size;
         int     sched_policy;
         int     sched_priority;
-        version(AArch64) char[16] __reserved;
+        version(D_LP64) char[16] __reserved;
     }
 
     struct pthread_cond_t
     {
-        int value; //volatile
+        version(D_LP64)
+            int[12] __private;
+        else
+            int[1] __private;
     }
 
     alias c_long pthread_condattr_t;
     alias int    pthread_key_t;
 
     struct pthread_mutex_t
     {
-        int value; //volatile
+        version(D_LP64)
+            int[10] __private;
+        else
+            int[1] __private;
     }
 
     alias c_long pthread_mutexattr_t;
-    alias int    pthread_once_t; //volatile
+    alias int    pthread_once_t;
 
     struct pthread_rwlock_t
     {
-        pthread_mutex_t  lock;
-        pthread_cond_t   cond;
-        int              numLocks;
-        int              writerThreadId;
-        int              pendingReaders;
-        int              pendingWriters;
-        void*[4]         reserved;
+        version(D_LP64)
+            int[14] __private;
+        else
+            int[10] __private;
     }
 
-    alias int    pthread_rwlockattr_t;
+    alias c_long pthread_rwlockattr_t;
     alias c_long pthread_t;
 }
 else version ( CRuntime_UClibc )

src/rt/sections_android.d

@@ -69,6 +69,8 @@ void initSections() nothrow @nogc
 
     auto pbeg = cast(void*)&_tlsend;
     auto pend = cast(void*)&__bss_end__;
+    // _tlsend is a 32-bit int and may not be 64-bit void*-aligned, so align pbeg.
+    version(D_LP64) pbeg = cast(void*)(cast(size_t)(pbeg + 7) & ~cast(size_t)7);
     _sections._gcRanges[0] = pbeg[0 .. pend - pbeg];
 }
 
@@ -129,6 +131,17 @@ else version(ARM)
         return tls.ptr + offset;
     }
 }
+else version(AArch64)
+{
+    extern(C) void* __tls_get_addr( void* p ) nothrow @nogc
+    {
+        debug(PRINTF) printf("  __tls_get_addr input - %p\n", p);
+        immutable offset = cast(size_t)(p - cast(void*)&_tlsstart);
+        auto tls = getTLSBlockAlloc();
+        assert(offset < tls.length);
+        return tls.ptr + offset;
+    }
+}
 else
     static assert( false, "Android architecture not supported." );
 
@@ -182,7 +195,7 @@ extern(C)
 
         size_t __bss_end__;
 
-        void* _tlsstart;
-        void* _tlsend;
+        int _tlsstart;
+        int _tlsend;
     }
 }