extract has been renamed to llvm-extract to avoid conflicting with another tool

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21498 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/extract/Makefile b/tools/extract/Makefile
deleted file mode 100644 (file)
index b578e94..0000000
--- a/tools/extract/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-##===- tools/extract/Makefile ------------------------------*- Makefile -*-===##
-# 
-#                     The LLVM Compiler Infrastructure
-#
-# This file was developed by the LLVM research group and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
-# 
-##===----------------------------------------------------------------------===##
-LEVEL = ../..
-
-TOOLNAME = extract
-USEDLIBS = LLVMBCReader LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMTarget.a \
-          LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
-          LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
-
-include $(LEVEL)/Makefile.common

diff --git a/tools/extract/extract.cpp b/tools/extract/extract.cpp
deleted file mode 100644 (file)
index 78d0426..0000000
--- a/tools/extract/extract.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//===- extract.cpp - LLVM function extraction utility ---------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This utility changes the input module to only contain a single function,
-// which is primarily used for debugging transformations.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/Module.h"
-#include "llvm/PassManager.h"
-#include "llvm/Bytecode/Reader.h"
-#include "llvm/Bytecode/WriteBytecodePass.h"
-#include "llvm/Transforms/IPO.h"
-#include "llvm/Target/TargetData.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/System/Signals.h"
-#include <memory>
-#include <fstream>
-using namespace llvm;
-
-// InputFilename - The filename to read from.
-static cl::opt<std::string>
-InputFilename(cl::Positional, cl::desc("<input bytecode file>"),
-              cl::init("-"), cl::value_desc("filename"));
-
-static cl::opt<std::string>
-OutputFilename("o", cl::desc("Specify output filename"),
-               cl::value_desc("filename"), cl::init("-"));
-
-static cl::opt<bool>
-Force("f", cl::desc("Overwrite output files"));
-
-static cl::opt<bool>
-DeleteFn("delete", cl::desc("Delete specified function from Module"));
-
-// ExtractFunc - The function to extract from the module... defaults to main.
-static cl::opt<std::string>
-ExtractFunc("func", cl::desc("Specify function to extract"), cl::init("main"),
-            cl::value_desc("function"));
-
-int main(int argc, char **argv) {
-  try {
-    cl::ParseCommandLineOptions(argc, argv, " llvm extractor\n");
-    sys::PrintStackTraceOnErrorSignal();
-
-    std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
-    if (M.get() == 0) {
-      std::cerr << argv[0] << ": bytecode didn't read correctly.\n";
-      return 1;
-    }
-
-    // Figure out which function we should extract
-    Function *F = M.get()->getNamedFunction(ExtractFunc);
-    if (F == 0) {
-      std::cerr << argv[0] << ": program doesn't contain function named '"
-                << ExtractFunc << "'!\n";
-      return 1;
-    }
-
-    // In addition to deleting all other functions, we also want to spiff it
-    // up a little bit.  Do this now.
-    PassManager Passes;
-    Passes.add(new TargetData("extract", M.get())); // Use correct TargetData
-    // Either isolate the function or delete it from the Module
-    Passes.add(createFunctionExtractionPass(F, DeleteFn));
-    Passes.add(createGlobalDCEPass());              // Delete unreachable globals
-    Passes.add(createFunctionResolvingPass());      // Delete prototypes
-    Passes.add(createDeadTypeEliminationPass());    // Remove dead types...
-
-    std::ostream *Out = 0;
-
-    if (OutputFilename != "-") {  // Not stdout?
-      if (!Force && std::ifstream(OutputFilename.c_str())) {
-        // If force is not specified, make sure not to overwrite a file!
-        std::cerr << argv[0] << ": error opening '" << OutputFilename
-                  << "': file exists!\n"
-                  << "Use -f command line argument to force output\n";
-        return 1;
-      }
-      std::ios::openmode io_mode = std::ios::out | std::ios::trunc |
-                                   std::ios::binary;
-      Out = new std::ofstream(OutputFilename.c_str(), io_mode);
-    } else {                      // Specified stdout
-      // FIXME: cout is not binary!
-      Out = &std::cout;
-    }
-
-    Passes.add(new WriteBytecodePass(Out));  // Write bytecode to file...
-    Passes.run(*M.get());
-
-    if (Out != &std::cout)
-      delete Out;
-    return 0;
-  } catch (const std::string& msg) {
-    std::cerr << argv[0] << ": " << msg << "\n";
-  } catch (...) {
-    std::cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
-  }
-  return 1;
-}

diff --git a/tools/llvm-extract/Makefile b/tools/llvm-extract/Makefile
new file mode 100644 (file)
index 0000000..80a90fa
--- /dev/null
+++ b/tools/llvm-extract/Makefile
@@ -0,0 +1,16 @@
+##===- tools/llvm-extract/Makefile -------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file was developed by the LLVM research group and is distributed under
+# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+LEVEL = ../..
+
+TOOLNAME = llvm-extract
+USEDLIBS = LLVMBCReader LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMTarget.a \
+           LLVMAnalysis.a LLVMTransformUtils.a LLVMipa.a \
+           LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a
+
+include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp
index 78d0426be1847b17ea3f2f5c1d288c51384f3b74..e1088d2b2d52d24c17b7bb1b59390e7f6c015e92 100644 (file)
--- a/tools/llvm-extract/llvm-extract.cpp
+++ b/tools/llvm-extract/llvm-extract.cpp
@@ -1,4 +1,4 @@
-//===- extract.cpp - LLVM function extraction utility ---------------------===//
+//===- llvm-extract.cpp - LLVM function extraction utility ----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -69,9 +69,9 @@ int main(int argc, char **argv) {
     Passes.add(new TargetData("extract", M.get())); // Use correct TargetData
     // Either isolate the function or delete it from the Module
     Passes.add(createFunctionExtractionPass(F, DeleteFn));
-    Passes.add(createGlobalDCEPass());              // Delete unreachable globals
-    Passes.add(createFunctionResolvingPass());      // Delete prototypes
-    Passes.add(createDeadTypeEliminationPass());    // Remove dead types...
+    Passes.add(createGlobalDCEPass());             // Delete unreachable globals
+    Passes.add(createFunctionResolvingPass());     // Delete prototypes
+    Passes.add(createDeadTypeEliminationPass());   // Remove dead types...
 
     std::ostream *Out = 0;