<div dir="ltr">You want to rename IgnoredWeak -> Ignored since the counterpart has been removed?</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 18, 2016 at 4:05 PM, Rafael Espindola via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Mon Jan 18 18:05:54 2016<br>
New Revision: 258104<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=258104&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=258104&view=rev</a><br>
Log:<br>
Delete addIgnoredStrong.<br>
<br>
It is not needed now that we resolve symbols is shared libraries<br>
correctly.<br>
<br>
Modified:<br>
lld/trunk/ELF/Driver.cpp<br>
lld/trunk/ELF/SymbolTable.cpp<br>
lld/trunk/ELF/SymbolTable.h<br>
lld/trunk/ELF/Symbols.cpp<br>
lld/trunk/ELF/Symbols.h<br>
lld/trunk/ELF/Writer.cpp<br>
<br>
Modified: lld/trunk/ELF/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=258104&r1=258103&r2=258104&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=258104&r1=258103&r2=258104&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Driver.cpp (original)<br>
+++ lld/trunk/ELF/Driver.cpp Mon Jan 18 18:05:54 2016<br>
@@ -308,7 +308,7 @@ template <class ELFT> void LinkerDriver:<br>
// On MIPS O32 ABI, _gp_disp is a magic symbol designates offset between<br>
// start of function and gp pointer into GOT. Use 'strong' variant of<br>
// the addIgnored to prevent '_gp_disp' substitution.<br>
- Config->MipsGpDisp = Symtab.addIgnoredStrong("_gp_disp");<br>
+ Config->MipsGpDisp = Symtab.addIgnored("_gp_disp");<br>
<br>
// Define _gp for MIPS. st_value of _gp symbol will be updated by Writer<br>
// so that it points to an absolute address which is relative to GOT.<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=258104&r1=258103&r2=258104&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=258104&r1=258103&r2=258104&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.cpp (original)<br>
+++ lld/trunk/ELF/SymbolTable.cpp Mon Jan 18 18:05:54 2016<br>
@@ -123,13 +123,6 @@ SymbolBody *SymbolTable<ELFT>::addIgnore<br>
return addAbsolute(Name, ElfSym<ELFT>::IgnoredWeak);<br>
}<br>
<br>
-// The 'strong' variant of the addIgnored. Adds symbol which has a global<br>
-// binding and cannot be substituted.<br>
-template <class ELFT><br>
-SymbolBody *SymbolTable<ELFT>::addIgnoredStrong(StringRef Name) {<br>
- return addAbsolute(Name, ElfSym<ELFT>::Ignored);<br>
-}<br>
-<br>
// Rename SYM as __wrap_SYM. The original symbol is preserved as __real_SYM.<br>
// Used to implement --wrap.<br>
template <class ELFT> void SymbolTable<ELFT>::wrap(StringRef Name) {<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.h?rev=258104&r1=258103&r2=258104&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.h?rev=258104&r1=258103&r2=258104&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SymbolTable.h (original)<br>
+++ lld/trunk/ELF/SymbolTable.h Mon Jan 18 18:05:54 2016<br>
@@ -55,7 +55,6 @@ public:<br>
SymbolBody *addSynthetic(StringRef Name, OutputSectionBase<ELFT> &Section,<br>
uintX_t Value);<br>
SymbolBody *addIgnored(StringRef Name);<br>
- SymbolBody *addIgnoredStrong(StringRef Name);<br>
<br>
void scanShlibUndefined();<br>
SymbolBody *find(StringRef Name);<br>
<br>
Modified: lld/trunk/ELF/Symbols.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.cpp?rev=258104&r1=258103&r2=258104&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.cpp?rev=258104&r1=258103&r2=258104&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Symbols.cpp (original)<br>
+++ lld/trunk/ELF/Symbols.cpp Mon Jan 18 18:05:54 2016<br>
@@ -124,8 +124,6 @@ template <class ELFT> static void doInit<br>
ElfSym<ELFT>::End.setBinding(STB_GLOBAL);<br>
ElfSym<ELFT>::IgnoredWeak.setBinding(STB_WEAK);<br>
ElfSym<ELFT>::IgnoredWeak.setVisibility(STV_HIDDEN);<br>
- ElfSym<ELFT>::Ignored.setBinding(STB_GLOBAL);<br>
- ElfSym<ELFT>::Ignored.setVisibility(STV_HIDDEN);<br>
}<br>
<br>
void elf2::initSymbols() {<br>
<br>
Modified: lld/trunk/ELF/Symbols.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=258104&r1=258103&r2=258104&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=258104&r1=258103&r2=258104&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Symbols.h (original)<br>
+++ lld/trunk/ELF/Symbols.h Mon Jan 18 18:05:54 2016<br>
@@ -306,10 +306,8 @@ template <class ELFT> struct ElfSym {<br>
<br>
// Used to represent an undefined symbol which we don't want<br>
// to add to the output file's symbol table. The `IgnoredWeak`<br>
- // has weak binding and can be substituted. The `Ignore` has<br>
- // global binding and gets priority over symbols from shared libs.<br>
+ // has weak binding and can be substituted.<br>
static Elf_Sym IgnoredWeak;<br>
- static Elf_Sym Ignored;<br>
<br>
// The content for _end and end symbols.<br>
static Elf_Sym End;<br>
@@ -324,7 +322,6 @@ template <class ELFT> struct ElfSym {<br>
};<br>
<br>
template <class ELFT> typename ElfSym<ELFT>::Elf_Sym ElfSym<ELFT>::IgnoredWeak;<br>
-template <class ELFT> typename ElfSym<ELFT>::Elf_Sym ElfSym<ELFT>::Ignored;<br>
template <class ELFT> typename ElfSym<ELFT>::Elf_Sym ElfSym<ELFT>::End;<br>
template <class ELFT> typename ElfSym<ELFT>::Elf_Sym ElfSym<ELFT>::MipsGp;<br>
template <class ELFT><br>
<br>
Modified: lld/trunk/ELF/Writer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=258104&r1=258103&r2=258104&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=258104&r1=258103&r2=258104&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Writer.cpp (original)<br>
+++ lld/trunk/ELF/Writer.cpp Mon Jan 18 18:05:54 2016<br>
@@ -613,8 +613,7 @@ template <class ELFT> static bool includ<br>
<br>
// Don't include synthetic symbols like __init_array_start in every output.<br>
if (auto *U = dyn_cast<DefinedRegular<ELFT>>(&B))<br>
- if (&U->Sym == &ElfSym<ELFT>::IgnoredWeak ||<br>
- &U->Sym == &ElfSym<ELFT>::Ignored)<br>
+ if (&U->Sym == &ElfSym<ELFT>::IgnoredWeak)<br>
return false;<br>
<br>
return true;<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>