Remove the -emit-bytecode option. Noone in the llvm tree uses it, and this

keeps llvm-upgrade a simple "source to source" tool.

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

diff --git a/tools/llvm-upgrade/Makefile b/tools/llvm-upgrade/Makefile
index b20da76b608acbe615129f30383d525ff59c076c..1bd936b000d26cf4c128eb42eee3e5919d0d0e7d 100644 (file)
--- a/tools/llvm-upgrade/Makefile
+++ b/tools/llvm-upgrade/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TOOLNAME = llvm-upgrade
-LINK_COMPONENTS := BCWriter Core support system
+LINK_COMPONENTS := Core support system
 REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-upgrade/llvm-upgrade.cpp b/tools/llvm-upgrade/llvm-upgrade.cpp
index d3a60cfa82ac95e13ef9a599828402de704a5a3c..9425e3e579a28e8836770bd603668482363d75bc 100644 (file)
--- a/tools/llvm-upgrade/llvm-upgrade.cpp
+++ b/tools/llvm-upgrade/llvm-upgrade.cpp
@@ -21,7 +21,6 @@
 
 #include "UpgradeInternals.h"
 #include "llvm/Module.h"
-#include "llvm/Bytecode/Writer.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Streams.h"
@@ -50,10 +49,6 @@ static cl::opt<bool>
 Debug("debug-upgrade-yacc", cl::desc("Print debug output from yacc parser"),
       cl::Hidden, cl::init(false));
 
-static cl::opt<bool>
-EmitByteCode("emit-bytecode", cl::desc("Emit bytecode instead of assembly"),
-    cl::init(false));
-
 int main(int argc, char **argv) {
   llvm_shutdown_obj X;  // Call llvm_shutdown() on exit.
   cl::ParseCommandLineOptions(argc, argv, " llvm .ll -> .bc assembler\n");
@@ -128,17 +123,12 @@ int main(int argc, char **argv) {
     Module *M = UpgradeAssembly(InputFilename, *In, Debug, AddAttrs);
     if (!M) {
       cerr << argv[0] << ": No module returned from assembly parsing\n";
-      if (!EmitByteCode)
-        *Out << argv[0] << ": parse failed.";
+      *Out << argv[0] << ": parse failed.";
       exit(1);
     }
 
     // Finally, print the module on the output stream.
-    if (EmitByteCode) {
-      OStream OS(*Out);
-      WriteBytecodeToFile(M, OS);
-    } else
-      M->print(Out);
+    M->print(Out);
 
   } catch (const std::string& caught_message) {
     cerr << argv[0] << ": " << caught_message << "\n";