commit 69a5fb951d69689dedd83cb033ae3dcd0ef05b65
author Dmitriy Ivanov <dimitry@google.com> Fri May 15 17:53:39 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri May 15 18:39:16 2015 -0700
tree 81540a3dd46f0a604f90993d371c207f5bf3e721
parent ff407803dbbee26ab19c02aaece0e75c019534c4

Apply work around b/19059885 to x86

Bug: http://b/19059885
Bug: http://b/21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 9d796ae..f9df831 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1544,7 +1544,7 @@
           }
         }
       } else {
-#if !defined(__arm__)
+#if !defined(__work_around_b_19059885__)
         __libc_fatal("soinfo for \"%s\"@%p has no version", si->get_realpath(), si);
 #else
         PRINT("warning: soinfo for \"%s\"@%p has no version", si->get_realpath(), si);
@@ -2270,7 +2270,7 @@
 }
 
 const char* soinfo::get_realpath() const {
-#if defined(__arm__)
+#if defined(__work_around_b_19059885__)
   if (has_min_version(2)) {
     return realpath_.c_str();
   } else {
@@ -2282,7 +2282,7 @@
 }
 
 const char* soinfo::get_soname() const {
-#if defined(__arm__)
+#if defined(__work_around_b_19059885__)
   if (has_min_version(2)) {
     return soname_;
   } else {
@@ -2820,7 +2820,7 @@
   for (ElfW(Dyn)* d = dynamic; d->d_tag != DT_NULL; ++d) {
     if (d->d_tag == DT_SONAME) {
       soname_ = get_string(d->d_un.d_val);
-#if defined(__arm__)
+#if defined(__work_around_b_19059885__)
       strlcpy(old_name_, soname_, sizeof(old_name_));
 #endif
       break;