generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply work around b/19059885 to x86

Browse Source 
Bug: http://b/19059885
Bug: http://b/21203348
Change-Id: Ic375e9f877d68de8f866d17362879a7dde638465
(cherry picked from commit 69a5fb951d)
This commit is contained in:
Dmitriy Ivanov
2015-05-15 17:53:39 -07:00
parent 0378d8f651
commit 9185e04f72
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linker/linker.cpp
View File

@@ -1529,7 +1529,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);
@@ -2255,7 +2255,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 {
@@ -2267,7 +2267,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 {
@@ -2805,7 +2805,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;