summaryrefslogtreecommitdiff
path: root/tools/llvm-jitlistener
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2014-03-06 20:47:11 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2014-03-06 20:47:11 +0000
commit4eb048a6f1b9777d31d71684204deb1b39aa1795 (patch)
tree956cabeaa8603c93307b2cff38b51e12fa34af78 /tools/llvm-jitlistener
parent5219b0f586e901b0aee7c927d97cf6d43f8fc49d (diff)
downloadllvm-4eb048a6f1b9777d31d71684204deb1b39aa1795.tar.gz
llvm-4eb048a6f1b9777d31d71684204deb1b39aa1795.tar.bz2
llvm-4eb048a6f1b9777d31d71684204deb1b39aa1795.tar.xz
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
Diffstat (limited to 'tools/llvm-jitlistener')
-rw-r--r--tools/llvm-jitlistener/llvm-jitlistener.cpp4
1 files changed, 2 insertions, 2 deletions
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());
}