aboutsummaryrefslogtreecommitdiff
path: root/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
diff options
context:
space:
mode:
authorAlexander Shaposhnikov <alexshap@fb.com>2019-11-06 17:04:04 -0800
committerAlexander Shaposhnikov <alexshap@fb.com>2019-11-06 17:04:04 -0800
commit7d83c2989092fbfc4afb41bed43848dbc69e35d6 (patch)
tree16b0924fd765854a9a039c9df24b904e809ee26f /llvm/tools/llvm-objcopy/llvm-objcopy.cpp
parente16a71382d689c39561e94b13af2feb4bf1b15cc (diff)
downloadllvm-7d83c2989092fbfc4afb41bed43848dbc69e35d6.zip
llvm-7d83c2989092fbfc4afb41bed43848dbc69e35d6.tar.gz
llvm-7d83c2989092fbfc4afb41bed43848dbc69e35d6.tar.bz2
Revert "Introduce llvm-install-name-tool"
This reverts commit b5913e6d2f6d13fb753df701619731ca11936316.
Diffstat (limited to 'llvm/tools/llvm-objcopy/llvm-objcopy.cpp')
-rw-r--r--llvm/tools/llvm-objcopy/llvm-objcopy.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
index e662f35..a68210f 100644
--- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
+++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
@@ -313,20 +313,11 @@ static Error executeObjcopy(CopyConfig &Config) {
return Error::success();
}
-namespace {
-
-enum class ToolType { Objcopy, Strip, InstallNameTool };
-
-} // anonymous namespace
-
int main(int argc, char **argv) {
InitLLVM X(argc, argv);
ToolName = argv[0];
- ToolType Tool = StringSwitch<ToolType>(sys::path::stem(ToolName))
- .EndsWith("strip", ToolType::Strip)
- .EndsWith("install-name-tool", ToolType::InstallNameTool)
- .EndsWith("install_name_tool", ToolType::InstallNameTool)
- .Default(ToolType::Objcopy);
+ bool IsStrip = sys::path::stem(ToolName).contains("strip");
+
// Expand response files.
// TODO: Move these lines, which are copied from lib/Support/CommandLine.cpp,
// into a separate function in the CommandLine library and call that function
@@ -341,11 +332,10 @@ int main(int argc, char **argv) {
NewArgv);
auto Args = makeArrayRef(NewArgv).drop_front();
+
Expected<DriverConfig> DriverConfig =
- (Tool == ToolType::Strip) ? parseStripOptions(Args, reportWarning)
- : ((Tool == ToolType::InstallNameTool)
- ? parseInstallNameToolOptions(Args)
- : parseObjcopyOptions(Args, reportWarning));
+ IsStrip ? parseStripOptions(Args, reportWarning)
+ : parseObjcopyOptions(Args, reportWarning);
if (!DriverConfig) {
logAllUnhandledErrors(DriverConfig.takeError(),
WithColor::error(errs(), ToolName));