From ca169789676a755bd494ec23972f51b4c5a5a914 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Wed, 2 May 2018 21:15:13 +0000
Subject: [PATCH] [llvm-cvtres] Allow parameters preceded by '-' in addition to
 '/'

The real cvtres.exe also allows parameters in either form.

Differential Revision: https://reviews.llvm.org/D46358

llvm-svn: 331402
---
 llvm/test/tools/llvm-cvtres/symbols.test |  4 ++++
 llvm/tools/llvm-cvtres/Opts.td           | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/llvm/test/tools/llvm-cvtres/symbols.test b/llvm/test/tools/llvm-cvtres/symbols.test
index 14f5c36..5af5177 100644
--- a/llvm/test/tools/llvm-cvtres/symbols.test
+++ b/llvm/test/tools/llvm-cvtres/symbols.test
@@ -10,6 +10,10 @@
 RUN: llvm-cvtres /verbose /out:%t %p/Inputs/test_resource.res
 RUN: llvm-readobj -symbols %t | FileCheck %s
 
+// Test that parameters can be preceded by '-' in addition to '/':
+RUN: llvm-cvtres -verbose -machine:X86 -out:%t %p/Inputs/test_resource.res
+RUN: llvm-readobj -symbols %t | FileCheck %s
+
 CHECK:        Name: $R000000
 CHECK-NEXT:    Value: 0
 CHECK-NEXT:    Section: .rsrc$02
diff --git a/llvm/tools/llvm-cvtres/Opts.td b/llvm/tools/llvm-cvtres/Opts.td
index 034ac54..cb3bd40 100644
--- a/llvm/tools/llvm-cvtres/Opts.td
+++ b/llvm/tools/llvm-cvtres/Opts.td
@@ -1,11 +1,13 @@
 include "llvm/Option/OptParser.td"
 
-def DEFINE : Joined<["/"], "DEFINE:">, HelpText<"">, MetaVarName<"symbol">;
-def FOLDDUPS : Flag<["/"], "FOLDDUPS:">, HelpText<"">;
-def MACHINE : Joined<["/"], "MACHINE:">, HelpText<"">, MetaVarName<"{ARM|ARM64|EBC|IA64|X64|X86}">;
-def NOLOGO : Flag<["/"], "NOLOGO">, HelpText<"">;
-def OUT : Joined<["/"], "OUT:">, HelpText<"">, MetaVarName<"filename">;
-def READONLY : Flag<["/"], "READONLY">, HelpText<"">;
-def VERBOSE : Flag<["/"], "VERBOSE">, HelpText<"">;
-def HELP : Flag<["/"], "HELP">;
-def H : Flag<["/"], "H">, Alias<HELP>;
+// All the switches can be preceded by either '/' or '-'.
+
+def DEFINE : Joined<["/", "-"], "DEFINE:">, HelpText<"">, MetaVarName<"symbol">;
+def FOLDDUPS : Flag<["/", "-"], "FOLDDUPS:">, HelpText<"">;
+def MACHINE : Joined<["/", "-"], "MACHINE:">, HelpText<"">, MetaVarName<"{ARM|ARM64|EBC|IA64|X64|X86}">;
+def NOLOGO : Flag<["/", "-"], "NOLOGO">, HelpText<"">;
+def OUT : Joined<["/", "-"], "OUT:">, HelpText<"">, MetaVarName<"filename">;
+def READONLY : Flag<["/", "-"], "READONLY">, HelpText<"">;
+def VERBOSE : Flag<["/", "-"], "VERBOSE">, HelpText<"">;
+def HELP : Flag<["/", "-"], "HELP">;
+def H : Flag<["/", "-"], "H">, Alias<HELP>;
-- 
2.7.4