fix build against LLVM master: clEnumValEnd removed

This commit is contained in:
Rainer Schuetze 2016-10-09 18:49:02 +02:00
parent 4e5c9616e3
commit 0b55bd21d2
5 changed files with 66 additions and 57 deletions

View file

@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
#include "gen/llvmhelpers.h"
#include "gen/cl_helpers.h"
#include "declaration.h"
#include "expression.h"
#include "gen/abi.h"
@ -44,19 +45,23 @@
#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),
llvm::cl::values(clEnumValN(llvm::GlobalVariable::GeneralDynamicTLSModel,
"global-dynamic",
"Global dynamic TLS model (default)"),
clEnumValN(llvm::GlobalVariable::LocalDynamicTLSModel,
"local-dynamic", "Local dynamic TLS model"),
clEnumValN(llvm::GlobalVariable::InitialExecTLSModel,
"initial-exec", "Initial exec TLS model"),
clEnumValN(llvm::GlobalVariable::LocalExecTLSModel,
"local-exec", "Local exec TLS model"),
clEnumValEnd));
clEnumValues(clEnumValN(llvm::GlobalVariable::GeneralDynamicTLSModel,
"global-dynamic",
"Global dynamic TLS model (default)"),
clEnumValN(llvm::GlobalVariable::LocalDynamicTLSModel,
"local-dynamic", "Local dynamic TLS model"),
clEnumValN(llvm::GlobalVariable::InitialExecTLSModel,
"initial-exec", "Initial exec TLS model"),
clEnumValN(llvm::GlobalVariable::LocalExecTLSModel,
"local-exec", "Local exec TLS model")));
/******************************************************************************
* Simple Triple helpers for DFE