[llvm-commits] [vector_llvm] CVS: llvm/tools/llc/Makefile llc.cpp

[Robert Bocchino]

Changes in directory llvm/tools/llc:

Makefile updated: 1.73 -> 1.73.2.1
llc.cpp updated: 1.113 -> 1.113.2.1
---
Log message:

Merged mainline into Vector LLVM branch


---
Diffs of the changes:  (+11 -7)

 Makefile |    4 ++--
 llc.cpp  |   14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)


Index: llvm/tools/llc/Makefile
diff -u llvm/tools/llc/Makefile:1.73 llvm/tools/llc/Makefile:1.73.2.1
--- llvm/tools/llc/Makefile:1.73	Wed Jun  8 17:32:51 2005
+++ llvm/tools/llc/Makefile	Wed Nov 16 12:33:37 2005
@@ -69,9 +69,9 @@
 	LLVMTarget.a \
 	LLVMipa.a \
 	LLVMTransforms.a \
-	LLVMScalarOpts \
-	LLVMAnalysis.a \
+	LLVMScalarOpts.a \
 	LLVMTransformUtils.a \
+	LLVMAnalysis.a \
 	LLVMBCReader \
 	LLVMBCWriter \
 	LLVMCore \


Index: llvm/tools/llc/llc.cpp
diff -u llvm/tools/llc/llc.cpp:1.113 llvm/tools/llc/llc.cpp:1.113.2.1
--- llvm/tools/llc/llc.cpp:1.113	Fri Sep  2 14:27:43 2005
+++ llvm/tools/llc/llc.cpp	Wed Nov 16 12:33:37 2005
@@ -45,20 +45,24 @@
 
 static cl::opt<bool> Force("f", cl::desc("Overwrite output files"));
 
+static cl::opt<bool> Fast("fast", 
+      cl::desc("Generate code quickly, potentially sacrificing code quality"));
+
+
 static cl::opt<const TargetMachineRegistry::Entry*, false, TargetNameParser>
 MArch("march", cl::desc("Architecture to generate code for:"));
 
 static cl::opt<std::string>
 MCPU("mcpu", 
-  cl::desc("Target a specific cpu type (-mcpu=help for list of choices)"),
+  cl::desc("Target a specific cpu type (-mcpu=help for details)"),
   cl::value_desc("cpu-name"),
   cl::init(""));
 
 static cl::list<std::string>
 MAttrs("mattr", 
   cl::CommaSeparated,
-  cl::desc("Target specific attributes (-mattr=help for list of choices)"),
-  cl::value_desc("attr1,+attr2, ..., -attrN"));
+  cl::desc("Target specific attributes (-mattr=help for details)"),
+  cl::value_desc("a1,+a2,-a3,..."));
 
 cl::opt<TargetMachine::CodeGenFileType>
 FileType("filetype", cl::init(TargetMachine::AssemblyFile),
@@ -67,7 +71,7 @@
        clEnumValN(TargetMachine::AssemblyFile,    "asm",
                   "  Emit an assembly ('.s') file"),
        clEnumValN(TargetMachine::ObjectFile,    "obj",
-                  "  Emit a native object ('.o') file"),
+                  "  Emit a native object ('.o') file [experimental]"),
        clEnumValN(TargetMachine::DynamicLibrary, "dynlib",
                   "  Emit a native dynamic library ('.so') file"),
        clEnumValEnd));
@@ -228,7 +232,7 @@
     }
 
     // Ask the target to add backend passes as necessary.
-    if (Target.addPassesToEmitFile(Passes, *Out, FileType)) {
+    if (Target.addPassesToEmitFile(Passes, *Out, FileType, Fast)) {
       std::cerr << argv[0] << ": target '" << Target.getName()
                 << "' does not support generation of this file type!\n";
       if (Out != &std::cout) delete Out;