From: Eric Christopher <echristo@gmail.com>
Date: Wed, 21 May 2014 00:20:01 +0000 (+0000)
Subject: This command line option is only used in one place. Move it there and
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e648d75c607378d55765103c2ac554a2964b6280;p=oota-llvm.git

This command line option is only used in one place. Move it there and
rename it to something more descriptive.

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

diff --git a/include/llvm/MC/MCTargetOptionsCommandFlags.h b/include/llvm/MC/MCTargetOptionsCommandFlags.h
index 55ac1421572..24e683f6172 100644
--- a/include/llvm/MC/MCTargetOptionsCommandFlags.h
+++ b/include/llvm/MC/MCTargetOptionsCommandFlags.h
@@ -40,8 +40,6 @@ cl::opt<bool> EnableDwarfDirectory(
 cl::opt<bool> NoExecStack("mc-no-exec-stack",
                           cl::desc("File doesn't need an 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,
@@ -57,7 +55,6 @@ static inline MCTargetOptions InitMCTargetOptionsFromFlags() {
   Options.MCRelaxAll = RelaxAll;
   Options.MCUseDwarfDirectory = EnableDwarfDirectory;
   Options.MCNoExecStack = NoExecStack;
-  Options.MCSaveTempLabels = SaveTempLabels;
   Options.ShowMCEncoding = ShowMCEncoding;
   Options.ShowMCInst = ShowMCInst;
   Options.AsmVerbose = AsmVerbose;
diff --git a/test/MC/MachO/temp-labels.s b/test/MC/MachO/temp-labels.s
index b7382b7d2c8..ac0f6203aef 100644
--- a/test/MC/MachO/temp-labels.s
+++ b/test/MC/MachO/temp-labels.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -L -o - | macho-dump --dump-section-data | FileCheck %s
+// RUN: llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -save-temp-labels -o - | macho-dump --dump-section-data | FileCheck %s
 
 // CHECK:   # Load Command 1
 // CHECK:  (('command', 2)
diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp
index e87f1eef282..02dcfcd2dd0 100644
--- a/tools/llvm-mc/llvm-mc.cpp
+++ b/tools/llvm-mc/llvm-mc.cpp
@@ -156,6 +156,9 @@ static cl::opt<std::string>
 MainFileName("main-file-name",
              cl::desc("Specifies the name we should consider the input file"));
 
+static cl::opt<bool> SaveTempLabels("save-temp-labels",
+                                    cl::desc("Don't discard temporary labels"));
+
 enum ActionType {
   AC_AsLex,
   AC_Assemble,