[llvm-branch-commits] [lld] r332084 - Merging r327562:

[Martin Storsjo via llvm-branch-commits]

Author: mstorsjo
Date: Thu May 10 23:58:06 2018
New Revision: 332084

URL: http://llvm.org/viewvc/llvm-project?rev=332084&view=rev
Log:
Merging r327562:
------------------------------------------------------------------------
r327562 | mstorsjo | 2018-03-14 22:17:24 +0200 (Wed, 14 Mar 2018) | 1 line

[MinGW] Add support for the GNU ld flag --kill-at
------------------------------------------------------------------------

Modified:
    lld/branches/release_60/   (props changed)
    lld/branches/release_60/MinGW/Driver.cpp
    lld/branches/release_60/MinGW/Options.td
    lld/branches/release_60/test/MinGW/driver.test

Propchange: lld/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 10 23:58:06 2018
@@ -1 +1 @@
-/lld/trunk:321983,321986,322041,322259,322264,322359,322421,322801,323155,323221,323243,323288,323395-323396,323399,323440,323449,323456,323625,323893,323895,324467-324468,325204,325679,325714
+/lld/trunk:321983,321986,322041,322259,322264,322359,322421,322801,323155,323221,323243,323288,323395-323396,323399,323440,323449,323456,323625,323893,323895,324467-324468,325204,325679,325714,327562

Modified: lld/branches/release_60/MinGW/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/MinGW/Driver.cpp?rev=332084&r1=332083&r2=332084&view=diff
==============================================================================
--- lld/branches/release_60/MinGW/Driver.cpp (original)
+++ lld/branches/release_60/MinGW/Driver.cpp Thu May 10 23:58:06 2018
@@ -154,6 +154,8 @@ bool mingw::link(ArrayRef<const char *>
     Add("-debug:dwarf");
   if (Args.hasArg(OPT_large_address_aware))
     Add("-largeaddressaware");
+  if (Args.hasArg(OPT_kill_at))
+    Add("-kill-at");
 
   if (Args.getLastArgValue(OPT_m) != "thumb2pe" &&
       Args.getLastArgValue(OPT_m) != "arm64pe" && !Args.hasArg(OPT_dynamicbase))

Modified: lld/branches/release_60/MinGW/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/MinGW/Options.td?rev=332084&r1=332083&r2=332084&view=diff
==============================================================================
--- lld/branches/release_60/MinGW/Options.td (original)
+++ lld/branches/release_60/MinGW/Options.td Thu May 10 23:58:06 2018
@@ -14,6 +14,7 @@ def export_all_symbols: F<"export-all-sy
 def gc_sections: F<"gc-sections">, HelpText<"Remove unused sections">;
 def icf: J<"icf=">, HelpText<"Identical code folding">;
 def image_base: S<"image-base">, HelpText<"Base address of the program">;
+def kill_at: F<"kill-at">, HelpText<"Remove @n from exported symbols">;
 def l: JoinedOrSeparate<["-"], "l">, MetaVarName<"<libName>">,
   HelpText<"Root name of library to use">;
 def m: JoinedOrSeparate<["-"], "m">, HelpText<"Set target emulation">;

Modified: lld/branches/release_60/test/MinGW/driver.test
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_60/test/MinGW/driver.test?rev=332084&r1=332083&r2=332084&view=diff
==============================================================================
--- lld/branches/release_60/test/MinGW/driver.test (original)
+++ lld/branches/release_60/test/MinGW/driver.test Thu May 10 23:58:06 2018
@@ -124,3 +124,7 @@ ICF-NONE: -opt:noicf
 RUN: ld.lld -### -m i386pep foo.o --icf=all | FileCheck -check-prefix ICF %s
 RUN: ld.lld -### -m i386pep foo.o -icf=all | FileCheck -check-prefix ICF %s
 ICF: -opt:icf
+
+RUN: ld.lld -### foo.o -m i386pe -shared --kill-at | FileCheck -check-prefix=KILL-AT %s
+RUN: ld.lld -### foo.o -m i386pe -shared -kill-at | FileCheck -check-prefix=KILL-AT %s
+KILL-AT: -kill-at