[lld] r310656 - Merging r310526:

[Hans Wennborg via llvm-commits]

Author: hans
Date: Thu Aug 10 13:04:41 2017
New Revision: 310656

URL: http://llvm.org/viewvc/llvm-project?rev=310656&view=rev
Log:
Merging r310526:
------------------------------------------------------------------------
r310526 | ruiu | 2017-08-09 14:32:38 -0700 (Wed, 09 Aug 2017) | 3 lines

Add --icf=none option.

--icf=none negates --icf=all.
------------------------------------------------------------------------

Added:
    lld/branches/release_50/test/ELF/icf-none.s
      - copied unchanged from r310526, lld/trunk/test/ELF/icf-none.s
Modified:
    lld/branches/release_50/   (props changed)
    lld/branches/release_50/ELF/Driver.cpp
    lld/branches/release_50/ELF/Options.td

Propchange: lld/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 10 13:04:41 2017
@@ -1 +1 @@
-/lld/trunk:308492,308728,308935,308998,309002
+/lld/trunk:308492,308728,308935,308998,309002,310526

Modified: lld/branches/release_50/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_50/ELF/Driver.cpp?rev=310656&r1=310655&r2=310656&view=diff
==============================================================================
--- lld/branches/release_50/ELF/Driver.cpp (original)
+++ lld/branches/release_50/ELF/Driver.cpp Thu Aug 10 13:04:41 2017
@@ -638,7 +638,7 @@ void LinkerDriver::readConfigs(opt::Inpu
   Config->Fini = Args.getLastArgValue(OPT_fini, "_fini");
   Config->GcSections = getArg(Args, OPT_gc_sections, OPT_no_gc_sections, false);
   Config->GdbIndex = Args.hasArg(OPT_gdb_index);
-  Config->ICF = Args.hasArg(OPT_icf);
+  Config->ICF = getArg(Args, OPT_icf_all, OPT_icf_none, false);
   Config->Init = Args.getLastArgValue(OPT_init, "_init");
   Config->LTOAAPipeline = Args.getLastArgValue(OPT_lto_aa_pipeline);
   Config->LTONewPmPasses = Args.getLastArgValue(OPT_lto_newpm_passes);

Modified: lld/branches/release_50/ELF/Options.td
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_50/ELF/Options.td?rev=310656&r1=310655&r2=310656&view=diff
==============================================================================
--- lld/branches/release_50/ELF/Options.td (original)
+++ lld/branches/release_50/ELF/Options.td Thu Aug 10 13:04:41 2017
@@ -126,7 +126,9 @@ def hash_style: S<"hash-style">,
 
 def help: F<"help">, HelpText<"Print option help">;
 
-def icf: F<"icf=all">, HelpText<"Enable identical code folding">;
+def icf_all: F<"icf=all">, HelpText<"Enable identical code folding">;
+
+def icf_none: F<"icf=none">, HelpText<"Disable identical code folding">;
 
 def image_base : J<"image-base=">, HelpText<"Set the base address">;