Changeset 1524:b265fb6ce15b

Timestamp:

07/06/09 18:56:11 (3 years ago)

Author:

Robert Clipsham <robert@octarineparrot.com>

Parents:

1523:833337c65fd3 1522:6766485fb584

branch:

default

Message:

Merge.

Files:

• gen/main.cpp (modified) (2 diffs)
• gen/main.cpp (modified) (5 diffs)
• gen/runtime.cpp (modified) (1 diff)
• gen/runtime.cpp (modified) (2 diffs)

gen/main.cpp

@@ -319 +319 @@
-    else if (!noDefaultLib)
-    {
+#if !DMDV2
-        global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
-        global.params.linkswitches->push(mem.strdup("-ltango-cc-tango"));
@@ -325 +326 @@
-        // with linking order
-        global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
+#endif
-    }
-

gen/main.cpp

@@ -5 +5 @@
-
-#include "gen/llvm.h"
+#include "gen/llvm-version.h"
-#include "llvm/LinkAllVMCore.h"
-#include "llvm/Linker.h"
+#if LLVM_REV >= 74640
+#include "llvm/LLVMContext.h"
+#endif
-#include "llvm/System/Signals.h"
-#include "llvm/Target/SubtargetFeature.h"
@@ -12 +16 @@
-#include "llvm/Target/TargetOptions.h"
-#include "llvm/Target/TargetMachineRegistry.h"
+#if LLVM_REV >= 73610
+#include "llvm/Target/TargetSelect.h"
+#endif
-
-#include <stdio.h>
@@ -398 +405 @@
-        fatal();
-
+#if LLVM_REV >= 74640
+    llvm::Module mod("dummy", llvm::getGlobalContext());
+#else
-    llvm::Module mod("dummy");
+#endif
-
-    // override triple if needed
@@ -424 +435 @@
-    mod.setTargetTriple(global.params.targetTriple);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    if (mArch == 0)
-    {
@@ -909 +929 @@
-        char* filename = m->objfile->name->str;
-        
+#if LLVM_REV >= 74640
+        llvm::Linker linker(name, name, llvm::getGlobalContext());
+#else
-        llvm::Linker linker(name, name);
+#endif
-        std::string errormsg;
-        for (int i = 0; i < llvmModules.size(); i++)

gen/runtime.cpp

@@ -337 +337 @@
-    // Object _d_allocclass(ClassInfo ci)
-    {
+#if DMDV2
+        std::string fname("_d_newclass");
+#else
-        std::string fname("_d_allocclass");
+#endif
-        std::vector<const LLType*> types;
-        types.push_back(classInfoTy);

gen/runtime.cpp

@@ -1 +1 @@
-#include "gen/llvm.h"
+#include "gen/llvm-version.h"
+#if LLVM_REV >= 74640
+#include "llvm/LLVMContext.h"
+#endif
-#include "llvm/Module.h"
-#include "llvm/Attributes.h"
@@ -150 +154 @@
-{
-    Logger::println("building module");
+#if LLVM_REV >= 74640
+    M = new llvm::Module("ldc internal runtime", llvm::getGlobalContext());
+#else
-    M = new llvm::Module("ldc internal runtime");
+#endif
-
-    Logger::println("building basic types");