diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2015-12-06 23:36:13 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2015-12-06 23:36:13 +0000 |
| commit | 7413fbbb3ad3e91c48015fe94b6f4ac63be21936 (patch) | |
| tree | 768704e20221c28786141ef735a8cad7220936e9 /libexec/ld.so/sh | |
| parent | 9ac61005742c439141221cf577db80ba25069147 (diff) | |
Simplify the relocation code for the ld.so bootstrap and static pie: track
just the dynamic tags are needed instead of reusing the generic elf_object_t
structure.
testing and feedback from miod@
ok kettenis@
Diffstat (limited to 'libexec/ld.so/sh')
| -rw-r--r-- | libexec/ld.so/sh/archdep.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/libexec/ld.so/sh/archdep.h b/libexec/ld.so/sh/archdep.h index 00f8aaf87ea..d6f201f6cbe 100644 --- a/libexec/ld.so/sh/archdep.h +++ b/libexec/ld.so/sh/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.4 2014/12/30 19:26:38 miod Exp $ */ +/* $OpenBSD: archdep.h,v 1.5 2015/12/06 23:36:12 guenther Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -29,6 +29,8 @@ #ifndef _SH_ARCHDEP_H_ #define _SH_ARCHDEP_H_ +#define RELOC_TAG DT_RELA + #define DL_MALLOC_ALIGN 4 /* Arch constraint or otherwise */ #define MACHID EM_SH /* ELF e_machine ID value checked */ @@ -57,20 +59,7 @@ _dl_mmap(void *addr, unsigned int len, unsigned int prot, } static inline void -RELOC_REL(Elf_Rel *r, const Elf_Sym *s, Elf_Addr *p, unsigned long v) -{ - if (ELF_R_TYPE(r->r_info) == R_SH_RELATIVE) { - *p += v; - } else { - /* XXX - printf might not work here, but we give it a shot. */ - _dl_printf("Unknown bootstrap relocation.\n"); - _dl_exit(6); - } -} - -static inline void -RELOC_RELA(Elf32_Rela *r, const Elf32_Sym *s, Elf32_Addr *p, unsigned long v, - Elf_Addr *pltgot) +RELOC_DYN(Elf32_Rela *r, const Elf32_Sym *s, Elf32_Addr *p, unsigned long v) { if (ELF_R_TYPE(r->r_info) == R_SH_RELATIVE) { *p = v + r->r_addend; |