[llvm-branch-commits] [lld] r332044 - Merging r326172:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu May 10 14:30:36 2018
New Revision: 332044

URL: http://llvm.org/viewvc/llvm-project?rev=332044&view=rev
Log:
Merging r326172:

------------------------------------------------------------------------
r326172 | mstorsjo | 2018-02-26 22:26:35 -0800 (Mon, 26 Feb 2018) | 7 lines

[MinGW] Ignore the --start-group --end-group parameters

These are required for handling circular dependencies between
static libraries, which is something that lld-link always does without
any extra parameters.

Differential Revision: https://reviews.llvm.org/D43786
------------------------------------------------------------------------

Modified:
    lld/branches/release_60/MinGW/Options.td

Modified: lld/branches/release_60/MinGW/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/MinGW/Options.td?rev=332044&r1=332043&r2=332044&view=diff
==============================================================================
--- lld/branches/release_60/MinGW/Options.td (original)
+++ lld/branches/release_60/MinGW/Options.td Thu May 10 14:30:36 2018
@@ -51,6 +51,7 @@ def build_id: F<"build-id">;
 def disable_auto_image_base: F<"disable-auto-image-base">;
 def enable_auto_image_base: F<"enable-auto-image-base">;
 def enable_auto_import: F<"enable-auto-import">;
+def end_group: J<"end-group">;
 def full_shutdown: Flag<["--"], "full-shutdown">;
 def high_entropy_va: F<"high-entropy-va">, HelpText<"Enable 64-bit ASLR">;
 def major_image_version: S<"major-image-version">;
@@ -59,6 +60,7 @@ def no_seh: F<"no-seh">;
 def nxcompat: F<"nxcompat">, HelpText<"Enable data execution prevention">;
 def pic_executable: F<"pic-executable">;
 def sysroot: J<"sysroot">, HelpText<"Sysroot">;
+def start_group: J<"start-group">;
 def tsaware: F<"tsaware">, HelpText<"Create Terminal Server aware executable">;
 def v: Flag<["-"], "v">, HelpText<"Display the version number">;
 def version: F<"version">, HelpText<"Display the version number and exit">;