commit 06edc7c0aad2f3a813d61ac257130826473b7efe
author Davide Italiano <davide@freebsd.org> Tue Oct 20 04:58:40 2015 +0000
committer Davide Italiano <davide@freebsd.org> Tue Oct 20 04:58:40 2015 +0000
tree 039ca16d51016e9b029e8fd1183a5a35cccd0ed1
parent d717cc9f7106a214393e0380645ffe44f70673a8

[ELF2] Correctly set bits when -z now is specified.

The option now just sets NOW bit in DT_FLAGS_1 but some loaders
seem to require also BIND_NOW bit to be set in DT_FLAGS. This is,
also, what ld.bfd and gold do.

Differential Revision:	http://reviews.llvm.org/D13883

llvm-svn: 250799

lld/ELF/OutputSections.cpp

diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp
index 13d3d9c..0bb436a 100644
--- a/lld/ELF/OutputSections.cpp
+++ b/lld/ELF/OutputSections.cpp
@@ -294,7 +294,7 @@
     ++NumEntries; // DT_INIT
   if (FiniSym)
     ++NumEntries; // DT_FINI
-  if (Config->Bsymbolic)
+  if (Config->Bsymbolic || Config->ZNow)
     ++NumEntries; // DT_FLAGS
   if (Config->ZNodelete || Config->ZNow)
     ++NumEntries; // DT_FLAGS_1
@@ -371,6 +371,8 @@
   uint32_t Flags = 0;
   if (Config->Bsymbolic)
     Flags |= DF_SYMBOLIC;
+  if (Config->ZNow)
+    Flags |= DF_BIND_NOW;
   if (Flags)
     WriteVal(DT_FLAGS, Flags);
   Flags = 0;

lld/test/elf2/dt_flags.s

diff --git a/lld/test/elf2/dt_flags.s b/lld/test/elf2/dt_flags.s
index 0d9b032..2d39aab 100644
--- a/lld/test/elf2/dt_flags.s
+++ b/lld/test/elf2/dt_flags.s
@@ -8,12 +8,12 @@
 # RUN: llvm-readobj -dynamic-table %t2 | FileCheck %s
 
 # FLAGS: DynamicSection [
-# FLAGS:   0x000000000000001E FLAGS SYMBOLIC
+# FLAGS:   0x000000000000001E FLAGS SYMBOLIC BIND_NOW
 # FLAGS:   0x000000006FFFFFFB FLAGS_1 NOW NODELETE
 # FLAGS: ]
 
 # CHECK: DynamicSection [
-# CHECK-NOT:   0x000000000000001E FLAGS SYMBOLIC
+# CHECK-NOT:   0x000000000000001E FLAGS SYMBOLIC BIND_NOW
 # CHECK-NOT:   0x000000006FFFFFFB FLAGS_1 NOW NODELETE
 # CHECK: ]