diff options
-rw-r--r-- | trunk/ChangeLog | 11 | ||||
-rw-r--r-- | trunk/src/arch-arm.c | 177 | ||||
-rw-r--r-- | trunk/src/prelink.h | 6 |
3 files changed, 190 insertions, 4 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 7ae4458..77d93cd 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,4 +1,15 @@ 2009-03-04 Daniel Jacobowitz <dan@codesourcery.com> + Joseph Myers <joseph@codesourcery.com> + + * src/arch-arm.c (arm_prelink_rel, arm_prelink_rela, + arm_prelink_conflict_rel, arm_prelink_conflict_rela, arm_rel_to_rela, + arm_rela_to_rel, arm_need_rel_to_rela, arm_undo_prelink_rel, + arm_reloc_class): Handle TLS relocations. + * src/prelink.h (R_ARM_TLS_DTPMOD32, R_ARM_TLS_DTPOFF32, + R_ARM_TLS_TPOFF32): Define if R_ARM_TLS_DTPMOD32 not already + defined. + +2009-03-04 Daniel Jacobowitz <dan@codesourcery.com> * src/arch-arm.c (arm_adjust_dyn, arm_adjust_rel, arm_adjust_rela, arm_prelink_rel, arm_prelink_rela, arm_apply_conflict_rela, diff --git a/trunk/src/arch-arm.c b/trunk/src/arch-arm.c index 71407ce..a15244a 100644 --- a/trunk/src/arch-arm.c +++ b/trunk/src/arch-arm.c @@ -151,6 +151,25 @@ arm_prelink_rel (struct prelink_info *info, GElf_Rel *rel, GElf_Addr reladdr) return 0; error (0, 0, "%s: R_ARM_COPY reloc in shared library?", dso->filename); return 1; + case R_ARM_TLS_DTPOFF32: + write_ne32 (dso, rel->r_offset, value); + break; + /* DTPMOD32 and TPOFF32 is impossible to predict in shared libraries + unless prelink sets the rules. */ + case R_ARM_TLS_DTPMOD32: + if (dso->ehdr.e_type == ET_EXEC) + { + error (0, 0, "%s: R_ARM_TLS_DTPMOD32 reloc in executable?", + dso->filename); + return 1; + } + break; + case R_ARM_TLS_TPOFF32: + if (dso->ehdr.e_type == ET_EXEC) + error (0, 0, "%s: R_ARM_TLS_TPOFF32 relocs should not be present in " + "prelinked ET_EXEC REL sections", + dso->filename); + break; default: error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, (int) GELF_R_TYPE (rel->r_info)); @@ -201,6 +220,24 @@ arm_prelink_rela (struct prelink_info *info, GElf_Rela *rela, return 0; error (0, 0, "%s: R_ARM_COPY reloc in shared library?", dso->filename); return 1; + case R_ARM_TLS_DTPOFF32: + write_ne32 (dso, rela->r_offset, value + rela->r_addend); + break; + /* DTPMOD32 and TPOFF32 is impossible to predict in shared libraries + unless prelink sets the rules. */ + case R_ARM_TLS_DTPMOD32: + if (dso->ehdr.e_type == ET_EXEC) + { + error (0, 0, "%s: R_ARM_TLS_DTPMOD32 reloc in executable?", + dso->filename); + return 1; + } + break; + case R_ARM_TLS_TPOFF32: + if (dso->ehdr.e_type == ET_EXEC && info->resolvetls) + write_ne32 (dso, rela->r_offset, + value + rela->r_addend + info->resolvetls->offset); + break; default: error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, (int) GELF_R_TYPE (rela->r_info)); @@ -315,6 +352,7 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel, { GElf_Addr value; struct prelink_conflict *conflict; + struct prelink_tls *tls; GElf_Rela *ret; if (GELF_R_TYPE (rel->r_info) == R_ARM_RELATIVE @@ -324,8 +362,34 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel, conflict = prelink_conflict (info, GELF_R_SYM (rel->r_info), GELF_R_TYPE (rel->r_info)); if (conflict == NULL) - return 0; - value = conflict_lookup_value (conflict); + { + if (info->curtls == NULL) + return 0; + + switch (GELF_R_TYPE (rel->r_info)) + { + /* Even local DTPMOD and TPOFF relocs need conflicts. */ + case R_ARM_TLS_DTPMOD32: + case R_ARM_TLS_TPOFF32: + break; + + default: + return 0; + } + value = 0; + } + else + { + /* DTPOFF32 wants to see only real conflicts, not lookups + with reloc_class RTYPE_CLASS_TLS. */ + if (GELF_R_TYPE (rel->r_info) == R_ARM_TLS_DTPOFF32 + && conflict->lookup.tls == conflict->conflict.tls + && conflict->lookupval == conflict->conflictval) + return 0; + + value = conflict_lookup_value (conflict); + } + ret = prelink_conflict_add_rela (info); if (ret == NULL) return 1; @@ -345,6 +409,33 @@ arm_prelink_conflict_rel (DSO *dso, struct prelink_info *info, GElf_Rel *rel, case R_ARM_COPY: error (0, 0, "R_ARM_COPY should not be present in shared libraries"); return 1; + case R_ARM_TLS_DTPMOD32: + case R_ARM_TLS_DTPOFF32: + case R_ARM_TLS_TPOFF32: + if (conflict != NULL + && (conflict->reloc_class != RTYPE_CLASS_TLS + || conflict->lookup.tls == NULL)) + { + error (0, 0, "%s: TLS reloc not resolving to STT_TLS symbol", + dso->filename); + return 1; + } + tls = conflict ? conflict->lookup.tls : info->curtls; + ret->r_info = GELF_R_INFO (0, R_ARM_ABS32); + switch (GELF_R_TYPE (rel->r_info)) + { + case R_ARM_TLS_DTPMOD32: + ret->r_addend = tls->modid; + break; + case R_ARM_TLS_DTPOFF32: + ret->r_addend = value; + break; + case R_ARM_TLS_TPOFF32: + ret->r_addend = (value + read_une32 (dso, rel->r_offset) + + tls->offset); + break; + } + break; default: error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, (int) GELF_R_TYPE (rel->r_info)); @@ -359,6 +450,7 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info, { GElf_Addr value; struct prelink_conflict *conflict; + struct prelink_tls *tls; GElf_Rela *ret; Elf32_Sword val; @@ -368,9 +460,36 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info, return 0; conflict = prelink_conflict (info, GELF_R_SYM (rela->r_info), GELF_R_TYPE (rela->r_info)); + if (conflict == NULL) - return 0; - value = conflict_lookup_value (conflict); + { + if (info->curtls == NULL) + return 0; + + switch (GELF_R_TYPE (rela->r_info)) + { + /* Even local DTPMOD and TPOFF relocs need conflicts. */ + case R_ARM_TLS_DTPMOD32: + case R_ARM_TLS_TPOFF32: + break; + + default: + return 0; + } + value = 0; + } + else + { + /* DTPOFF32 wants to see only real conflicts, not lookups + with reloc_class RTYPE_CLASS_TLS. */ + if (GELF_R_TYPE (rela->r_info) == R_ARM_TLS_DTPOFF32 + && conflict->lookup.tls == conflict->conflict.tls + && conflict->lookupval == conflict->conflictval) + return 0; + + value = conflict_lookup_value (conflict); + } + ret = prelink_conflict_add_rela (info); if (ret == NULL) return 1; @@ -398,6 +517,32 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info, case R_ARM_COPY: error (0, 0, "R_ARM_COPY should not be present in shared libraries"); return 1; + case R_ARM_TLS_DTPMOD32: + case R_ARM_TLS_DTPOFF32: + case R_ARM_TLS_TPOFF32: + if (conflict != NULL + && (conflict->reloc_class != RTYPE_CLASS_TLS + || conflict->lookup.tls == NULL)) + { + error (0, 0, "%s: TLS reloc not resolving to STT_TLS symbol", + dso->filename); + return 1; + } + tls = conflict ? conflict->lookup.tls : info->curtls; + ret->r_info = GELF_R_INFO (0, R_ARM_ABS32); + switch (GELF_R_TYPE (rela->r_info)) + { + case R_ARM_TLS_DTPMOD32: + ret->r_addend = tls->modid; + break; + case R_ARM_TLS_DTPOFF32: + ret->r_addend = value; + break; + case R_ARM_TLS_TPOFF32: + ret->r_addend = value + rela->r_addend + tls->offset; + break; + } + break; default: error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, (int) GELF_R_TYPE (rela->r_info)); @@ -418,6 +563,7 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel, GElf_Rela *rela) abort (); case R_ARM_RELATIVE: case R_ARM_ABS32: + case R_ARM_TLS_TPOFF32: rela->r_addend = (Elf32_Sword) read_une32 (dso, rel->r_offset); break; case R_ARM_PC24: @@ -426,6 +572,8 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel, GElf_Rela *rela) break; case R_ARM_COPY: case R_ARM_GLOB_DAT: + case R_ARM_TLS_DTPMOD32: + case R_ARM_TLS_DTPOFF32: rela->r_addend = 0; break; } @@ -445,6 +593,7 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *rela, GElf_Rel *rel) abort (); case R_ARM_RELATIVE: case R_ARM_ABS32: + case R_ARM_TLS_TPOFF32: write_ne32 (dso, rela->r_offset, rela->r_addend); break; case R_ARM_PC24: @@ -453,6 +602,8 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *rela, GElf_Rel *rel) | ((rela->r_addend >> 2) & 0xffffff)); break; case R_ARM_GLOB_DAT: + case R_ARM_TLS_DTPMOD32: + case R_ARM_TLS_DTPOFF32: write_ne32 (dso, rela->r_offset, 0); break; } @@ -488,6 +639,14 @@ arm_need_rel_to_rela (DSO *dso, int first, int last) /* FALLTHROUGH */ case R_ARM_PC24: return 1; + case R_ARM_TLS_TPOFF32: + /* In shared libraries TPOFF is changed always into + conflicts, for executables we need to preserve + original addend. */ + if (dso->ehdr.e_type == ET_EXEC) + return 1; + + break; } } } @@ -614,6 +773,12 @@ arm_undo_prelink_rel (DSO *dso, GElf_Rel *rel, GElf_Addr reladdr) return 0; error (0, 0, "%s: R_ARM_COPY reloc in shared library?", dso->filename); return 1; + case R_ARM_TLS_DTPMOD32: + case R_ARM_TLS_DTPOFF32: + write_ne32 (dso, rel->r_offset, 0); + break; + case R_ARM_TLS_TPOFF32: + break; default: error (0, 0, "%s: Unknown arm relocation type %d", dso->filename, (int) GELF_R_TYPE (rel->r_info)); @@ -636,6 +801,10 @@ arm_reloc_class (int reloc_type) { case R_ARM_COPY: return RTYPE_CLASS_COPY; case R_ARM_JUMP_SLOT: return RTYPE_CLASS_PLT; + case R_ARM_TLS_DTPMOD32: + case R_ARM_TLS_DTPOFF32: + case R_ARM_TLS_TPOFF32: + return RTYPE_CLASS_TLS; default: return RTYPE_CLASS_VALID; } } diff --git a/trunk/src/prelink.h b/trunk/src/prelink.h index 1661779..0d5aeb8 100644 --- a/trunk/src/prelink.h +++ b/trunk/src/prelink.h @@ -78,6 +78,12 @@ #define R_MIPS_GLOB_DAT 51 #endif +#ifndef R_ARM_TLS_DTPMOD32 +#define R_ARM_TLS_DTPMOD32 17 +#define R_ARM_TLS_DTPOFF32 18 +#define R_ARM_TLS_TPOFF32 19 +#endif + struct prelink_entry; struct prelink_info; struct PLArch; |