<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Oct 19, 2015 at 5:20 PM, Davide Italiano 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: davide<br>
Date: Mon Oct 19 19:20:20 2015<br>
New Revision: 250771<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=250771&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=250771&view=rev</a><br>
Log:<br>
[ELF2] Introduce support for -z nodelete.<br>
<br>
<br>
Modified:<br>
lld/trunk/ELF/Config.h<br>
lld/trunk/ELF/Driver.cpp<br>
lld/trunk/ELF/OutputSections.cpp<br>
lld/trunk/test/elf2/dt_flags.s<br>
<br>
Modified: lld/trunk/ELF/Config.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=250771&r1=250770&r2=250771&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=250771&r1=250770&r2=250771&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Config.h (original)<br>
+++ lld/trunk/ELF/Config.h Mon Oct 19 19:20:20 2015<br>
@@ -57,6 +57,7 @@ struct Configuration {<br>
bool Shared;<br>
bool Static = false;<br>
bool Verbose;<br>
+ bool ZNodelete = false;<br>
bool ZNow = false;<br>
ELFKind EKind = ELFNoneKind;<br>
uint16_t EMachine = llvm::ELF::EM_NONE;<br>
<br>
Modified: lld/trunk/ELF/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=250771&r1=250770&r2=250771&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=250771&r1=250770&r2=250771&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Driver.cpp (original)<br>
+++ lld/trunk/ELF/Driver.cpp Mon Oct 19 19:20:20 2015<br>
@@ -158,9 +158,13 @@ void LinkerDriver::createFiles(opt::Inpu<br>
for (auto *Arg : Args.filtered(OPT_undefined))<br>
Config->Undefined.push_back(Arg->getValue());<br>
<br>
- for (auto *Arg : Args.filtered(OPT_z))<br>
- if (Arg->getValue() == StringRef("now"))<br>
+ // FIXME: Group -z options together in Config.<br></blockquote><div><br></div><div>Does this FIXME make sense? To me, -z is a random collection of features that happen to be for some reason in -z <i>featurename</i> form, so I don't see a strong reason to group them specially.</div><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ for (auto *Arg : Args.filtered(OPT_z)) {<br>
+ if (Arg->getValue() == StringRef("nodelete"))<br>
+ Config->ZNodelete = true;<br>
+ else if (Arg->getValue() == StringRef("now"))<br>
Config->ZNow = true;<br>
+ }<br>
<br>
for (auto *Arg : Args) {<br>
switch (Arg->getOption().getID()) {<br>
<br>
Modified: lld/trunk/ELF/OutputSections.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.cpp?rev=250771&r1=250770&r2=250771&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.cpp?rev=250771&r1=250770&r2=250771&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/OutputSections.cpp (original)<br>
+++ lld/trunk/ELF/OutputSections.cpp Mon Oct 19 19:20:20 2015<br>
@@ -296,7 +296,7 @@ template <class ELFT> void DynamicSectio<br>
++NumEntries; // DT_FINI<br>
if (Config->Bsymbolic)<br>
++NumEntries; // DT_FLAGS<br>
- if (Config->ZNow)<br>
+ if (Config->ZNodelete || Config->ZNow)<br>
++NumEntries; // DT_FLAGS_1<br>
++NumEntries; // DT_NULL<br>
<br>
@@ -374,6 +374,8 @@ template <class ELFT> void DynamicSectio<br>
if (Flags)<br>
WriteVal(DT_FLAGS, Flags);<br>
Flags = 0;<br>
+ if (Config->ZNodelete)<br>
+ Flags |= DF_1_NODELETE;<br>
if (Config->ZNow)<br>
Flags |= DF_1_NOW;<br>
if (Flags)<br>
<br>
Modified: lld/trunk/test/elf2/dt_flags.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/dt_flags.s?rev=250771&r1=250770&r2=250771&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/dt_flags.s?rev=250771&r1=250770&r2=250771&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/dt_flags.s (original)<br>
+++ lld/trunk/test/elf2/dt_flags.s Mon Oct 19 19:20:20 2015<br>
@@ -9,12 +9,12 @@<br>
<br>
# FLAGS: DynamicSection [<br>
# FLAGS: 0x000000000000001E FLAGS SYMBOLIC<br>
-# FLAGS: 0x000000006FFFFFFB FLAGS_1 NOW<br>
+# FLAGS: 0x000000006FFFFFFB FLAGS_1 NOW NODELETE<br>
# FLAGS: ]<br>
<br>
# CHECK: DynamicSection [<br>
# CHECK-NOT: 0x000000000000001E FLAGS SYMBOLIC<br>
-# CHECK-NOT: 0x000000006FFFFFFB FLAGS_1 NOW<br>
+# CHECK-NOT: 0x000000006FFFFFFB FLAGS_1 NOW NODELETE<br>
# CHECK: ]<br>
<br>
.globl _start<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></div>