[lld] r352493 - Merging r352459:

[Hans Wennborg via llvm-commits]

Author: hans
Date: Tue Jan 29 05:46:59 2019
New Revision: 352493

URL: http://llvm.org/viewvc/llvm-project?rev=352493&view=rev
Log:
Merging r352459:
------------------------------------------------------------------------
r352459 | mstorsjo | 2019-01-29 09:38:48 +0100 (Tue, 29 Jan 2019) | 7 lines

[MinGW] Ignore the --plugin and --plugin-opt option

GCC can use LLD with -fuse-ld=lld for MinGW these days, but by
default these options are passed to the linker (unless -fno-lto
is passed to the GCC driver).

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

Modified:
    lld/branches/release_80/   (props changed)
    lld/branches/release_80/MinGW/Options.td

Propchange: lld/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 29 05:46:59 2019
@@ -1 +1 @@
-/lld/trunk:351326,351335,351898-351899,352068,352082,352257,352302,352413
+/lld/trunk:351326,351335,351898-351899,352068,352082,352257,352302,352413,352459

Modified: lld/branches/release_80/MinGW/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_80/MinGW/Options.td?rev=352493&r1=352492&r2=352493&view=diff
==============================================================================
--- lld/branches/release_80/MinGW/Options.td (original)
+++ lld/branches/release_80/MinGW/Options.td Tue Jan 29 05:46:59 2019
@@ -78,3 +78,9 @@ def version: F<"version">, HelpText<"Dis
 def alias_entry_e: JoinedOrSeparate<["-"], "e">, Alias<entry>;
 def alias_strip_s: Flag<["-"], "s">, Alias<strip_all>;
 def alias_strip_S: Flag<["-"], "S">, Alias<strip_debug>;
+
+// Ignored options
+def: S<"plugin">;
+def: J<"plugin=">;
+def: S<"plugin-opt">;
+def: J<"plugin-opt=">;