<p dir="ltr">Sorry I missed this I'll take a look at it now.</p>
<div class="gmail_quote">On Apr 24, 2015 7:40 AM, "Aaron Ballman" <<a href="mailto:aaron@aaronballman.com">aaron@aaronballman.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This commit is still causing failures on Windows. Can you please fix or revert?<br>
<br>
Thanks!<br>
<br>
~Aaron<br>
<br>
On Thu, Apr 23, 2015 at 11:11 AM, Aaron Ballman <<a href="mailto:aaron@aaronballman.com">aaron@aaronballman.com</a>> wrote:<br>
> On Mon, Apr 20, 2015 at 6:52 PM, Davide Italiano <<a href="mailto:davide@freebsd.org">davide@freebsd.org</a>> wrote:<br>
>> Author: davide<br>
>> Date: Mon Apr 20 17:52:56 2015<br>
>> New Revision: 235357<br>
>><br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=235357&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=235357&view=rev</a><br>
>> Log:<br>
>> [GNU/ELF] Add support for -X/--discard-locals.<br>
>><br>
>> There's (almost) never need to keep .L symbols around for production<br>
>> builds. In fact, the FreeBSD kernel explicitly specify -X beacuse the<br>
>> size impact (and the subsequent performance impact) might be significant,<br>
>> because we keep symbols in memory.<br>
>> I was tempted to make this the default, but I haven't (yet).<br>
>><br>
>> PR: 23232<br>
>><br>
>> Added:<br>
>> lld/trunk/test/elf/discard-locals.test<br>
>> Modified:<br>
>> lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h<br>
>> lld/trunk/lib/Driver/GnuLdDriver.cpp<br>
>> lld/trunk/lib/Driver/GnuLdOptions.td<br>
>> lld/trunk/lib/ReaderWriter/ELF/SectionChunks.cpp<br>
>><br>
>> Modified: lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=235357&r1=235356&r2=235357&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=235357&r1=235356&r2=235357&view=diff</a><br>
>> ==============================================================================<br>
>> --- lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h (original)<br>
>> +++ lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h Mon Apr 20 17:52:56 2015<br>
>> @@ -314,6 +314,10 @@ public:<br>
>> bool discardLocals() const { return _discardLocals; }<br>
>> void setDiscardLocals(bool d) { _discardLocals = d; }<br>
>><br>
>> + /// \brief Discard temprorary local symbols.<br>
>> + bool discardTempLocals() const { return _discardTempLocals; }<br>
>> + void setDiscardTempLocals(bool d) { _discardTempLocals = d; }<br>
>> +<br>
>> /// \brief Strip symbols.<br>
>> bool stripSymbols() const { return _stripSymbols; }<br>
>> void setStripSymbols(bool strip) { _stripSymbols = strip; }<br>
>> @@ -370,6 +374,7 @@ protected:<br>
>> bool _noAllowDynamicLibraries = false;<br>
>> bool _mergeRODataToTextSegment = true;<br>
>> bool _demangle = true;<br>
>> + bool _discardTempLocals = false;<br>
>> bool _discardLocals = false;<br>
>> bool _stripSymbols = false;<br>
>> bool _alignSegments = true;<br>
>><br>
>> Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=235357&r1=235356&r2=235357&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=235357&r1=235356&r2=235357&view=diff</a><br>
>> ==============================================================================<br>
>> --- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)<br>
>> +++ lld/trunk/lib/Driver/GnuLdDriver.cpp Mon Apr 20 17:52:56 2015<br>
>> @@ -478,6 +478,9 @@ bool GnuLdDriver::parse(int argc, const<br>
>> if (parsedArgs->hasArg(OPT_discard_loc))<br>
>> ctx->setDiscardLocals(true);<br>
>><br>
>> + if (parsedArgs->hasArg(OPT_discard_temp_loc))<br>
>> + ctx->setDiscardTempLocals(true);<br>
>> +<br>
>> if (parsedArgs->hasArg(OPT_strip_all))<br>
>> ctx->setStripSymbols(true);<br>
>><br>
>><br>
>> Modified: lld/trunk/lib/Driver/GnuLdOptions.td<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdOptions.td?rev=235357&r1=235356&r2=235357&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdOptions.td?rev=235357&r1=235356&r2=235357&view=diff</a><br>
>> ==============================================================================<br>
>> --- lld/trunk/lib/Driver/GnuLdOptions.td (original)<br>
>> +++ lld/trunk/lib/Driver/GnuLdOptions.td Mon Apr 20 17:52:56 2015<br>
>> @@ -260,6 +260,11 @@ def discard_loc : Flag<["--"], "discard-<br>
>> Group<grp_symbolopts>;<br>
>> def alias_discard_loc: Flag<["-"], "x">,<br>
>> Alias<discard_loc>;<br>
>> +def discard_temp_loc : Flag<["--"], "discard-locals">,<br>
>> + HelpText<"Discard temporary local symbols">,<br>
>> + Group<grp_symbolopts>;<br>
>> +def alias_discard_temp_loc : Flag<["-"], "X">,<br>
>> + Alias<discard_temp_loc>;<br>
>> def no_demangle : Flag<["--"], "no-demangle">,<br>
>> HelpText<"Dont demangle C++ symbols">,<br>
>> Group<grp_symbolopts>;<br>
>><br>
>> Modified: lld/trunk/lib/ReaderWriter/ELF/SectionChunks.cpp<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SectionChunks.cpp?rev=235357&r1=235356&r2=235357&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SectionChunks.cpp?rev=235357&r1=235356&r2=235357&view=diff</a><br>
>> ==============================================================================<br>
>> --- lld/trunk/lib/ReaderWriter/ELF/SectionChunks.cpp (original)<br>
>> +++ lld/trunk/lib/ReaderWriter/ELF/SectionChunks.cpp Mon Apr 20 17:52:56 2015<br>
>> @@ -489,6 +489,11 @@ void SymbolTable<ELFT>::addSymbol(const<br>
>> if (this->_ctx.discardLocals() && symbol.getBinding() == llvm::ELF::STB_LOCAL)<br>
>> return;<br>
>><br>
>> + // Temporary locals are all the symbols which name starts with .L.<br>
>> + // This is defined by the ELF standard.<br>
>> + if (this->_ctx.discardTempLocals() && atom->name().startswith(".L"))<br>
>> + return;<br>
>> +<br>
>> _symbolTable.push_back(SymbolEntry(atom, symbol, atomLayout));<br>
>> this->_fsize += sizeof(Elf_Sym);<br>
>> if (this->_flags & SHF_ALLOC)<br>
>><br>
>> Added: lld/trunk/test/elf/discard-locals.test<br>
>> URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/discard-locals.test?rev=235357&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/discard-locals.test?rev=235357&view=auto</a><br>
>> ==============================================================================<br>
>> --- lld/trunk/test/elf/discard-locals.test (added)<br>
>> +++ lld/trunk/test/elf/discard-locals.test Mon Apr 20 17:52:56 2015<br>
>> @@ -0,0 +1,66 @@<br>
>> +# Test that -X/--discard-locals works.<br>
>> +#<br>
>> +#RUN: yaml2obj -format=elf %s -o=%t.o<br>
>> +#RUN: lld -flavor gnu %t.o -shared -X -o %t1<br>
>> +#RUN: llvm-objdump -t %t1 | FileCheck %s<br>
>> +<br>
>> +#CHECK-NOT: 0000000000400121 l .rodata 00000000 .Lsym8<br>
>> +<br>
>> +---<br>
>> +FileHeader:<br>
>> + Class: ELFCLASS64<br>
>> + Data: ELFDATA2LSB<br>
>> + OSABI: ELFOSABI_FREEBSD<br>
>> + Type: ET_REL<br>
>> + Machine: EM_X86_64<br>
>> +Sections:<br>
>> + - Name: .text<br>
>> + Type: SHT_PROGBITS<br>
>> + Flags: [ SHF_ALLOC, SHF_EXECINSTR ]<br>
>> + AddressAlign: 0x0000000000000004<br>
>> + Content: 00000000F20F100D00000000C3<br>
>> + - Name: .data<br>
>> + Type: SHT_PROGBITS<br>
>> + Flags: [ SHF_WRITE, SHF_ALLOC ]<br>
>> + AddressAlign: 0x0000000000000004<br>
>> + Content: ''<br>
>> + - Name: .bss<br>
>> + Type: SHT_NOBITS<br>
>> + Flags: [ SHF_WRITE, SHF_ALLOC ]<br>
>> + AddressAlign: 0x0000000000000004<br>
>> + Content: ''<br>
>> + - Name: .rodata.str1.1<br>
>> + Type: SHT_PROGBITS<br>
>> + Flags: [ SHF_ALLOC, SHF_MERGE, SHF_STRINGS ]<br>
>> + AddressAlign: 0x0000000000000001<br>
>> + Content: ''<br>
>> + - Name: .rela.text<br>
>> + Type: SHT_RELA<br>
>> + Link: .symtab<br>
>> + AddressAlign: 0x0000000000000008<br>
>> + Info: .text<br>
>> + Relocations:<br>
>> + - Offset: 0x0000000000000008<br>
>> + Symbol: .Lsym8<br>
>> + Type: R_X86_64_PC32<br>
>> + Addend: -4<br>
>> +Symbols:<br>
>> + Local:<br>
>> + - Name: .Lsym8<br>
>> + Section: .rodata.str1.1<br>
>> + - Name: test<br>
>> + Section: .text<br>
>> + Value: 0x000000000000000C<br>
>> + - Name: .text<br>
>> + Type: STT_SECTION<br>
>> + Section: .text<br>
>> + - Name: .data<br>
>> + Type: STT_SECTION<br>
>> + Section: .data<br>
>> + - Name: .bss<br>
>> + Type: STT_SECTION<br>
>> + Section: .bss<br>
>> + - Name: .rodata.str1.1<br>
>> + Type: STT_SECTION<br>
>> + Section: .rodata.str1.1<br>
>> +...<br>
><br>
> This test is failing for me on Windows, with:<br>
><br>
>>lit E:\llvm\llvm\tools\lld\test\elf\discard-locals.test<br>
> -- Testing: 1 tests, 1 threads --<br>
> FAIL: lld :: elf/discard-locals.test (1 of 1)<br>
> ******************** TEST 'lld :: elf/discard-locals.test' FAILED<br>
> ********************<br>
> Script:<br>
> --<br>
> yaml2obj -format=elf<br>
> E:\llvm\llvm\tools\lld\test\elf\discard-locals.test<br>
> -o=E:\llvm\2013\tools\lld\test\elf\Output\discard-locals.test.tmp.o<br>
> lld -flavor gnu<br>
> E:\llvm\2013\tools\lld\test\elf\Output\discard-locals.test.tmp.o<br>
> -shared -X -o E:\llvm\2013\tools\lld\test\elf\Output\discard-locals.test.tmp1<br>
> llvm-objdump -t<br>
> E:\llvm\2013\tools\lld\test\elf\Output\discard-locals.test.tmp1 |<br>
> FileCheck E:\llvm\llvm\tools\lld\test\elf\discard-locals.test<br>
> --<br>
> Exit Code: 1<br>
><br>
> Command Output (stdout):<br>
> --<br>
> Command 0: "yaml2obj" "-format=elf"<br>
> "E:\llvm\llvm\tools\lld\test\elf\discard-locals.test"<br>
> "-o=E:\llvm\2013\tools\lld\test\elf\Output\discard-locals.test.tmp.o"<br>
> Command 0 Result: 0<br>
> Command 0 Output:<br>
><br>
><br>
> Command 0 Stderr:<br>
><br>
><br>
> Command 1: "lld" "-flavor" "gnu"<br>
> "E:\llvm\2013\tools\lld\test\elf\Output\discard-locals.test.tmp.o"<br>
> "-shared" "-X" "-o"<br>
> "E:\llvm\2013\tools\lld\test\elf\Output\discard-locals.test.tmp1"<br>
> Command 1 Result: 1<br>
> Command 1 Output:<br>
><br>
><br>
> Command 1 Stderr:<br>
> Cannot open E:\llvm\2013\tools\lld\test\elf\Output\discard-locals.test.tmp.o:<br>
> incompatible machine type<br>
><br>
><br>
><br>
><br>
> --<br>
><br>
> ********************<br>
> Testing Time: 0.04s<br>
> ********************<br>
> Failing Tests (1):<br>
> lld :: elf/discard-locals.test<br>
><br>
> Unexpected Failures: 1<br>
><br>
> ~Aaron<br>
><br>
>><br>
>><br>
>> _______________________________________________<br>
>> llvm-commits mailing list<br>
>> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
>> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>