diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2015-05-15 17:53:39 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2015-05-15 18:39:16 -0700 |
| commit | 69a5fb951d69689dedd83cb033ae3dcd0ef05b65 (patch) | |
| tree | 81540a3dd46f0a604f90993d371c207f5bf3e721 /linker/linker.cpp | |
| parent | ff407803dbbee26ab19c02aaece0e75c019534c4 (diff) | |
| download | android_bionic-69a5fb951d69689dedd83cb033ae3dcd0ef05b65.tar.gz android_bionic-69a5fb951d69689dedd83cb033ae3dcd0ef05b65.tar.bz2 android_bionic-69a5fb951d69689dedd83cb033ae3dcd0ef05b65.zip | |
Apply work around b/19059885 to x86
Bug: http://b/19059885
Bug: http://b/21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 9d796ae66..f9df8315a 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -1544,7 +1544,7 @@ static void soinfo_unload(soinfo* root) { } } } 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 @@ void soinfo::set_dt_flags_1(uint32_t dt_flags_1) { } 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_realpath() const { } 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 @@ bool soinfo::prelink_image() { 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; |