Make our ELF64 type definitions match standards. In particular this

means:
o  Remove Elf64_Quarter,
o  Redefine Elf64_Half to be 16-bit,
o  Redefine Elf64_Word to be 32-bit,
o  Add Elf64_Xword and Elf64_Sxword for 64-bit entities,
o  Use Elf_Size in MI code to abstract the difference between
   Elf32_Word and Elf64_Word.
o  Add Elf_Ssize as the signed counterpart of Elf_Size.

MFC after: 2 weeks

1 files changed, 6 insertions, 6 deletions

diff --git a/usr.bin/elf2aout/elf2aout.c b/usr.bin/elf2aout/elf2aout.c
index 3abf818..f4e6560 100644
--- a/usr.bin/elf2aout/elf2aout.c
+++ b/usr.bin/elf2aout/elf2aout.c
@@ -66,15 +66,15 @@ static void usage(void);
 int
 main(int ac, char **av)
 {
-	Elf64_Quarter phentsize;
-	Elf64_Quarter machine;
-	Elf64_Quarter phnum;
-	Elf64_Size filesz;
-	Elf64_Size memsz;
+	Elf64_Half phentsize;
+	Elf64_Half machine;
+	Elf64_Half phnum;
+	Elf64_Xword filesz;
+	Elf64_Xword memsz;
 	Elf64_Addr entry;
 	Elf64_Off offset;
 	Elf64_Off phoff;
-	Elf64_Half type;
+	Elf64_Word type;
 	unsigned char data;
 	struct stat sb;
 	struct exec a;