Changeset 1650:40bd4a0d4870 for gen/main.cpp

Timestamp:

05/19/10 06:42:32 (2 years ago)

Author:

Tomas Lindquist Olsen

branch:

default

Message:

Update to work with LLVM 2.7.

Removed use of dyn_cast, llvm no compiles
without exceptions and rtti by
default. We do need exceptions for the libconfig stuff, but rtti isn't
necessary (anymore).

Debug info needs to be rewritten, as in LLVM 2.7 the format has
completely changed. To have something to look at while rewriting, the
old code has been wrapped inside #ifndef DISABLE_DEBUG_INFO , this means
that you have to define this to compile at the moment.

Updated tango 0.99.9 patch to include updated EH runtime code, which is
needed for LLVM 2.7 as well.

Files:

• gen/main.cpp (modified) (9 diffs)

gen/main.cpp

@@ -149 +149 @@
-    global.params.objfiles = new Array();
-    global.params.ddocfiles = new Array();
-
+
-    global.params.moduleDeps = NULL;
-    global.params.moduleDepsFile = NULL;
@@ -224 +224 @@
-    initFromString(global.params.objname, objectFile);
-    initFromString(global.params.objdir, objectDir);
-
+
-    initFromString(global.params.docdir, ddocDir);
-    initFromString(global.params.docname, ddocFile);
-    global.params.doDocComments |=
-        global.params.docdir || global.params.docname;
-
+
-#ifdef _DH
-    initFromString(global.params.hdrdir, hdrDir);
@@ -238 +238 @@
-
-    initFromString(global.params.moduleDepsFile, moduleDepsFile);
- 
- 
- 
+
+
+
-    }
-
@@ -436 +436 @@
-
-    // Allocate target machine.
-
+
-    // first initialize llvm
-#define LLVM_TARGET(A) LLVMInitialize##A##TargetInfo(); LLVMInitialize##A##Target(); LLVMInitialize##A##AsmPrinter();
@@ -485 +485 @@
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    // get final data layout
@@ -904 +909 @@
-
-    // write module dependencies to file if requested
- 
- 
+
+
-        assert (global.params.moduleDepsFile != NULL);
-
-        File deps(global.params.moduleDepsFile);
- 
+
-        deps.setbuffer((void*)ob->data, ob->offset);
-        deps.write();
@@ -945 +950 @@
-        }
-    }
-
+
-    // internal linking for singleobj
-    if (singleObj && llvmModules.size() > 0)
@@ -952 +957 @@
-        char* name = m->toChars();
-        char* filename = m->objfile->name->str;
-
+
-        llvm::Linker linker(name, name, context);
-
@@ -962 +967 @@
-            delete llvmModules[i];
-        }
-
+
-        m->deleteObjFile();
-        writeModule(linker.getModule(), filename);
-        global.params.objfiles->push(filename);
-    }
-
+
-    backend_term();
-    if (global.errors)