[llvm-commits] [vector_llvm] CVS: llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp SkeletonTargetMachine.h

[Robert Bocchino]

Changes in directory llvm/lib/Target/Skeleton:

SkeletonTargetMachine.cpp updated: 1.5 -> 1.5.2.1
SkeletonTargetMachine.h updated: 1.4 -> 1.4.2.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+3 -2)

 SkeletonTargetMachine.cpp |    3 ++-
 SkeletonTargetMachine.h   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp
diff -u llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp:1.5 llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp:1.5.2.1
--- llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp:1.5	Thu Sep  1 16:38:21 2005
+++ llvm/lib/Target/Skeleton/SkeletonTargetMachine.cpp	Wed Nov 16 12:32:39 2005
@@ -40,7 +40,8 @@
 ///
 bool SkeletonTargetMachine::addPassesToEmitFile(PassManager &PM,
                                                 std::ostream &Out,
-                                                CodeGenFileType FileType) {
+                                                CodeGenFileType FileType,
+                                                bool Fast) {
   if (FileType != TargetMachine::AssemblyFile) return true;
   // <insert instruction selector passes here>
   PM.add(createRegisterAllocator());


Index: llvm/lib/Target/Skeleton/SkeletonTargetMachine.h
diff -u llvm/lib/Target/Skeleton/SkeletonTargetMachine.h:1.4 llvm/lib/Target/Skeleton/SkeletonTargetMachine.h:1.4.2.1
--- llvm/lib/Target/Skeleton/SkeletonTargetMachine.h:1.4	Thu Sep  1 16:38:21 2005
+++ llvm/lib/Target/Skeleton/SkeletonTargetMachine.h	Wed Nov 16 12:32:39 2005
@@ -44,7 +44,7 @@
                                             MachineCodeEmitter &MCE);
 
     virtual bool addPassesToEmitFile(PassManager &PM, std::ostream &Out,
-                                     CodeGenFileType FileType);
+                                     CodeGenFileType FileType, bool Fast);
   };
 
 } // end namespace llvm