Fix merge errors

Author: redstar

driver/linker.cpp

@@ -167,7 +167,7 @@ static int linkObjToBinaryGcc(bool sharedLib, bool fullyStatic) {
     if (!opts::disableLinkerStripDead) {
       args.push_back("-Wl,--gc-sections");
     }
-    if (global.params.targetTriple.getEnvironment() == llvm::Triple::Android) {
+    if (global.params.targetTriple->getEnvironment() == llvm::Triple::Android) {
         args.push_back("-ldl");
         args.push_back("-lm");
         break;

driver/main.cpp

@@ -750,6 +750,8 @@ static void registerPredefinedTargetVersions() {
     }
     break;
   case llvm::Triple::Linux:
+    VersionCondition::addPredefinedGlobalIdent("linux");
+    VersionCondition::addPredefinedGlobalIdent("Posix");
     if (global.params.targetTriple->getEnvironment() == llvm::Triple::Android) {
       VersionCondition::addPredefinedGlobalIdent("Android");
       VersionCondition::addPredefinedGlobalIdent("CRuntime_Bionic");

gen/llvmhelpers.cpp

@@ -75,13 +75,6 @@ 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,9 +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.getEnvironment() != llvm::Triple::Android) ||
-      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()