[llvm-branch-commits] [llvm-branch] r99464 - in /llvm/branches/Apple/Morbo: ./ include/llvm/Target/TargetMachine.h

[Eric Christopher]

Author: echristo
Date: Wed Mar 24 20:01:03 2010
New Revision: 99464

URL: http://llvm.org/viewvc/llvm-project?rev=99464&view=rev
Log:
Merge from mainline:

Sending        include/llvm/Target/TargetMachine.h
Transmitting file data .
Committed revision 99463.



Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/include/llvm/Target/TargetMachine.h

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 24 20:01:03 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99223,99263,99282-99284,99306,99319-99321,99324,99336,99423,99429
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780,98810,98835,98839,98845,98855,98862,98881,98920,98977,99032-99033,99043,99223,99263,99282-99284,99306,99319-99321,99324,99336,99423,99429,99463

Modified: llvm/branches/Apple/Morbo/include/llvm/Target/TargetMachine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/include/llvm/Target/TargetMachine.h?rev=99464&r1=99463&r2=99464&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/include/llvm/Target/TargetMachine.h (original)
+++ llvm/branches/Apple/Morbo/include/llvm/Target/TargetMachine.h Wed Mar 24 20:01:03 2010
@@ -192,7 +192,7 @@
                                    formatted_raw_ostream &,
                                    CodeGenFileType,
                                    CodeGenOpt::Level,
-                                   bool DisableVerify = true) {
+                                   bool = true) {
     return true;
   }
 
@@ -205,7 +205,7 @@
   virtual bool addPassesToEmitMachineCode(PassManagerBase &,
                                           JITCodeEmitter &,
                                           CodeGenOpt::Level,
-                                          bool DisableVerify = true) {
+                                          bool = true) {
     return true;
   }
 
@@ -216,7 +216,7 @@
   virtual bool addPassesToEmitWholeFile(PassManager &, formatted_raw_ostream &,
                                         CodeGenFileType,
                                         CodeGenOpt::Level,
-                                        bool DisableVerify = true) {
+                                        bool = true) {
     return true;
   }
 };