diff options
Diffstat (limited to 'usr.sbin/btxld/elfh.c')
| -rw-r--r-- | usr.sbin/btxld/elfh.c | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/usr.sbin/btxld/elfh.c b/usr.sbin/btxld/elfh.c index 75b7e33..2790d5a 100644 --- a/usr.sbin/btxld/elfh.c +++ b/usr.sbin/btxld/elfh.c @@ -27,10 +27,10 @@ */ #include <sys/types.h> +#include <sys/endian.h> #include <stddef.h> #include "elfh.h" -#include "endian.h" #define SET_ME 0xeeeeeeee /* filled in by btxld */ @@ -44,80 +44,80 @@ const struct elfh elfhdr = { ELFCLASS32, ELFDATA2LSB, EV_CURRENT, 0, 'F', 'r', 'e', 'e', 'B', 'S', 'D', 0 }, - HTOLE16(ET_EXEC), /* e_type */ - HTOLE16(EM_386), /* e_machine */ - HTOLE32(EV_CURRENT), /* e_version */ - HTOLE32(SET_ME), /* e_entry */ - HTOLE32(offsetof(struct elfh, p)), /* e_phoff */ - HTOLE32(offsetof(struct elfh, sh)), /* e_shoff */ + htole16(ET_EXEC), /* e_type */ + htole16(EM_386), /* e_machine */ + htole32(EV_CURRENT), /* e_version */ + htole32(SET_ME), /* e_entry */ + htole32(offsetof(struct elfh, p)), /* e_phoff */ + htole32(offsetof(struct elfh, sh)), /* e_shoff */ 0, /* e_flags */ - HTOLE16(sizeof(elfhdr.e)), /* e_ehsize */ - HTOLE16(sizeof(elfhdr.p[0])), /* e_phentsize */ - HTOLE16(sizeof(elfhdr.p) / sizeof(elfhdr.p[0])), /* e_phnum */ - HTOLE16(sizeof(elfhdr.sh[0])), /* e_shentsize */ - HTOLE16(sizeof(elfhdr.sh) / sizeof(elfhdr.sh[0])), /* e_shnum */ - HTOLE16(1) /* e_shstrndx */ + htole16(sizeof(elfhdr.e)), /* e_ehsize */ + htole16(sizeof(elfhdr.p[0])), /* e_phentsize */ + htole16(sizeof(elfhdr.p) / sizeof(elfhdr.p[0])), /* e_phnum */ + htole16(sizeof(elfhdr.sh[0])), /* e_shentsize */ + htole16(sizeof(elfhdr.sh) / sizeof(elfhdr.sh[0])), /* e_shnum */ + htole16(1) /* e_shstrndx */ }, { { - HTOLE32(PT_LOAD), /* p_type */ - HTOLE32(sizeof(elfhdr)), /* p_offset */ - HTOLE32(SET_ME), /* p_vaddr */ - HTOLE32(SET_ME), /* p_paddr */ - HTOLE32(SET_ME), /* p_filesz */ - HTOLE32(SET_ME), /* p_memsz */ - HTOLE32(PF_R | PF_X), /* p_flags */ - HTOLE32(0x1000) /* p_align */ + htole32(PT_LOAD), /* p_type */ + htole32(sizeof(elfhdr)), /* p_offset */ + htole32(SET_ME), /* p_vaddr */ + htole32(SET_ME), /* p_paddr */ + htole32(SET_ME), /* p_filesz */ + htole32(SET_ME), /* p_memsz */ + htole32(PF_R | PF_X), /* p_flags */ + htole32(0x1000) /* p_align */ }, { - HTOLE32(PT_LOAD), /* p_type */ - HTOLE32(SET_ME), /* p_offset */ - HTOLE32(SET_ME), /* p_vaddr */ - HTOLE32(SET_ME), /* p_paddr */ - HTOLE32(SET_ME), /* p_filesz */ - HTOLE32(SET_ME), /* p_memsz */ - HTOLE32(PF_R | PF_W), /* p_flags */ - HTOLE32(0x1000) /* p_align */ + htole32(PT_LOAD), /* p_type */ + htole32(SET_ME), /* p_offset */ + htole32(SET_ME), /* p_vaddr */ + htole32(SET_ME), /* p_paddr */ + htole32(SET_ME), /* p_filesz */ + htole32(SET_ME), /* p_memsz */ + htole32(PF_R | PF_W), /* p_flags */ + htole32(0x1000) /* p_align */ } }, { { - 0, HTOLE32(SHT_NULL), 0, 0, 0, 0, HTOLE32(SHN_UNDEF), 0, 0, 0 + 0, htole32(SHT_NULL), 0, 0, 0, 0, htole32(SHN_UNDEF), 0, 0, 0 }, { - HTOLE32(1), /* sh_name */ - HTOLE32(SHT_STRTAB), /* sh_type */ + htole32(1), /* sh_name */ + htole32(SHT_STRTAB), /* sh_type */ 0, /* sh_flags */ 0, /* sh_addr */ - HTOLE32(offsetof(struct elfh, shstrtab)), /* sh_offset */ - HTOLE32(sizeof(elfhdr.shstrtab)), /* sh_size */ - HTOLE32(SHN_UNDEF), /* sh_link */ + htole32(offsetof(struct elfh, shstrtab)), /* sh_offset */ + htole32(sizeof(elfhdr.shstrtab)), /* sh_size */ + htole32(SHN_UNDEF), /* sh_link */ 0, /* sh_info */ - HTOLE32(1), /* sh_addralign */ + htole32(1), /* sh_addralign */ 0 /* sh_entsize */ }, { - HTOLE32(0xb), /* sh_name */ - HTOLE32(SHT_PROGBITS), /* sh_type */ - HTOLE32(SHF_EXECINSTR | SHF_ALLOC), /* sh_flags */ - HTOLE32(SET_ME), /* sh_addr */ - HTOLE32(SET_ME), /* sh_offset */ - HTOLE32(SET_ME), /* sh_size */ - HTOLE32(SHN_UNDEF), /* sh_link */ + htole32(0xb), /* sh_name */ + htole32(SHT_PROGBITS), /* sh_type */ + htole32(SHF_EXECINSTR | SHF_ALLOC), /* sh_flags */ + htole32(SET_ME), /* sh_addr */ + htole32(SET_ME), /* sh_offset */ + htole32(SET_ME), /* sh_size */ + htole32(SHN_UNDEF), /* sh_link */ 0, /* sh_info */ - HTOLE32(4), /* sh_addralign */ + htole32(4), /* sh_addralign */ 0 /* sh_entsize */ }, { - HTOLE32(0x11), /* sh_name */ - HTOLE32(SHT_PROGBITS), /* sh_type */ - HTOLE32(SHF_ALLOC | SHF_WRITE), /* sh_flags */ - HTOLE32(SET_ME), /* sh_addr */ - HTOLE32(SET_ME), /* sh_offset */ - HTOLE32(SET_ME), /* sh_size */ - HTOLE32(SHN_UNDEF), /* sh_link */ + htole32(0x11), /* sh_name */ + htole32(SHT_PROGBITS), /* sh_type */ + htole32(SHF_ALLOC | SHF_WRITE), /* sh_flags */ + htole32(SET_ME), /* sh_addr */ + htole32(SET_ME), /* sh_offset */ + htole32(SET_ME), /* sh_size */ + htole32(SHN_UNDEF), /* sh_link */ 0, /* sh_info */ - HTOLE32(4), /* sh_addralign */ + htole32(4), /* sh_addralign */ 0 /* sh_entsize */ } }, |
