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

7 files changed, 9 insertions, 9 deletions

diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c
index c6751c9..276771d 100644
--- a/usr.sbin/kldxref/ef.c
+++ b/usr.sbin/kldxref/ef.c
@@ -92,7 +92,7 @@ static int ef_seg_read_entry(elf_file_t ef, Elf_Off offset, size_t len,
     void **ptr);
 static int ef_seg_read_entry_rel(elf_file_t ef, Elf_Off offset, size_t len,
     void **ptr);
-static Elf_Addr ef_symaddr(elf_file_t ef, Elf_Word symidx);
+static Elf_Addr ef_symaddr(elf_file_t ef, Elf_Size symidx);
 static int ef_lookup_set(elf_file_t ef, const char *name, long *startp,
     long *stopp, long *countp);
 static int ef_lookup_symbol(elf_file_t ef, const char* name, Elf_Sym** sym);
@@ -246,7 +246,7 @@ out:
 }
 
 static Elf_Addr
-ef_symaddr(elf_file_t ef, Elf_Word symidx)
+ef_symaddr(elf_file_t ef, Elf_Size symidx)
 {
 	const Elf_Sym *sym;
 
diff --git a/usr.sbin/kldxref/ef.h b/usr.sbin/kldxref/ef.h
index 3843ebe..5bb1985 100644
--- a/usr.sbin/kldxref/ef.h
+++ b/usr.sbin/kldxref/ef.h
@@ -48,7 +48,7 @@ struct elf_file_ops {
 	    void**ptr);
 	int (*seg_read_entry_rel)(elf_file_t ef, Elf_Off offset, size_t len,
 	    void**ptr);
-	Elf_Addr (*symaddr)(elf_file_t ef, Elf_Word symidx);
+	Elf_Addr (*symaddr)(elf_file_t ef, Elf_Size symidx);
 	int (*lookup_set)(elf_file_t ef, const char *name, long *startp,
 	    long *stopp, long *countp);
 	int (*lookup_symbol)(elf_file_t ef, const char* name, Elf_Sym** sym);
diff --git a/usr.sbin/kldxref/ef_amd64.c b/usr.sbin/kldxref/ef_amd64.c
index 445640a..5a1d192 100644
--- a/usr.sbin/kldxref/ef_amd64.c
+++ b/usr.sbin/kldxref/ef_amd64.c
@@ -48,7 +48,7 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
 	Elf64_Addr *where, val;
 	Elf32_Addr *where32, val32;
 	Elf_Addr addend, addr;
-	Elf_Word rtype, symidx;
+	Elf_Size rtype, symidx;
 	const Elf_Rel *rel;
 	const Elf_Rela *rela;
 
diff --git a/usr.sbin/kldxref/ef_i386.c b/usr.sbin/kldxref/ef_i386.c
index 0fc726a..4917354 100644
--- a/usr.sbin/kldxref/ef_i386.c
+++ b/usr.sbin/kldxref/ef_i386.c
@@ -46,7 +46,7 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
     Elf_Off dataoff, size_t len, void *dest)
 {
 	Elf_Addr *where, addr, addend;
-	Elf_Word rtype, symidx;
+	Elf_Size rtype, symidx;
 	const Elf_Rel *rel;
 	const Elf_Rela *rela;
 
diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c
index 3ed4e40..b35337b 100644
--- a/usr.sbin/kldxref/ef_obj.c
+++ b/usr.sbin/kldxref/ef_obj.c
@@ -113,7 +113,7 @@ static int ef_obj_seg_read_entry(elf_file_t ef, Elf_Off offset, size_t len,
     void **ptr);
 static int ef_obj_seg_read_entry_rel(elf_file_t ef, Elf_Off offset, size_t len,
     void **ptr);
-static Elf_Addr ef_obj_symaddr(elf_file_t ef, Elf_Word symidx);
+static Elf_Addr ef_obj_symaddr(elf_file_t ef, Elf_Size symidx);
 static int ef_obj_lookup_set(elf_file_t ef, const char *name, long *startp,
     long *stopp, long *countp);
 static int ef_obj_lookup_symbol(elf_file_t ef, const char* name, Elf_Sym** sym);
@@ -176,7 +176,7 @@ ef_obj_lookup_set(elf_file_t ef, const char *name, long *startp, long *stopp,
 }
 
 static Elf_Addr
-ef_obj_symaddr(elf_file_t ef, Elf_Word symidx)
+ef_obj_symaddr(elf_file_t ef, Elf_Size symidx)
 {
 	const Elf_Sym *sym;
 
diff --git a/usr.sbin/kldxref/ef_powerpc.c b/usr.sbin/kldxref/ef_powerpc.c
index aafd9c3..a96a727 100644
--- a/usr.sbin/kldxref/ef_powerpc.c
+++ b/usr.sbin/kldxref/ef_powerpc.c
@@ -48,7 +48,7 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
     Elf_Off dataoff, size_t len, void *dest)
 {
         Elf_Addr *where, addend;
-        Elf_Word rtype, symidx;
+        Elf_Size rtype, symidx;
         const Elf_Rela *rela;
 
 	if (reltype != EF_RELOC_RELA)
diff --git a/usr.sbin/kldxref/ef_sparc64.c b/usr.sbin/kldxref/ef_sparc64.c
index dae6488..7ba2a43 100644
--- a/usr.sbin/kldxref/ef_sparc64.c
+++ b/usr.sbin/kldxref/ef_sparc64.c
@@ -44,7 +44,7 @@ ef_reloc(struct elf_file *ef, const void *reldata, int reltype, Elf_Off relbase,
     Elf_Off dataoff, size_t len, void *dest)
 {
 	const Elf_Rela *a;
-	Elf_Word w;
+	Elf_Size w;
 
 	switch (reltype) {
 	case EF_RELOC_RELA: