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

Fix bug number for linker related workarounds

Browse Source 
Bug: 24425865
Change-Id: I2021674a9df0e768f312ca024d906302db1c494f
This commit is contained in:
Dmitriy Ivanov
2015-09-28 10:14:17 -07:00
parent 55f87a0c0b
commit 280d54680d
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linker/linker.cpp
View File

@@ -1656,7 +1656,7 @@ static void soinfo_unload(soinfo* root) {
}
}
} else {
#if !defined(__work_around_b_19059885__)
#if !defined(__work_around_b_24465209__)
__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);
@@ -2435,7 +2435,7 @@ void soinfo::set_dt_flags_1(uint32_t dt_flags_1) {
}
const char* soinfo::get_realpath() const {
#if defined(__work_around_b_19059885__)
#if defined(__work_around_b_24465209__)
if (has_min_version(2)) {
return realpath_.c_str();
} else {
@@ -2447,7 +2447,7 @@ const char* soinfo::get_realpath() const {
}
const char* soinfo::get_soname() const {
#if defined(__work_around_b_19059885__)
#if defined(__work_around_b_24465209__)
if (has_min_version(2)) {
return soname_;
} else {
@@ -2978,7 +2978,7 @@ bool soinfo::prelink_image() {
switch (d->d_tag) {
case DT_SONAME:
soname_ = get_string(d->d_un.d_val);
#if defined(__work_around_b_19059885__)
#if defined(__work_around_b_24465209__)
strlcpy(old_name_, soname_, sizeof(old_name_));
#endif
break;