diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-10 04:17:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-10 04:17:38 +0000 |
| commit | 8f0c1aa9fd0ce5d319af8590f3da4e11d36119ac (patch) | |
| tree | 623711690bbd522dd6a546a3a7a25db4ca835639 /sys/arch/armv7 | |
| parent | 11a564e909360219908f5872d7b84a175d37875e (diff) | |
change marks[] array to uint64_t, so the code can track full 64-bit
details from the ELF header instead of faking it.
Proposal from mlarkin, tested on most architectures already
Diffstat (limited to 'sys/arch/armv7')
| -rw-r--r-- | sys/arch/armv7/include/loadfile_machdep.h | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/stand/efiboot/exec.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/armv7/include/loadfile_machdep.h b/sys/arch/armv7/include/loadfile_machdep.h index ec044802bba..17265814203 100644 --- a/sys/arch/armv7/include/loadfile_machdep.h +++ b/sys/arch/armv7/include/loadfile_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: loadfile_machdep.h,v 1.4 2016/05/14 18:04:02 kettenis Exp $ */ +/* $OpenBSD: loadfile_machdep.h,v 1.5 2019/04/10 04:17:34 deraadt Exp $ */ /* $NetBSD: loadfile_machdep.h,v 1.1 1999/04/29 03:17:12 tsubai Exp $ */ /*- @@ -50,4 +50,4 @@ extern u_long efi_loadaddr; #define ALLOC(a) alloc(a) #define FREE(a, b) free(a, b) -void run_loadfile(u_long *, int); +void run_loadfile(uint64_t *, int); diff --git a/sys/arch/armv7/stand/efiboot/exec.c b/sys/arch/armv7/stand/efiboot/exec.c index 6eb730b2bbb..2cf82dde6c1 100644 --- a/sys/arch/armv7/stand/efiboot/exec.c +++ b/sys/arch/armv7/stand/efiboot/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.12 2017/06/12 18:26:33 mglocker Exp $ */ +/* $OpenBSD: exec.c,v 1.13 2019/04/10 04:17:34 deraadt Exp $ */ /* * Copyright (c) 2006, 2016 Mark Kettenis @@ -33,7 +33,7 @@ typedef void (*startfuncp)(void *, void *, void *) __attribute__ ((noreturn)); void -run_loadfile(u_long *marks, int howto) +run_loadfile(uint64_t *marks, int howto) { Elf_Ehdr *elf = (Elf_Ehdr *)marks[MARK_SYM]; Elf_Shdr *shp = (Elf_Shdr *)(marks[MARK_SYM] + elf->e_shoff); |