diff options
| author | Rui Ueyama <ruiu@google.com> | 2017-09-11 20:54:51 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2017-09-11 20:54:51 +0000 |
| commit | c3e4602645aa183765935c02a6f085d0a692e49d (patch) | |
| tree | f1f6a4a438f02bb06c3f86421d9fd205f1220bf5 | |
| parent | 5490afa6d8684adf49ef8e8889eefd17c9209071 (diff) | |
| download | bcm5719-llvm-c3e4602645aa183765935c02a6f085d0a692e49d.tar.gz bcm5719-llvm-c3e4602645aa183765935c02a6f085d0a692e49d.zip | |
Sort options.
This patch also rename OPT_outlib OPT_out_implib for consistency.
llvm-svn: 312949
| -rw-r--r-- | lld/MinGW/Driver.cpp | 2 | ||||
| -rw-r--r-- | lld/MinGW/Options.td | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp index 6506a07a0db..404452bdd02 100644 --- a/lld/MinGW/Driver.cpp +++ b/lld/MinGW/Driver.cpp @@ -131,7 +131,7 @@ bool link(ArrayRef<const char *> ArgsArr, raw_ostream &Diag) { 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())); diff --git a/lld/MinGW/Options.td b/lld/MinGW/Options.td index 438a4c95179..f6f8079891c 100644 --- a/lld/MinGW/Options.td +++ b/lld/MinGW/Options.td @@ -8,15 +8,15 @@ def L: JoinedOrSeparate<["-"], "L">, MetaVarName<"<dir>">, 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">; |
