changeset 1527:f19adff18813

A couple of ldc2 tweaks now druntime compiles.
author Robert Clipsham <robert@octarineparrot.com>
date Thu, 09 Jul 2009 12:36:08 +0100
parents 54b3c1394d62
children 15f1707721fa
files gen/main.cpp gen/runtime.cpp
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/gen/main.cpp	Tue Jul 07 02:26:11 2009 +0100
+++ b/gen/main.cpp	Thu Jul 09 12:36:08 2009 +0100
@@ -318,7 +318,9 @@
     }
     else if (!noDefaultLib)
     {
-#if !DMDV2
+#if DMDV2
+	global.params.linkswitches->push(mem.strdup("-ldruntime-ldc"));
+#else
         global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
         global.params.linkswitches->push(mem.strdup("-ltango-cc-tango"));
         global.params.linkswitches->push(mem.strdup("-ltango-gc-basic"));
--- a/gen/runtime.cpp	Tue Jul 07 02:26:11 2009 +0100
+++ b/gen/runtime.cpp	Thu Jul 09 12:36:08 2009 +0100
@@ -336,11 +336,7 @@
 
     // 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);
         const llvm::FunctionType* fty = llvm::FunctionType::get(voidPtrTy, types, false);