|
@@ -18,30 +18,28 @@ static inline int do_single_reloc(
|
|
switch(type) {
|
|
switch(type) {
|
|
case R_SH_GLOB_DAT:
|
|
case R_SH_GLOB_DAT:
|
|
case R_SH_JMP_SLOT:
|
|
case R_SH_JMP_SLOT:
|
|
- *reloc_addr = sym_val;
|
|
|
|
|
|
+ case R_SH_DIR32:
|
|
|
|
+ *reloc_addr = sym_val + addend;
|
|
break;
|
|
break;
|
|
case R_SH_RELATIVE:
|
|
case R_SH_RELATIVE:
|
|
*reloc_addr = (size_t)base_addr + addend;
|
|
*reloc_addr = (size_t)base_addr + addend;
|
|
break;
|
|
break;
|
|
- case R_SH_DIR32:
|
|
|
|
- *reloc_addr = sym_val + addend;
|
|
|
|
- break;
|
|
|
|
case R_SH_REL32:
|
|
case R_SH_REL32:
|
|
- *reloc_addr = sym_val + addend - (size_t)reloc_addr + (size_t)base_addr;
|
|
|
|
|
|
+ *reloc_addr = sym_val + addend - (size_t)reloc_addr;
|
|
break;
|
|
break;
|
|
case R_SH_COPY:
|
|
case R_SH_COPY:
|
|
memcpy(reloc_addr, (void *)sym_val, sym_size);
|
|
memcpy(reloc_addr, (void *)sym_val, sym_size);
|
|
break;
|
|
break;
|
|
case R_SH_TLS_DTPMOD32:
|
|
case R_SH_TLS_DTPMOD32:
|
|
- *reloc_addr += def.dso ? def.dso->tls_id : self->tls_id;
|
|
|
|
|
|
+ *reloc_addr = def.dso ? def.dso->tls_id : self->tls_id;
|
|
break;
|
|
break;
|
|
case R_SH_TLS_DTPOFF32:
|
|
case R_SH_TLS_DTPOFF32:
|
|
- *reloc_addr += def.sym->st_value;
|
|
|
|
|
|
+ *reloc_addr = def.sym->st_value + addend;
|
|
break;
|
|
break;
|
|
case R_SH_TLS_TPOFF32:
|
|
case R_SH_TLS_TPOFF32:
|
|
- *reloc_addr += def.sym
|
|
|
|
- ? def.sym->st_value + def.dso->tls_offset + 8
|
|
|
|
- : self->tls_offset + 8;
|
|
|
|
|
|
+ *reloc_addr = (def.sym
|
|
|
|
+ ? def.sym->st_value + def.dso->tls_offset
|
|
|
|
+ : self->tls_offset) + 8 + addend;
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|