diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2014-12-22 21:58:26 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2014-12-22 21:58:26 +0000 |
| commit | a7011e75e0665f391f1e7671cff112ad01656ab4 (patch) | |
| tree | b7e0918beea856252d873d31725f304aa84effb3 /libexec/ld.so | |
| parent | 2aeb75c0a97e4ba4b8eeb48b9e0cf45a21b6c8f1 (diff) | |
Self-relocation code for i386.
Diffstat (limited to 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/i386/archdep.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libexec/ld.so/i386/archdep.h b/libexec/ld.so/i386/archdep.h index 57badd1c871..bfa203fee87 100644 --- a/libexec/ld.so/i386/archdep.h +++ b/libexec/ld.so/i386/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.11 2010/01/02 12:16:35 kettenis Exp $ */ +/* $OpenBSD: archdep.h,v 1.12 2014/12/22 21:58:25 kurt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -67,6 +67,8 @@ RELOC_REL(Elf32_Rel *r, const Elf32_Sym *s, Elf32_Addr *p, unsigned long v) *p += v; } else if (ELF32_R_TYPE(r->r_info) == RELOC_GLOB_DAT) { *p += v + s->st_value; + } else if (ELF32_R_TYPE(r->r_info) == RELOC_32) { + *p += v + s->st_value; } else { _dl_printf("unknown bootstrap relocation\n"); _dl_exit(6); @@ -83,6 +85,7 @@ RELOC_RELA(Elf32_Rela *r, const Elf32_Sym *s, Elf32_Addr *p, unsigned long v, *p = v + r->r_addend; } else if (ELF32_R_TYPE(r->r_info) == RELOC_GLOB_DAT) { *p = v + s->st_value + r->r_addend; + } else if (ELF32_R_TYPE(r->r_info) == RELOC_NONE) { } else { _dl_printf("unknown bootstrap relocation\n"); _dl_exit(6); |