From a1b42f28ae3780b47a1e3e7c3146a10c304a2130 Mon Sep 17 00:00:00 2001 From: Andreas Hollandt Date: Wed, 16 Jul 2014 18:17:29 +0200 Subject: [PATCH] fix for llvm trunk --- driver/main.cpp | 1 - driver/toobj.cpp | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/driver/main.cpp b/driver/main.cpp index 5c3c993f8f..b74597ea35 100644 --- a/driver/main.cpp +++ b/driver/main.cpp @@ -498,7 +498,6 @@ static void initializePasses() { initializeCore(Registry); initializeDebugIRPass(Registry); initializeScalarOpts(Registry); - initializeObjCARCOpts(Registry); initializeVectorization(Registry); initializeIPO(Registry); initializeAnalysis(Registry); diff --git a/driver/toobj.cpp b/driver/toobj.cpp index a36f306912..94a1b37130 100644 --- a/driver/toobj.cpp +++ b/driver/toobj.cpp @@ -217,8 +217,12 @@ void writeModule(llvm::Module* m, std::string filename) if (!global.params.output_s) { - bool Existed; - llvm::sys::fs::remove(spath.str(), Existed); +#if LDC_LLVM_VER < 305 + bool existed; + llvm::sys::fs::remove(spath.str(), existed); +#else + llvm::sys::fs::remove(spath.str()); +#endif } }