From 4eb048a6f1b9777d31d71684204deb1b39aa1795 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 6 Mar 2014 20:47:11 +0000 Subject: Support: split object format out of environment This is a preliminary setup change to support a renaming of Windows target triples. Split the object file format information out of the environment into a separate entity. Unfortunately, file format was previously treated as an environment with an unknown OS. This is most obvious in the ARM subtarget where the handling for macho on an arbitrary platform switches to AAPCS rather than APCS (as per Apple's needs). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203160 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-jitlistener/llvm-jitlistener.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/llvm-jitlistener') diff --git a/tools/llvm-jitlistener/llvm-jitlistener.cpp b/tools/llvm-jitlistener/llvm-jitlistener.cpp index a9bbc702a9..c159aa506d 100644 --- a/tools/llvm-jitlistener/llvm-jitlistener.cpp +++ b/tools/llvm-jitlistener/llvm-jitlistener.cpp @@ -138,8 +138,8 @@ protected: if (Tuple.getTriple().empty()) Tuple.setTriple(sys::getProcessTriple()); - if (Tuple.isOSWindows() && Triple::ELF != Tuple.getEnvironment()) { - Tuple.setEnvironment(Triple::ELF); + if (Tuple.isOSWindows() && !Tuple.isOSBinFormatELF()) { + Tuple.setObjectFormat(Triple::ELF); TheModule->setTargetTriple(Tuple.getTriple()); } -- cgit v1.2.3