From d257373887c36c033ad71d06858e890a47c4f6c4 Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Thu, 8 Sep 2016 13:45:10 +0000 Subject: [PATCH] [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 --- llvm/lib/Target/ARM/ARMSubtarget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() { -- 2.7.4