Index: lld/MinGW/Options.td
===================================================================
--- lld/MinGW/Options.td
+++ lld/MinGW/Options.td
@@ -18,8 +18,8 @@
   HelpText<"Path to file to write output">;
 def out_implib: Separate<["--"], "out-implib">, HelpText<"Import library name">;
 def shared: F<"shared">, HelpText<"Build a shared object">;
-def subs: Separate<["--"], "subsystem">, HelpText<"Specify subsystem">;
-def stack: Separate<["--"], "stack">;
+def subs: S<"subsystem">, HelpText<"Specify subsystem">;
+def stack: S<"stack">;
 def whole_archive: F<"whole-archive">,
     HelpText<"Include all object files for following archives">;
 def verbose: F<"verbose">, HelpText<"Verbose mode">;
@@ -32,10 +32,10 @@
 def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries">;
 def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">;
 def O: Joined<["-"], "O">, HelpText<"Optimize output file size">;
-def enable_auto_image_base: Flag<["--"], "enable-auto-image-base">;
+def enable_auto_image_base: F<"enable-auto-image-base">;
 def full_shutdown: Flag<["--"], "full-shutdown">;
-def major_image_version: Separate<["--"], "major-image-version">;
-def minor_image_version: Separate<["--"], "minor-image-version">;
+def major_image_version: S<"major-image-version">;
+def minor_image_version: S<"minor-image-version">;
 def sysroot: J<"sysroot">, HelpText<"Sysroot">;
 def v: Flag<["-"], "v">, HelpText<"Display the version number">;
 def version: F<"version">, HelpText<"Display the version number and exit">;