commit e266ce6c6eaf52ebe2b18d85b5e23788cf2f6ef4
author Bill Wendling <isanbard@gmail.com> Fri Jun 17 20:55:01 2011 +0000
committer Bill Wendling <isanbard@gmail.com> Fri Jun 17 20:55:01 2011 +0000
tree c7d879c91ca3f723bd05c17c913adf6375e289ba
parent da26ad501b9125c323f58f756826cf17114a9e6f

Use the verbose asm flag instead of a new flag for decoding the LSDA.

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

lib/CodeGen/LLVMTargetMachine.cpp

diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp
index 4ed959e..b98fbed 100644
--- a/lib/CodeGen/LLVMTargetMachine.cpp
+++ b/lib/CodeGen/LLVMTargetMachine.cpp
@@ -72,8 +72,6 @@
     cl::desc("Show encoding in .s output"));
 static cl::opt<bool> ShowMCInst("show-mc-inst", cl::Hidden,
     cl::desc("Show instruction structure in .s output"));
-static cl::opt<bool> DecodeMCLSDA("decode-mc-lsda", cl::Hidden,
-    cl::desc("Print LSDA in human readable format in .s output"));
 static cl::opt<bool> EnableMCLogging("enable-mc-api-logging", cl::Hidden,
     cl::desc("Enable MC API logging"));
 static cl::opt<bool> VerifyMachineCode("verify-machineinstrs", cl::Hidden,
@@ -154,8 +152,7 @@
                                                   hasMCUseCFI(),
                                                   InstPrinter,
                                                   MCE, TAB,
-                                                  ShowMCInst,
-                                                  DecodeMCLSDA);
+                                                  ShowMCInst);
     AsmStreamer.reset(S);
     break;
   }

lib/MC/MCAsmStreamer.cpp

diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp
index 01de450..f83b917 100644
--- a/lib/MC/MCAsmStreamer.cpp
+++ b/lib/MC/MCAsmStreamer.cpp
@@ -1605,8 +1605,8 @@
                                     bool isVerboseAsm, bool useLoc,
                                     bool useCFI, MCInstPrinter *IP,
                                     MCCodeEmitter *CE, TargetAsmBackend *TAB,
-                                    bool ShowInst, bool DecodeLSDA) {
-  if (DecodeLSDA)
+                                    bool ShowInst) {
+  if (isVerboseAsm)
     return new MCLSDADecoderAsmStreamer(Context, OS, isVerboseAsm, useLoc,
                                         useCFI, IP, CE, TAB, ShowInst);
 

lib/Target/PTX/PTXMCAsmStreamer.cpp

diff --git a/lib/Target/PTX/PTXMCAsmStreamer.cpp b/lib/Target/PTX/PTXMCAsmStreamer.cpp
index bc37b6a..1574670 100644
--- a/lib/Target/PTX/PTXMCAsmStreamer.cpp
+++ b/lib/Target/PTX/PTXMCAsmStreamer.cpp
@@ -533,8 +533,7 @@
                                    bool isVerboseAsm, bool useLoc, bool useCFI,
                                    MCInstPrinter *IP,
                                    MCCodeEmitter *CE, TargetAsmBackend *TAB,
-                                   bool ShowInst,
-                                   bool /*DecodeLSDA*/) {
+                                   bool ShowInst) {
     return new PTXMCAsmStreamer(Context, OS, isVerboseAsm, useLoc,
                                 IP, CE, ShowInst);
   }

lib/Target/PTX/PTXTargetMachine.cpp

diff --git a/lib/Target/PTX/PTXTargetMachine.cpp b/lib/Target/PTX/PTXTargetMachine.cpp
index 31ed09c..1b737c9 100644
--- a/lib/Target/PTX/PTXTargetMachine.cpp
+++ b/lib/Target/PTX/PTXTargetMachine.cpp
@@ -27,8 +27,7 @@
                                    MCInstPrinter *InstPrint,
                                    MCCodeEmitter *CE,
                                    TargetAsmBackend *TAB,
-                                   bool ShowInst,
-                                   bool DecodeLSDA);
+                                   bool ShowInst);
 }
 
 extern "C" void LLVMInitializePTXTarget() {