[llvm] r280935 - [ARM XRay] Try to fix Thumb-only failure

[Renato Golin via llvm-commits]

Author: rengolin
Date: Thu Sep  8 08:45:10 2016
New Revision: 280935

URL: http://llvm.org/viewvc/llvm-project?rev=280935&view=rev
Log:
[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.

Modified:
    llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp?rev=280935&r1=280934&r2=280935&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMSubtarget.cpp Thu Sep  8 08:45:10 2016
@@ -103,7 +103,7 @@ ARMSubtarget::ARMSubtarget(const Triple
 
 bool ARMSubtarget::isXRaySupported() const {
   // We don't currently suppport Thumb, but Windows requires Thumb.
-  return hasV6Ops() && !isTargetWindows();
+  return hasV6Ops() && hasARMOps() && !isTargetWindows();
 }
 
 void ARMSubtarget::initializeEnvironment() {