|
@@ -43,43 +43,36 @@ static inline void __put_unaligned_reloc(unsigned long *addr,
|
|
unsigned long
|
|
unsigned long
|
|
_dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
|
|
_dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
|
|
{
|
|
{
|
|
- int reloc_type;
|
|
|
|
int symtab_index;
|
|
int symtab_index;
|
|
char *strtab;
|
|
char *strtab;
|
|
char *symname;
|
|
char *symname;
|
|
char *new_addr;
|
|
char *new_addr;
|
|
char *rel_addr;
|
|
char *rel_addr;
|
|
char **got_addr;
|
|
char **got_addr;
|
|
- Elf32_Sym *symtab;
|
|
|
|
|
|
+ ElfW(Sym) *symtab;
|
|
ELF_RELOC *this_reloc;
|
|
ELF_RELOC *this_reloc;
|
|
unsigned long instr_addr;
|
|
unsigned long instr_addr;
|
|
|
|
|
|
rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
|
|
rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL];
|
|
|
|
|
|
this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
|
|
this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry);
|
|
- reloc_type = ELF32_R_TYPE(this_reloc->r_info);
|
|
|
|
- symtab_index = ELF32_R_SYM(this_reloc->r_info);
|
|
|
|
|
|
+ symtab_index = ELF_R_SYM(this_reloc->r_info);
|
|
|
|
|
|
- symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];
|
|
|
|
|
|
+ symtab = (ElfW(Sym) *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];
|
|
strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
|
|
strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
|
|
symname = strtab + symtab[symtab_index].st_name;
|
|
symname = strtab + symtab[symtab_index].st_name;
|
|
|
|
|
|
- if (unlikely(reloc_type != R_METAG_JMP_SLOT)) {
|
|
|
|
- _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n",
|
|
|
|
- _dl_progname);
|
|
|
|
- _dl_exit(1);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/* Address of the jump instruction to fix up. */
|
|
/* Address of the jump instruction to fix up. */
|
|
instr_addr = ((unsigned long)this_reloc->r_offset +
|
|
instr_addr = ((unsigned long)this_reloc->r_offset +
|
|
(unsigned long)tpnt->loadaddr);
|
|
(unsigned long)tpnt->loadaddr);
|
|
got_addr = (char **)instr_addr;
|
|
got_addr = (char **)instr_addr;
|
|
|
|
|
|
/* Get the address of the GOT entry. */
|
|
/* Get the address of the GOT entry. */
|
|
- new_addr = _dl_find_hash(symname, tpnt->symbol_scope, tpnt,
|
|
|
|
|
|
+ new_addr = _dl_find_hash(symname, &_dl_loaded_modules->symbol_scope, tpnt,
|
|
ELF_RTYPE_CLASS_PLT, NULL);
|
|
ELF_RTYPE_CLASS_PLT, NULL);
|
|
if (unlikely(!new_addr)) {
|
|
if (unlikely(!new_addr)) {
|
|
- _dl_dprintf(2, "%s: Can't resolve symbol '%s'\n", _dl_progname, symname);
|
|
|
|
|
|
+ _dl_dprintf(2, "%s: Can't resolve symbol '%s'\n",
|
|
|
|
+ _dl_progname, symname);
|
|
_dl_exit(1);
|
|
_dl_exit(1);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -102,28 +95,28 @@ _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
static int
|
|
-_dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
|
|
|
|
+_dl_parse(struct elf_resolve *tpnt, struct r_scope_elem *scope,
|
|
unsigned long rel_addr, unsigned long rel_size,
|
|
unsigned long rel_addr, unsigned long rel_size,
|
|
- int (*reloc_fnc)(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
|
|
- ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab))
|
|
|
|
|
|
+ int (*reloc_fnc)(struct elf_resolve *tpnt, struct r_scope_elem *scope,
|
|
|
|
+ ELF_RELOC *rpnt, ElfW(Sym) *symtab, char *strtab))
|
|
{
|
|
{
|
|
int symtab_index;
|
|
int symtab_index;
|
|
unsigned int i;
|
|
unsigned int i;
|
|
char *strtab;
|
|
char *strtab;
|
|
- Elf32_Sym *symtab;
|
|
|
|
|
|
+ ElfW(Sym) *symtab;
|
|
ELF_RELOC *rpnt;
|
|
ELF_RELOC *rpnt;
|
|
|
|
|
|
/* Parse the relocation information. */
|
|
/* Parse the relocation information. */
|
|
rpnt = (ELF_RELOC *)(intptr_t)rel_addr;
|
|
rpnt = (ELF_RELOC *)(intptr_t)rel_addr;
|
|
rel_size /= sizeof(ELF_RELOC);
|
|
rel_size /= sizeof(ELF_RELOC);
|
|
|
|
|
|
- symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];
|
|
|
|
|
|
+ symtab = (ElfW(Sym) *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB];
|
|
strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
|
|
strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
|
|
|
|
|
|
for (i = 0; i < rel_size; i++, rpnt++) {
|
|
for (i = 0; i < rel_size; i++, rpnt++) {
|
|
int res;
|
|
int res;
|
|
|
|
|
|
- symtab_index = ELF32_R_SYM(rpnt->r_info);
|
|
|
|
|
|
+ symtab_index = ELF_R_SYM(rpnt->r_info);
|
|
|
|
|
|
debug_sym(symtab, strtab, symtab_index);
|
|
debug_sym(symtab, strtab, symtab_index);
|
|
debug_reloc(symtab, strtab, rpnt);
|
|
debug_reloc(symtab, strtab, rpnt);
|
|
@@ -141,7 +134,7 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
strtab + symtab[symtab_index].st_name);
|
|
strtab + symtab[symtab_index].st_name);
|
|
|
|
|
|
if (unlikely(res < 0)) {
|
|
if (unlikely(res < 0)) {
|
|
- int reloc_type = ELF32_R_TYPE(rpnt->r_info);
|
|
|
|
|
|
+ int reloc_type = ELF_R_TYPE(rpnt->r_info);
|
|
|
|
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
_dl_dprintf(2, "can't handle reloc type %s\n",
|
|
_dl_dprintf(2, "can't handle reloc type %s\n",
|
|
@@ -161,8 +154,8 @@ _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
static int
|
|
-_dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
|
|
- ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab)
|
|
|
|
|
|
+_dl_do_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,
|
|
|
|
+ ELF_RELOC *rpnt, ElfW(Sym) *symtab, char *strtab)
|
|
{
|
|
{
|
|
int reloc_type;
|
|
int reloc_type;
|
|
int symtab_index;
|
|
int symtab_index;
|
|
@@ -170,30 +163,35 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
unsigned long *reloc_addr;
|
|
unsigned long *reloc_addr;
|
|
unsigned long symbol_addr;
|
|
unsigned long symbol_addr;
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
- unsigned long old_val;
|
|
|
|
|
|
+ unsigned long old_val = 0;
|
|
#endif
|
|
#endif
|
|
|
|
+ struct elf_resolve *tls_tpnt = NULL;
|
|
|
|
+ struct symbol_ref sym_ref;
|
|
|
|
|
|
- reloc_addr = (unsigned long *)(intptr_t)(tpnt->loadaddr + (unsigned long)rpnt->r_offset);
|
|
|
|
- reloc_type = ELF32_R_TYPE(rpnt->r_info);
|
|
|
|
- symtab_index = ELF32_R_SYM(rpnt->r_info);
|
|
|
|
|
|
+ reloc_addr = (unsigned long *)(tpnt->loadaddr + rpnt->r_offset);
|
|
|
|
+ reloc_type = ELF_R_TYPE(rpnt->r_info);
|
|
|
|
+ symtab_index = ELF_R_SYM(rpnt->r_info);
|
|
symbol_addr = 0;
|
|
symbol_addr = 0;
|
|
- symname = strtab + symtab[symtab_index].st_name;
|
|
|
|
|
|
+ sym_ref.sym = &symtab[symtab_index];
|
|
|
|
+ sym_ref.tpnt = NULL;
|
|
|
|
|
|
if (symtab_index) {
|
|
if (symtab_index) {
|
|
- if (symtab[symtab_index].st_shndx != SHN_UNDEF &&
|
|
|
|
- ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_LOCAL) {
|
|
|
|
- symbol_addr = (unsigned long)tpnt->loadaddr;
|
|
|
|
- } else {
|
|
|
|
- symbol_addr = (unsigned long)_dl_find_hash(symname, scope, tpnt,
|
|
|
|
- elf_machine_type_class(reloc_type), NULL);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (unlikely(!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK)) {
|
|
|
|
- _dl_dprintf(2, "%s: can't resolve symbol '%s'\n", _dl_progname, symname);
|
|
|
|
- _dl_exit(1);
|
|
|
|
|
|
+ symname = strtab + symtab[symtab_index].st_name;
|
|
|
|
+ symbol_addr = (unsigned long)_dl_find_hash(symname, scope, tpnt,
|
|
|
|
+ elf_machine_type_class(reloc_type), &sym_ref);
|
|
|
|
+
|
|
|
|
+ if (!symbol_addr
|
|
|
|
+ && ELF_ST_TYPE(symtab[symtab_index].st_info) != STT_TLS
|
|
|
|
+ && ELF_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK) {
|
|
|
|
+ _dl_dprintf(2, "%s: can't resolve symbol '%s'\n",
|
|
|
|
+ _dl_progname, symname);
|
|
|
|
+ return 1;
|
|
};
|
|
};
|
|
-
|
|
|
|
- symbol_addr += rpnt->r_addend;
|
|
|
|
|
|
+ if (_dl_trace_prelink) {
|
|
|
|
+ _dl_debug_lookup(symname, tpnt, &symtab[symtab_index],
|
|
|
|
+ &sym_ref, elf_machine_type_class(reloc_type));
|
|
|
|
+ }
|
|
|
|
+ tls_tpnt = sym_ref.tpnt;
|
|
}
|
|
}
|
|
|
|
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
@@ -201,13 +199,21 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
old_val = __get_unaligned_reloc(reloc_addr);
|
|
old_val = __get_unaligned_reloc(reloc_addr);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+#if defined USE_TLS && USE_TLS
|
|
|
|
+ /* In case of a TLS reloc, tls_tpnt NULL means we have an 'anonymous'
|
|
|
|
+ symbol. This is the case for a static tls variable, so the lookup
|
|
|
|
+ module is just that one is referencing the tls variable. */
|
|
|
|
+ if (!tls_tpnt)
|
|
|
|
+ tls_tpnt = tpnt;
|
|
|
|
+#endif
|
|
switch (reloc_type) {
|
|
switch (reloc_type) {
|
|
case R_METAG_NONE:
|
|
case R_METAG_NONE:
|
|
break;
|
|
break;
|
|
case R_METAG_GLOB_DAT:
|
|
case R_METAG_GLOB_DAT:
|
|
case R_METAG_JMP_SLOT:
|
|
case R_METAG_JMP_SLOT:
|
|
case R_METAG_ADDR32:
|
|
case R_METAG_ADDR32:
|
|
- __put_unaligned_reloc(reloc_addr, symbol_addr);
|
|
|
|
|
|
+ __put_unaligned_reloc(reloc_addr,
|
|
|
|
+ symbol_addr + rpnt->r_addend);
|
|
break;
|
|
break;
|
|
case R_METAG_COPY:
|
|
case R_METAG_COPY:
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
@@ -215,11 +221,12 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
_dl_dprintf(_dl_debug_file,
|
|
_dl_dprintf(_dl_debug_file,
|
|
"\t%s move %d bytes from %x to %x\n",
|
|
"\t%s move %d bytes from %x to %x\n",
|
|
symname, symtab[symtab_index].st_size,
|
|
symname, symtab[symtab_index].st_size,
|
|
- symbol_addr, reloc_addr);
|
|
|
|
|
|
+ symbol_addr + rpnt->r_addend,
|
|
|
|
+ reloc_addr);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
_dl_memcpy((char *)reloc_addr,
|
|
_dl_memcpy((char *)reloc_addr,
|
|
- (char *)symbol_addr,
|
|
|
|
|
|
+ (char *)symbol_addr + rpnt->r_addend,
|
|
symtab[symtab_index].st_size);
|
|
symtab[symtab_index].st_size);
|
|
break;
|
|
break;
|
|
case R_METAG_RELATIVE:
|
|
case R_METAG_RELATIVE:
|
|
@@ -227,13 +234,24 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
(unsigned long)tpnt->loadaddr +
|
|
(unsigned long)tpnt->loadaddr +
|
|
rpnt->r_addend);
|
|
rpnt->r_addend);
|
|
break;
|
|
break;
|
|
|
|
+#if defined USE_TLS && USE_TLS
|
|
|
|
+ case R_METAG_TLS_DTPMOD:
|
|
|
|
+ *reloc_addr = tls_tpnt->l_tls_modid;
|
|
|
|
+ break;
|
|
|
|
+ case R_METAG_TLS_DTPOFF:
|
|
|
|
+ *reloc_addr = symbol_addr;
|
|
|
|
+ break;
|
|
|
|
+ case R_METAG_TLS_TPOFF:
|
|
|
|
+ CHECK_STATIC_TLS ((struct link_map *) tls_tpnt);
|
|
|
|
+ *reloc_addr = tls_tpnt->l_tls_offset + symbol_addr + rpnt->r_addend;
|
|
|
|
+ break;
|
|
|
|
+#endif
|
|
default:
|
|
default:
|
|
return -1; /* Calls _dl_exit(1). */
|
|
return -1; /* Calls _dl_exit(1). */
|
|
}
|
|
}
|
|
|
|
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
- if (_dl_debug_reloc && _dl_debug_detail &&
|
|
|
|
- (reloc_type != R_METAG_NONE)) {
|
|
|
|
|
|
+ if (_dl_debug_reloc && _dl_debug_detail && reloc_type != R_METAG_NONE) {
|
|
unsigned long new_val = __get_unaligned_reloc(reloc_addr);
|
|
unsigned long new_val = __get_unaligned_reloc(reloc_addr);
|
|
_dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n",
|
|
_dl_dprintf(_dl_debug_file, "\tpatched: %x ==> %x @ %x\n",
|
|
old_val, new_val, reloc_addr);
|
|
old_val, new_val, reloc_addr);
|
|
@@ -244,8 +262,8 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
}
|
|
}
|
|
|
|
|
|
static int
|
|
static int
|
|
-_dl_do_lazy_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
|
|
- ELF_RELOC *rpnt, Elf32_Sym *symtab, char *strtab)
|
|
|
|
|
|
+_dl_do_lazy_reloc(struct elf_resolve *tpnt, struct r_scope_elem *scope,
|
|
|
|
+ ELF_RELOC *rpnt, ElfW(Sym) *symtab, char *strtab)
|
|
{
|
|
{
|
|
int reloc_type;
|
|
int reloc_type;
|
|
unsigned long *reloc_addr;
|
|
unsigned long *reloc_addr;
|
|
@@ -253,8 +271,8 @@ _dl_do_lazy_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
|
|
unsigned long old_val;
|
|
unsigned long old_val;
|
|
#endif
|
|
#endif
|
|
|
|
|
|
- reloc_addr = (unsigned long *)(intptr_t)(tpnt->loadaddr + (unsigned long)rpnt->r_offset);
|
|
|
|
- reloc_type = ELF32_R_TYPE(rpnt->r_info);
|
|
|
|
|
|
+ reloc_addr = (unsigned long *)(tpnt->loadaddr + rpnt->r_offset);
|
|
|
|
+ reloc_type = ELF_R_TYPE(rpnt->r_info);
|
|
|
|
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
#if defined (__SUPPORT_LD_DEBUG__)
|
|
old_val = *reloc_addr;
|
|
old_val = *reloc_addr;
|
|
@@ -291,9 +309,10 @@ _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
|
|
|
|
|
|
int
|
|
int
|
|
_dl_parse_relocation_information(struct dyn_elf *rpnt,
|
|
_dl_parse_relocation_information(struct dyn_elf *rpnt,
|
|
|
|
+ struct r_scope_elem *scope,
|
|
unsigned long rel_addr,
|
|
unsigned long rel_addr,
|
|
unsigned long rel_size)
|
|
unsigned long rel_size)
|
|
{
|
|
{
|
|
- return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr,
|
|
|
|
|
|
+ return _dl_parse(rpnt->dyn, scope, rel_addr,
|
|
rel_size, _dl_do_reloc);
|
|
rel_size, _dl_do_reloc);
|
|
}
|
|
}
|