<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Oct 19, 2015 at 2:34 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:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: davide<br>
Date: Mon Oct 19 16:34:00 2015<br>
New Revision: 250739<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=250739&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=250739&view=rev</a><br>
Log:<br>
[OutputSection] Set the symbolic bit in DT_FLAGS and not DT_FLAGS_1.<br>
<br>
The two names are similar enough that they might lead to confusion.<br>
The output of readobj clarifies but I missed it when I originally<br>
committed this. Found while linking FreeBSD userland with lld.<br>
<br>
Modified:<br>
    lld/trunk/ELF/OutputSections.cpp<br>
    lld/trunk/test/elf2/dt_flags.s<br>
<br>
Modified: lld/trunk/ELF/OutputSections.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.cpp?rev=250739&r1=250738&r2=250739&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/OutputSections.cpp?rev=250739&r1=250738&r2=250739&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/OutputSections.cpp (original)<br>
+++ lld/trunk/ELF/OutputSections.cpp Mon Oct 19 16:34:00 2015<br>
@@ -369,6 +369,9 @@ template <class ELFT> void DynamicSectio<br>
   uint32_t Flags = 0;<br>
   if (Config->Bsymbolic)<br>
     Flags |= DF_SYMBOLIC;<br>
+  if (Flags)<br>
+    WriteVal(DT_FLAGS, Flags);<br>
+  Flags = 0;<br>
   if (Config->ZNow)<br>
     Flags |= DF_1_NOW;<br></blockquote><div><br></div><div>This code is now equivalent to:</div><div><br></div><div>  if (Config->Bsymbolic)</div><div>    WriteVal(DT_FLAGS, DF_SYMBOLIC);</div><div>  if (Config->ZNow)</div><div>    WriteVal(DT_FLAGS_1, DF_1_NOW);</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
   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=250739&r1=250738&r2=250739&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/dt_flags.s?rev=250739&r1=250738&r2=250739&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf2/dt_flags.s (original)<br>
+++ lld/trunk/test/elf2/dt_flags.s Mon Oct 19 16:34:00 2015<br>
@@ -2,17 +2,19 @@<br>
<br>
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t<br>
 # RUN: ld.lld2 -shared %t -o %t.so<br>
-# RUN: ld.lld2 -z now -Bsymbolic %t %t.so -o %t1<br>
+# RUN: ld.lld2 -z now -z nodelete -Bsymbolic %t %t.so -o %t1<br>
 # RUN: ld.lld2 %t %t.so -o %t2<br>
 # RUN: llvm-readobj -dynamic-table %t1 | FileCheck -check-prefix=FLAGS %s<br>
 # RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s<br>
<br>
 # FLAGS: DynamicSection [<br>
-# FLAGS:   0x000000006FFFFFFB FLAGS_1 NOW GLOBAL<br>
+# FLAGS:   0x000000000000001E FLAGS SYMBOLIC<br>
+# FLAGS:   0x000000006FFFFFFB FLAGS_1 NOW<br>
 # FLAGS: ]<br>
<br>
 # CHECK: DynamicSection [<br>
-# CHECK-NOT:   0x000000006FFFFFFB FLAGS_1 NOW GLOBAL<br>
+# CHECK-NOT:   0x000000000000001E FLAGS SYMBOLIC<br>
+# CHECK-NOT:   0x000000006FFFFFFB FLAGS_1 NOW<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>