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

[Chris Lattner]

Changes in directory llvm/tools/llc:

llc.cpp updated: 1.107 -> 1.108
---
Log message:

add a new -filetype argument to llc.



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

 llc.cpp |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)


Index: llvm/tools/llc/llc.cpp
diff -u llvm/tools/llc/llc.cpp:1.107 llvm/tools/llc/llc.cpp:1.108
--- llvm/tools/llc/llc.cpp:1.107	Fri Jun 24 22:00:34 2005
+++ llvm/tools/llc/llc.cpp	Fri Jun 24 22:32:05 2005
@@ -23,6 +23,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
+#include "llvm/Config/config.h"
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -44,7 +45,20 @@
 static cl::opt<const TargetMachineRegistry::Entry*, false, TargetNameParser>
 MArch("march", cl::desc("Architecture to generate code for:"));
 
-// GetFileNameRoot - Helper function to get the basename of a filename...
+cl::opt<TargetMachine::CodeGenFileType>
+FileType("filetype", cl::init(TargetMachine::AssemblyFile),
+  cl::desc("Choose a file type (not all types are supported by all targets):"),
+  cl::values(
+       clEnumValN(TargetMachine::AssemblyFile,    "asm",
+                  "  Emit an assembly ('.s') file"),
+       clEnumValN(TargetMachine::ObjectFile,    "obj",
+                  "  Emit a native object ('.o') file"),
+       clEnumValN(TargetMachine::DynamicLibrary, "dynlib",
+                  "  Emit a native dynamic library ('.so') file"),
+       clEnumValEnd));
+
+
+// GetFileNameRoot - Helper function to get the basename of a filename.
 static inline std::string
 GetFileNameRoot(const std::string &InputFilename) {
   std::string IFN = InputFilename;
@@ -126,10 +140,20 @@
       } else {
         OutputFilename = GetFileNameRoot(InputFilename);
 
-        if (MArch->Name[0] != 'c' || MArch->Name[1] != 0)  // not CBE
-          OutputFilename += ".s";
-        else
-          OutputFilename += ".cbe.c";
+        switch (FileType) {
+        case TargetMachine::AssemblyFile:
+          if (MArch->Name[0] != 'c' || MArch->Name[1] != 0)  // not CBE
+            OutputFilename += ".s";
+          else
+            OutputFilename += ".cbe.c";
+          break;
+        case TargetMachine::ObjectFile:
+          OutputFilename += ".o";
+          break;
+        case TargetMachine::DynamicLibrary:
+          OutputFilename += LTDL_SHLIB_EXT;
+          break;
+        }
 
         if (!Force && std::ifstream(OutputFilename.c_str())) {
           // If force is not specified, make sure not to overwrite a file!
@@ -153,9 +177,9 @@
     }
 
     // Ask the target to add backend passes as necessary.
-    if (Target.addPassesToEmitFile(Passes, *Out, TargetMachine::AssemblyFile)) {
+    if (Target.addPassesToEmitFile(Passes, *Out, FileType)) {
       std::cerr << argv[0] << ": target '" << Target.getName()
-                << "' does not support static compilation!\n";
+                << "' does not support generation of this file type!\n";
       if (Out != &std::cout) delete Out;
       // And the Out file is empty and useless, so remove it now.
       std::remove(OutputFilename.c_str());