Move more MC options into the MCTargetOptions structure.

No functional change.

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

2 files changed, 12 insertions, 2 deletions

diff --git a/include/llvm/MC/MCTargetOptions.h b/include/llvm/MC/MCTargetOptions.h
index 225ed7d85f..ad34958ae3 100644
--- a/include/llvm/MC/MCTargetOptions.h
+++ b/include/llvm/MC/MCTargetOptions.h
@@ -26,7 +26,8 @@ public:
   unsigned MCNoExecStack : 1;
   unsigned MCSaveTempLabels : 1;
   unsigned MCUseDwarfDirectory : 1;
-
+  unsigned ShowMCEncoding : 1;
+  unsigned ShowMCInst : 1;
   MCTargetOptions();
 };
 
@@ -36,7 +37,9 @@ inline bool operator==(const MCTargetOptions &LHS, const MCTargetOptions &RHS) {
           ARE_EQUAL(MCRelaxAll) &&
           ARE_EQUAL(MCNoExecStack) &&
           ARE_EQUAL(MCSaveTempLabels) &&
-          ARE_EQUAL(MCUseDwarfDirectory));
+          ARE_EQUAL(MCUseDwarfDirectory) &&
+          ARE_EQUAL(ShowMCEncoding) &&
+          ARE_EQUAL(ShowMCInst));
 #undef ARE_EQUAL
 }
 
diff --git a/include/llvm/MC/MCTargetOptionsCommandFlags.h b/include/llvm/MC/MCTargetOptionsCommandFlags.h
index 8968f9919f..1edf8f75b1 100644
--- a/include/llvm/MC/MCTargetOptionsCommandFlags.h
+++ b/include/llvm/MC/MCTargetOptionsCommandFlags.h
@@ -42,6 +42,11 @@ cl::opt<bool> NoExecStack("mc-no-exec-stack",
 
 cl::opt<bool> SaveTempLabels("L", cl::desc("Don't discard temporary labels"));
 
+cl::opt<bool> ShowMCEncoding("show-mc-encoding", cl::Hidden,
+                             cl::desc("Show encoding in .s output"));
+cl::opt<bool> ShowMCInst("show-mc-inst", cl::Hidden,
+                         cl::desc("Show instruction structure in .s output"));
+
 static inline MCTargetOptions InitMCTargetOptionsFromFlags() {
   MCTargetOptions Options;
   Options.SanitizeAddress =
@@ -50,6 +55,8 @@ static inline MCTargetOptions InitMCTargetOptionsFromFlags() {
   Options.MCUseDwarfDirectory = EnableDwarfDirectory;
   Options.MCNoExecStack = NoExecStack;
   Options.MCSaveTempLabels = SaveTempLabels;
+  Options.ShowMCEncoding = ShowMCEncoding;
+  Options.ShowMCInst = ShowMCInst;
   return Options;
 }