[llvm-cvtres] Allow parameters preceded by '-' in addition to '/'

[mstorsjo]

Summary

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

[amccarth]

I'm mildly concerned about the tests that give filenames with forward slashes. That doesn't work with a lot of Windows command lines, but apparently the tests here were already doing that.

[mstorsjo]

In D46358#1085711, @amccarth wrote:

I'm mildly concerned about the tests that give filenames with forward slashes. That doesn't work with a lot of Windows command lines, but apparently the tests here were already doing that.

Yup - especially for the case when invoked from msys, parameters with slashes can occasionally be made into absolute paths (although the cvtres ones don't have that problem), which is why I prefer to consistently use dashes if possible.

llvm/trunk/test/tools/llvm-cvtres/symbols.test

 // Check COFF emission of cvtres
 // The input was generated with the following command, using the original Windows
 // rc.exe:
 // > rc /fo test_resource.res /nologo test_resource.rc
 // The object file we are comparing against was generated with this command using
 // the original Windows cvtres.exe.
 // > cvtres /machine:X86 /readonly /nologo /out:test_resource.obj.coff \
 //   test_resource.res
 
 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
 CHECK:        Name: $R000001
 CHECK-NEXT:    Value: 24
 CHECK-NEXT:    Section: .rsrc$02
 CHECK:        Name: $R000002
 CHECK-NEXT:    Value: 832

llvm/trunk/tools/llvm-cvtres/Opts.td

 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>;