[lld] r312949 - Sort options.

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Mon Sep 11 13:54:51 2017
New Revision: 312949

URL: http://llvm.org/viewvc/llvm-project?rev=312949&view=rev
Log:
Sort options.

This patch also rename OPT_outlib OPT_out_implib for consistency.

Modified:
    lld/trunk/MinGW/Driver.cpp
    lld/trunk/MinGW/Options.td

Modified: lld/trunk/MinGW/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/MinGW/Driver.cpp?rev=312949&r1=312948&r2=312949&view=diff
==============================================================================
--- lld/trunk/MinGW/Driver.cpp (original)
+++ lld/trunk/MinGW/Driver.cpp Mon Sep 11 13:54:51 2017
@@ -131,7 +131,7 @@ bool link(ArrayRef<const char *> ArgsArr
     Add("-entry:" + StringRef(A->getValue()));
   if (auto *A = Args.getLastArg(OPT_subs))
     Add("-subsystem:" + StringRef(A->getValue()));
-  if (auto *A = Args.getLastArg(OPT_outlib))
+  if (auto *A = Args.getLastArg(OPT_out_implib))
     Add("-implib:" + StringRef(A->getValue()));
   if (auto *A = Args.getLastArg(OPT_stack))
     Add("-stack:" + StringRef(A->getValue()));

Modified: lld/trunk/MinGW/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/MinGW/Options.td?rev=312949&r1=312948&r2=312949&view=diff
==============================================================================
--- lld/trunk/MinGW/Options.td (original)
+++ lld/trunk/MinGW/Options.td Mon Sep 11 13:54:51 2017
@@ -8,15 +8,15 @@ def L: JoinedOrSeparate<["-"], "L">, Met
   HelpText<"Add a directory to the library search path">;
 def entry: S<"entry">, MetaVarName<"<entry>">,
   HelpText<"Name of entry point symbol">;
+def l: JoinedOrSeparate<["-"], "l">, MetaVarName<"<libName>">,
+  HelpText<"Root name of library to use">;
 def m: JoinedOrSeparate<["-"], "m">, HelpText<"Set target emulation">;
 def o: JoinedOrSeparate<["-"], "o">, MetaVarName<"<path>">,
   HelpText<"Path to file to write output">;
-def l: JoinedOrSeparate<["-"], "l">, MetaVarName<"<libName>">,
-  HelpText<"Root name of library to use">;
+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 outlib: Separate<["--"], "out-implib">, HelpText<"Import library name">;
 def verbose: F<"verbose">, HelpText<"Verbose mode">;
 
 // LLD specific options
@@ -26,11 +26,11 @@ def _HASH_HASH_HASH : Flag<["-"], "###">
 // Currently stubs to avoid errors
 def Bdynamic: F<"Bdynamic">, HelpText<"Link against shared libraries">;
 def Bstatic: F<"Bstatic">, HelpText<"Do not link against shared libraries">;
-def major_image_version: Separate<["--"], "major-image-version">;
-def minor_image_version: Separate<["--"], "minor-image-version">;
+def O: Joined<["-"], "O">, HelpText<"Optimize output file size">;
 def enable_auto_image_base: Flag<["--"], "enable-auto-image-base">;
 def full_shutdown: Flag<["--"], "full-shutdown">;
-def O: Joined<["-"], "O">, HelpText<"Optimize output file size">;
+def major_image_version: Separate<["--"], "major-image-version">;
+def minor_image_version: Separate<["--"], "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">;