[llvm-branch-commits] [llvm-branch] r98214 - in /llvm/branches/Apple/Hermes: ./ lib/Target/ARM/ARMSubtarget.h

[Bob Wilson]

Author: bwilson
Date: Wed Mar 10 18:37:48 2010
New Revision: 98214

URL: http://llvm.org/viewvc/llvm-project?rev=98214&view=rev
Log:
--- Merging r98210 into '.':
U    lib/Target/ARM/ARMSubtarget.h

Modified:
    llvm/branches/Apple/Hermes/   (props changed)
    llvm/branches/Apple/Hermes/lib/Target/ARM/ARMSubtarget.h

Propchange: llvm/branches/Apple/Hermes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 10 18:37:48 2010
@@ -1 +1 @@
-/llvm/trunk:96521,96525,96572,96621,96775,96825,96827,96990,97025,97065,97071,97538,97707,97757,97782,97797
+/llvm/trunk:96521,96525,96572,96621,96775,96825,96827,96990,97025,97065,97071,97538,97707,97757,97782,97797,98210

Modified: llvm/branches/Apple/Hermes/lib/Target/ARM/ARMSubtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/lib/Target/ARM/ARMSubtarget.h?rev=98214&r1=98213&r2=98214&view=diff
==============================================================================
--- llvm/branches/Apple/Hermes/lib/Target/ARM/ARMSubtarget.h (original)
+++ llvm/branches/Apple/Hermes/lib/Target/ARM/ARMSubtarget.h Wed Mar 10 18:37:48 2010
@@ -94,9 +94,9 @@
   /// getMaxInlineSizeThreshold - Returns the maximum memset / memcpy size
   /// that still makes it profitable to inline the call.
   unsigned getMaxInlineSizeThreshold() const {
-    // FIXME: For now, we don't lower memcpy's to loads / stores for Thumb.
-    // Change this once Thumb ldmia / stmia support is added.
-    return isThumb() ? 0 : 64;
+    // FIXME: For now, we don't lower memcpy's to loads / stores for Thumb1.
+    // Change this once Thumb1 ldmia / stmia support is added.
+    return isThumb1Only() ? 0 : 64;
   }
   /// ParseSubtargetFeatures - Parses features string setting specified
   /// subtarget options.  Definition of function is auto generated by tblgen.