diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-20 23:10:01 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-20 23:10:01 +0000 |
| commit | c53375f1a9c0324c99014ac2ce6efa13c829480c (patch) | |
| tree | bb82d60079a0043dafa154a50b98b847e5453d65 | |
| parent | 882134c25ec0d6eac506d0e38fc7fee614d0b385 (diff) | |
The conversion of rdsetroot to -lelf failed on alpha: -lelf thought ELF SHDR
was 80 bytes in size, rather than 64 as listed in the ELF header. In Sep 2001
when ELF was being integrated into the tree, two of the ELF object types (and two
more via #define) were given different (incorrect) sizes, and hid behind an
#ifdef __alpha__ all this time. -lelf constructs the SHDR object by accumulating
sizes of types, so this was finally exposed.
A review of the tree shows no other consequences, so we can fix this now.
| -rw-r--r-- | sys/sys/exec_elf.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/sys/exec_elf.h b/sys/sys/exec_elf.h index 1fdd0f961fd..21d9ea72813 100644 --- a/sys/sys/exec_elf.h +++ b/sys/sys/exec_elf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf.h,v 1.83 2019/01/22 23:23:18 jsg Exp $ */ +/* $OpenBSD: exec_elf.h,v 1.84 2019/04/20 23:10:00 deraadt Exp $ */ /* * Copyright (c) 1995, 1996 Erik Theisen. All rights reserved. * @@ -49,13 +49,8 @@ typedef __uint64_t Elf64_Addr; typedef __uint64_t Elf64_Off; typedef __int32_t Elf64_Shalf; -#ifdef __alpha__ -typedef __int64_t Elf64_Sword; -typedef __uint64_t Elf64_Word; -#else typedef __int32_t Elf64_Sword; typedef __uint32_t Elf64_Word; -#endif typedef __int64_t Elf64_Sxword; typedef __uint64_t Elf64_Xword; |