From b2b56203a96ba191f57e37e3c3d32d5278ae9f6c Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Sun, 6 Oct 2013 01:01:19 +0200 Subject: [PATCH] Use llvm::Triple::isArch64Bit (LLVM 3.1+). --- driver/main.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/driver/main.cpp b/driver/main.cpp index eb8901c8..c218474a 100644 --- a/driver/main.cpp +++ b/driver/main.cpp @@ -637,15 +637,18 @@ int main(int argc, char **argv) gTargetMachine = createTargetMachine(mTargetTriple, mArch, mCPU, mAttrs, bitness, mRelocModel, mCodeModel, codeGenOptLevel(), global.params.symdebug); - llvm::Triple targetTriple = llvm::Triple(gTargetMachine->getTargetTriple()); - global.params.targetTriple = targetTriple; - global.params.trace = false; - global.params.isLinux = targetTriple.getOS() == llvm::Triple::Linux; - global.params.isOSX = targetTriple.isMacOSX(); - global.params.isWindows = targetTriple.isOSWindows(); - global.params.isFreeBSD = targetTriple.getOS() == llvm::Triple::FreeBSD; - global.params.isOpenBSD = targetTriple.getOS() == llvm::Triple::OpenBSD; - global.params.isSolaris = targetTriple.getOS() == llvm::Triple::Solaris; + + { + llvm::Triple triple = llvm::Triple(gTargetMachine->getTargetTriple()); + global.params.targetTriple = triple; + global.params.isLinux = triple.getOS() == llvm::Triple::Linux; + global.params.isOSX = triple.isMacOSX(); + global.params.isWindows = triple.isOSWindows(); + global.params.isFreeBSD = triple.getOS() == llvm::Triple::FreeBSD; + global.params.isOpenBSD = triple.getOS() == llvm::Triple::OpenBSD; + global.params.isSolaris = triple.getOS() == llvm::Triple::Solaris; + global.params.is64bit = triple.isArch64Bit(); + } #if LDC_LLVM_VER >= 302 gDataLayout = gTargetMachine->getDataLayout(); @@ -653,9 +656,6 @@ int main(int argc, char **argv) gDataLayout = gTargetMachine->getTargetData(); #endif - // Starting with LLVM 3.1 we could also use global.params.targetTriple.isArch64Bit(); - global.params.is64bit = gDataLayout->getPointerSizeInBits(ADDRESS_SPACE) == 64; - // Set predefined version identifiers. registerPredefinedVersions();