diff options
author | dfr <dfr@FreeBSD.org> | 2002-05-30 08:32:18 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 2002-05-30 08:32:18 +0000 |
commit | a3b8e6c9c72cf42141179b64b200c58dd43762dc (patch) | |
tree | 7aa8325b3ff6965ce0b445a1902564106a57c21a /sys | |
parent | 1f82eddce75c04017bcd25e1cae002a67f2c3fdd (diff) | |
download | FreeBSD-src-a3b8e6c9c72cf42141179b64b200c58dd43762dc.zip FreeBSD-src-a3b8e6c9c72cf42141179b64b200c58dd43762dc.tar.gz |
Move the definition of ElfN_Hashelt to common headers. The only platform
which has a different definition for this is alpha.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/alpha/include/elf.h | 11 | ||||
-rw-r--r-- | sys/amd64/include/elf.h | 11 | ||||
-rw-r--r-- | sys/i386/include/elf.h | 11 | ||||
-rw-r--r-- | sys/ia64/include/elf.h | 11 | ||||
-rw-r--r-- | sys/powerpc/include/elf.h | 11 | ||||
-rw-r--r-- | sys/sparc64/include/elf.h | 11 | ||||
-rw-r--r-- | sys/sys/elf32.h | 1 | ||||
-rw-r--r-- | sys/sys/elf64.h | 13 | ||||
-rw-r--r-- | sys/sys/elf_generic.h | 1 |
9 files changed, 15 insertions, 66 deletions
diff --git a/sys/alpha/include/elf.h b/sys/alpha/include/elf.h index d3a935a..f606ada 100644 --- a/sys/alpha/include/elf.h +++ b/sys/alpha/include/elf.h @@ -60,17 +60,6 @@ typedef struct { /* Auxiliary vector entry on initial stack */ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf64_Off Elf64_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h index 1b718d0..46d512c 100644 --- a/sys/amd64/include/elf.h +++ b/sys/amd64/include/elf.h @@ -60,17 +60,6 @@ typedef struct { /* Auxiliary vector entry on initial stack */ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf32_Off Elf32_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h index 1b718d0..46d512c 100644 --- a/sys/i386/include/elf.h +++ b/sys/i386/include/elf.h @@ -60,17 +60,6 @@ typedef struct { /* Auxiliary vector entry on initial stack */ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf32_Off Elf32_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ diff --git a/sys/ia64/include/elf.h b/sys/ia64/include/elf.h index 271dc20..1160293 100644 --- a/sys/ia64/include/elf.h +++ b/sys/ia64/include/elf.h @@ -60,17 +60,6 @@ typedef struct { /* Auxiliary vector entry on initial stack */ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf64_Half Elf64_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ diff --git a/sys/powerpc/include/elf.h b/sys/powerpc/include/elf.h index 0ab7d5f..01248f0 100644 --- a/sys/powerpc/include/elf.h +++ b/sys/powerpc/include/elf.h @@ -63,17 +63,6 @@ typedef struct { /* Auxiliary vector entry on initial stack */ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf32_Off Elf32_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ diff --git a/sys/sparc64/include/elf.h b/sys/sparc64/include/elf.h index 059c483..e1e31c0 100644 --- a/sys/sparc64/include/elf.h +++ b/sys/sparc64/include/elf.h @@ -57,17 +57,6 @@ typedef struct { /* Auxiliary vector entry on initial stack */ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf64_Half Elf64_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h index 309f1a4..55ba93d 100644 --- a/sys/sys/elf32.h +++ b/sys/sys/elf32.h @@ -41,6 +41,7 @@ typedef u_int32_t Elf32_Off; typedef int32_t Elf32_Sword; typedef u_int32_t Elf32_Word; typedef u_int32_t Elf32_Size; +typedef Elf32_Off Elf32_Hashelt; /* * ELF header. diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h index 022b174..9118d43 100644 --- a/sys/sys/elf64.h +++ b/sys/sys/elf64.h @@ -44,6 +44,19 @@ typedef u_int64_t Elf64_Size; typedef u_int16_t Elf64_Quarter; /* + * Types of dynamic symbol hash table bucket and chain elements. + * + * This is inconsistent among 64 bit architectures, so a machine dependent + * typedef is required. + */ + +#ifdef __alpha__ +typedef Elf64_Off Elf64_Hashelt; +#else +typedef Elf64_Half Elf64_Hashelt; +#endif + +/* * ELF header. */ diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h index 32c3e16..cf8da57 100644 --- a/sys/sys/elf_generic.h +++ b/sys/sys/elf_generic.h @@ -60,6 +60,7 @@ __ElfType(Off); __ElfType(Sword); __ElfType(Word); __ElfType(Size); +__ElfType(Hashelt); __ElfType(Ehdr); __ElfType(Shdr); __ElfType(Phdr); |