aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Target/ARM/ARMSubtarget.cpp
diff options
context:
space:
mode:
authorRenato Golin <renato.golin@linaro.org>2016-09-08 13:45:10 +0000
committerRenato Golin <renato.golin@linaro.org>2016-09-08 13:45:10 +0000
commitd257373887c36c033ad71d06858e890a47c4f6c4 (patch)
tree8af786505ee27c98e59d7f1a8f49eab87d8e5492 /llvm/lib/Target/ARM/ARMSubtarget.cpp
parent3e848ea5860ec75947e3dc69418e2c1912f419a9 (diff)
downloadllvm-d257373887c36c033ad71d06858e890a47c4f6c4.zip
llvm-d257373887c36c033ad71d06858e890a47c4f6c4.tar.gz
llvm-d257373887c36c033ad71d06858e890a47c4f6c4.tar.bz2
[ARM XRay] Try to fix Thumb-only failure
I mised the check that it had to support ARM to work. This commit tries to fix that, to make sure we don't emit ARM code in Thumb-only mode. llvm-svn: 280935
Diffstat (limited to 'llvm/lib/Target/ARM/ARMSubtarget.cpp')
-rw-r--r--llvm/lib/Target/ARM/ARMSubtarget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMSubtarget.cpp b/llvm/lib/Target/ARM/ARMSubtarget.cpp
index 481aacd..a90b495 100644
--- a/llvm/lib/Target/ARM/ARMSubtarget.cpp
+++ b/llvm/lib/Target/ARM/ARMSubtarget.cpp
@@ -103,7 +103,7 @@ ARMSubtarget::ARMSubtarget(const Triple &TT, const std::string &CPU,
bool ARMSubtarget::isXRaySupported() const {
// We don't currently suppport Thumb, but Windows requires Thumb.
- return hasV6Ops() && !isTargetWindows();
+ return hasV6Ops() && hasARMOps() && !isTargetWindows();
}
void ARMSubtarget::initializeEnvironment() {