Merge remote-tracking branch 'origin/ltsmaster'

Author: redstar

driver/linker.cpp

@@ -164,10 +164,15 @@ static int linkObjToBinaryGcc(bool sharedLib, bool fullyStatic) {
   switch (global.params.targetTriple->getOS()) {
   case llvm::Triple::Linux:
     addSoname = true;
-    args.push_back("-lrt");
     if (!opts::disableLinkerStripDead) {
       args.push_back("-Wl,--gc-sections");
     }
+    if (global.params.targetTriple.getEnvironment() == llvm::Triple::Android) {
+        args.push_back("-ldl");
+        args.push_back("-lm");
+        break;
+    }
+    args.push_back("-lrt");
   // fallthrough
   case llvm::Triple::Darwin:
   case llvm::Triple::MacOSX:

driver/main.cpp

@@ -754,8 +754,6 @@ static void registerPredefinedTargetVersions() {
       VersionCondition::addPredefinedGlobalIdent("Android");
       VersionCondition::addPredefinedGlobalIdent("CRuntime_Bionic");
     } else {
-      VersionCondition::addPredefinedGlobalIdent("linux");
-      VersionCondition::addPredefinedGlobalIdent("Posix");
       VersionCondition::addPredefinedGlobalIdent("CRuntime_Glibc");
     }
     break;

gen/abi-arm.cpp

@@ -18,35 +18,10 @@
 #include "gen/abi-generic.h"
 #include "gen/abi-arm.h"
 
-namespace {
-struct CompositeToArray32 : ABIRewrite {
-  LLValue *get(Type *dty, LLValue *v) override {
-    Logger::println("rewriting i32 array -> as %s", dty->toChars());
-    LLValue *lval = DtoRawAlloca(v->getType(), 0);
-    DtoStore(v, lval);
-
-    LLType *pTy = getPtrToType(DtoType(dty));
-    return DtoLoad(DtoBitCast(lval, pTy), "get-result");
-  }
-
-  LLValue *put(DValue *dv) override {
-    Type *dty = dv->getType();
-    Logger::println("rewriting %s -> as i32 array", dty->toChars());
-    LLType *t = type(dty, nullptr);
-    return DtoLoad(DtoBitCast(dv->getRVal(), getPtrToType(t)));
-  }
-
-  LLType *type(Type *t, LLType *) override {
-    // An i32 array that will hold Type 't'
-    size_t sz = (t->size() + 3) / 4;
-    return LLArrayType::get(LLIntegerType::get(gIR->context(), 32), sz);
-  }
-};
-}
-
 struct ArmTargetABI : TargetABI {
   HFAToArray hfaToArray;
   CompositeToArray32 compositeToArray32;
+  CompositeToArray64 compositeToArray64;
   IntegerRewrite integerRewrite;
 
   bool returnInArg(TypeFunction *tf) override {
@@ -134,9 +109,12 @@ struct ArmTargetABI : TargetABI {
       // non-HFA and messes up register selection
       if (isHFA((TypeStruct *)ty, &arg.ltype)) {
         arg.rewrite = &hfaToArray;
-      } else {
+      } else if (DtoAlignment(ty) <= 4) {
         arg.rewrite = &compositeToArray32;
         arg.ltype = compositeToArray32.type(arg.type, arg.ltype);
+      } else {
+        arg.rewrite = &compositeToArray64;
+        arg.ltype = compositeToArray64.type(arg.type, arg.ltype);
       }
     }
   }

gen/abi-generic.h

@@ -271,8 +271,8 @@ struct HFAToArray : ABIRewrite {
 };
 
 /**
-* Rewrite a composite as array of i64.
-*/
+ * Rewrite a composite as array of i64.
+ */
 struct CompositeToArray64 : ABIRewrite {
   LLValue *get(Type *dty, LLValue *v) override {
     Logger::println("rewriting i64 array -> as %s", dty->toChars());
@@ -297,4 +297,31 @@ struct CompositeToArray64 : ABIRewrite {
   }
 };
 
+/**
+ * Rewrite a composite as array of i32.
+ */
+struct CompositeToArray32 : ABIRewrite {
+  LLValue *get(Type *dty, LLValue *v) override {
+    Logger::println("rewriting i32 array -> as %s", dty->toChars());
+    LLValue *lval = DtoRawAlloca(v->getType(), 0);
+    DtoStore(v, lval);
+
+    LLType *pTy = getPtrToType(DtoType(dty));
+    return DtoLoad(DtoBitCast(lval, pTy), "get-result");
+  }
+
+  LLValue *put(DValue *dv) override {
+    Type *dty = dv->getType();
+    Logger::println("rewriting %s -> as i32 array", dty->toChars());
+    LLType *t = type(dty, nullptr);
+    return DtoLoad(DtoBitCast(dv->getRVal(), getPtrToType(t)));
+  }
+
+  LLType *type(Type *t, LLType *) override {
+    // An i32 array that will hold Type 't'
+    size_t sz = (t->size() + 3) / 4;
+    return LLArrayType::get(LLIntegerType::get(gIR->context(), 32), sz);
+  }
+};
+
 #endif

gen/coverage.cpp

@@ -40,7 +40,12 @@ void emitCoverageLinecountInc(Loc &loc) {
 
   // Do an atomic increment, so this works when multiple threads are executed.
   gIR->ir->CreateAtomicRMW(llvm::AtomicRMWInst::Add, ptr, DtoConstUint(1),
-                           llvm::AtomicOrdering::Monotonic);
+#if LDC_LLVM_VER >= 309
+                           llvm::AtomicOrdering::Monotonic
+#else
+                           llvm::Monotonic
+#endif
+                           );
 
   unsigned num_sizet_bits = gDataLayout->getTypeSizeInBits(DtoSize_t());
   unsigned idx = line / num_sizet_bits;

gen/llvmhelpers.cpp

@@ -75,6 +75,13 @@ static llvm::ManagedStatic<llvm::LLVMContext> GlobalContext;
 
 llvm::LLVMContext& getGlobalContext() { return *GlobalContext; }
 
+/******************************************************************************
+* Global context
+******************************************************************************/
+static llvm::ManagedStatic<llvm::LLVMContext> GlobalContext;
+
+llvm::LLVMContext& getGlobalContext() { return *GlobalContext; }
+
 /******************************************************************************
  * DYNAMIC MEMORY HELPERS
  ******************************************************************************/

gen/module.cpp

@@ -900,7 +900,9 @@ static void genModuleInfo(Module *m, bool emitFullModuleInfo) {
   b.finalize(moduleInfoSym->getType()->getPointerElementType(), moduleInfoSym);
   setLinkage({LLGlobalValue::ExternalLinkage, false}, moduleInfoSym);
 
-  if (global.params.targetTriple->isOSLinux() || global.params.targetTriple->isOSFreeBSD() ||
+  if ((global.params.targetTriple.isOSLinux() &&
+       global.params.targetTriple.getEnvironment() != llvm::Triple::Android) ||
+      global.params.targetTriple.isOSFreeBSD() ||
 #if LDC_LLVM_VER > 305
       global.params.targetTriple->isOSNetBSD() || global.params.targetTriple->isOSOpenBSD() ||
       global.params.targetTriple->isOSDragonFly()

runtime/druntime

@@ -1,4 +1,4 @@
-// RUN: %ldc -c -output-ll -of=%t.ll %s && FileCheck %s < %t.ll
+// RUN: %ldc -c -de -output-ll -of=%t.ll %s && FileCheck %s < %t.ll
 
 import core.atomic;