From e1fd317a4c92d16b619bb01fcbcf8d031d28cf36 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Wed, 5 Dec 2012 19:09:13 +0000 Subject: Adjust JIT target triple on OS X to match the current architecture. For OS X builds, we generate one version of config.h but then build for multiple architectures. This means that the LLVM_HOSTTRIPLE setting may have the wrong architecture. Adjust it dynamically to match the current architecture. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169405 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/TargetSelect.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/ExecutionEngine/TargetSelect.cpp b/lib/ExecutionEngine/TargetSelect.cpp index f33cc54..4e52a98 100644 --- a/lib/ExecutionEngine/TargetSelect.cpp +++ b/lib/ExecutionEngine/TargetSelect.cpp @@ -32,8 +32,18 @@ TargetMachine *EngineBuilder::selectTarget() { // must use the host architecture. if (UseMCJIT && WhichEngine != EngineKind::Interpreter && M) TT.setTriple(M->getTargetTriple()); - else + else { TT.setTriple(LLVM_HOSTTRIPLE); +#if defined(__APPLE__) +#if defined(__LP64__) + if (TT.isArch32Bit()) + TT = TT.get64BitArchVariant(); +#else + if (TT.isArch64Bit()) + TT = TT.get32BitArchVariant(); +#endif +#endif // APPLE + } return selectTarget(TT, MArch, MCPU, MAttrs); } -- cgit v1.1