[pkg-d-commits] [ldc] 117/211: fix build against current LLVM master @ 9b4e8286785f538e73d2e3eaa96f88c3d98b9960

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.1.0
in repository ldc.

commit 08e1c496dc0c9460426e6ef889954f3da397d950
Author: Rainer Schuetze <r.sagitario at gmx.de>
Date:   Thu Oct 27 08:08:19 2016 +0200

    fix build against current LLVM master @ 9b4e8286785f538e73d2e3eaa96f88c3d98b9960
---
 driver/cache.cpp    | 1 +
 gen/dibuilder.cpp   | 2 ++
 gen/llvmhelpers.cpp | 5 -----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/driver/cache.cpp b/driver/cache.cpp
index d65bf73..bf3348e 100644
--- a/driver/cache.cpp
+++ b/driver/cache.cpp
@@ -41,6 +41,7 @@
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/TimeValue.h"
 
 // Include close() declaration.
 #if !defined(_MSC_VER) && !defined(__MINGW32__)
diff --git a/gen/dibuilder.cpp b/gen/dibuilder.cpp
index 813b9e7..1532f5a 100644
--- a/gen/dibuilder.cpp
+++ b/gen/dibuilder.cpp
@@ -236,7 +236,9 @@ ldc::DIType ldc::DIBuilder::CreateBasicType(Type *type) {
 
   return DBuilder.createBasicType(type->toChars(),         // name
                                   getTypeAllocSize(T) * 8, // size (bits)
+#if LDC_LLVM_VER < 400
                                   getABITypeAlign(T) * 8,  // align (bits)
+#endif
                                   Encoding);
 }
 
diff --git a/gen/llvmhelpers.cpp b/gen/llvmhelpers.cpp
index b1514f4..b8b017e 100644
--- a/gen/llvmhelpers.cpp
+++ b/gen/llvmhelpers.cpp
@@ -45,11 +45,6 @@
 
 #include "llvm/Support/CommandLine.h"
 
-#if LDC_LLVM_VER >= 400
-// trick clEnumValN() into prepending the llvm namesspace 
-namespace cl { using OptionEnumValue = llvm::cl::OptionEnumValue; }
-#endif
-
 llvm::cl::opt<llvm::GlobalVariable::ThreadLocalMode> clThreadModel(
     "fthread-model", llvm::cl::desc("Thread model"),
     llvm::cl::init(llvm::GlobalVariable::GeneralDynamicTLSModel),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git