commit ea41ab0548f4340a3d5f5a4253ce4a04fd66e157
author Ryan Prichard <rprichard@google.com> Wed Jan 23 16:33:03 2019 -0800
committer Ryan Prichard <rprichard@google.com> Fri Jan 25 17:53:01 2019 -0800
tree a2bc46e8657576764c9a6b6088751c404c198a6d
parent 5f5a1929e8bd883c79669dc5dd2348d9cec1d1a6

Ignore DT_TLSDESC_GOT / DT_TLSDESC_PLT

These dynamic table entries are used for lazy relocation of TLSDESC
relocations. Bionic relocates everything eagerly and can ignore these
entries.

Bug: http://b/78026329
Test: bionic unit tests
Test: manual
Change-Id: I788c4a95041fae66de2fbeab3babe0205631999c

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 412b8eb..8a28bad 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3528,13 +3528,14 @@
         // this is parsed after we have strtab initialized (see below).
         break;
 
+      case DT_TLSDESC_GOT:
+      case DT_TLSDESC_PLT:
+        // These DT entries are used for lazy TLSDESC relocations. Bionic
+        // resolves everything eagerly, so these can be ignored.
+        break;
+
       default:
         if (!relocating_linker) {
-          if (d->d_tag == DT_TLSDESC_GOT || d->d_tag == DT_TLSDESC_PLT) {
-            DL_ERR("unsupported ELF TLS DT entry in \"%s\"", get_realpath());
-            return false;
-          }
-
           const char* tag_name;
           if (d->d_tag == DT_RPATH) {
             tag_name = "DT_RPATH";