commit d84f8b5eb24f0e55645fd6a35d39611d2ffa74ff
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 23 03:43:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 23 03:43:28 2018 +0000
tree ac4ccef50b4c6400e2449be475815b2757bc2b7a
parent 24f2676a39bf3d9472cf3d1d96371ffea712fc9c
parent d6bf019204e258d89da56330fbcf9a36c39d23f5

Merge "Rework the linker_wrapper to work with lld"

libc/arch-common/bionic/crtbrand.S

diff --git a/libc/arch-common/bionic/crtbrand.S b/libc/arch-common/bionic/crtbrand.S
index 4b4f99c..34d6480 100644
--- a/libc/arch-common/bionic/crtbrand.S
+++ b/libc/arch-common/bionic/crtbrand.S
@@ -33,7 +33,12 @@
   .long 2f-1f                 // int32_t namesz
   .long 3f-2f                 // int32_t descsz
   .long 1                     // int32_t type
+#ifdef __ANDROID__
 1:.ascii "Android\0"          // char name[]
 2:.long PLATFORM_SDK_VERSION  // int32_t android_api
+#else
+1:.ascii "LinuxBionic\0"      // char name[]
+2:
+#endif
 3:
   .size abitag, .-abitag

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index b605ed9..f085863 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1318,6 +1318,15 @@
     }
   }
 
+#if !defined(__ANDROID__)
+  // Bionic on the host currently uses some Android prebuilts, which don't set
+  // DT_RUNPATH with any relative paths, so they can't find their dependencies.
+  // b/118058804
+  if (si->get_dt_runpath().empty()) {
+    si->set_dt_runpath("$ORIGIN/../lib64:$ORIGIN/lib64");
+  }
+#endif
+
   for_each_dt_needed(task->get_elf_reader(), [&](const char* name) {
     load_tasks->push_back(LoadTask::create(name, si, ns, task->get_readers_map()));
   });