tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am b81a871c: Merge changes I88827aa0,Ib0b0987a

Browse source 
* commit 'b81a871cbb2d99168bdb8380b6142139135f418f':
  Fix: DT_DEBUG was acting as DT_REL on mips64
  Add missing SHT_LOOS/SHT_HIOS values
This commit is contained in:
Dmitriy Ivanov 2015-02-14 00:43:56 +00:00 committed by Android Git Automerger
commit 88117127de
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libc/include/elf.h
View file

@ -106,6 +106,9 @@ typedef struct {
#define STB_LOPROC 13 #define STB_LOPROC 13
#define STB_HIPROC 15 #define STB_HIPROC 15
#define SHT_LOOS 0x60000000
#define SHT_HIOS 0x6fffffff
#define STT_GNU_IFUNC 10 #define STT_GNU_IFUNC 10
#define STT_LOOS 10 #define STT_LOOS 10
#define STT_HIOS 12 #define STT_HIOS 12

2
linker/linker.cpp
View file

@ -2040,8 +2040,8 @@ bool soinfo::prelink_image() {
if ((dynamic_flags & PF_W) != 0) { if ((dynamic_flags & PF_W) != 0) {
d->d_un.d_val = reinterpret_cast<uintptr_t>(&_r_debug); d->d_un.d_val = reinterpret_cast<uintptr_t>(&_r_debug);
} }
break;
#endif #endif
break;
#if defined(USE_RELA) #if defined(USE_RELA)
case DT_RELA: case DT_RELA:
rela_ = reinterpret_cast<ElfW(Rela)*>(load_bias + d->d_un.d_ptr); rela_ = reinterpret_cast<ElfW(Rela)*>(load_bias + d->d_un.d_ptr);