diff options
| author | peter <peter@FreeBSD.org> | 2004-05-18 05:14:19 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2004-05-18 05:14:19 +0000 |
| commit | a6091b3b0818b536c1fe7d7a6bd8d0013e3792bc (patch) | |
| tree | 73e0a4f0e9d120e940aaba07f3876b8028916d9d /sys/kern/link_elf_obj.c | |
| parent | 35d99a4cd32f7b12da9123ae4b39b9b512387cc4 (diff) | |
| download | FreeBSD-src-a6091b3b0818b536c1fe7d7a6bd8d0013e3792bc.zip FreeBSD-src-a6091b3b0818b536c1fe7d7a6bd8d0013e3792bc.tar.gz | |
Remove leftover padding variables.
Convert some silent 'ignore programmer error' cases into panics
Remove 'align' field from section table (no longer needed)
Diffstat (limited to 'sys/kern/link_elf_obj.c')
| -rw-r--r-- | sys/kern/link_elf_obj.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index a4e1b5b..ce53105 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); typedef struct { void *addr; Elf_Off size; - int align; int flags; int sec; /* Original section */ char *name; @@ -83,7 +82,6 @@ typedef struct { typedef struct elf_file { struct linker_file lf; /* Common fields */ - char pad0[80]; caddr_t address; /* Relocation address */ vm_object_t object; /* VM object to hold file pages */ Elf_Shdr *e_shdr; @@ -104,7 +102,6 @@ typedef struct elf_file { caddr_t shstrtab; /* Section name string table */ long shstrcnt; /* number of bytes in string table */ - char pad2[80]; } *elf_file_t; @@ -503,7 +500,6 @@ link_elf_load_file(linker_class_t cls, const char *filename, bzero(ef->progtab[pb].addr, shdr[i].sh_size); } ef->progtab[pb].size = shdr[i].sh_size; - ef->progtab[pb].align = shdr[i].sh_addralign; ef->progtab[pb].sec = i; if (ef->shstrtab && shdr[i].sh_name != 0) ef->progtab[pb].name = @@ -673,7 +669,7 @@ relocate_file(elf_file_t ef) for (i = 0; i < ef->nrel; i++) { rel = ef->reltab[i].rel; if (rel == NULL) - continue; + panic("lost a reltab!"); rellim = rel + ef->reltab[i].nrel; base = findbase(ef, ef->reltab[i].sec); for ( ; rel < rellim; rel++) { @@ -698,7 +694,7 @@ relocate_file(elf_file_t ef) for (i = 0; i < ef->nrela; i++) { rela = ef->relatab[i].rela; if (rela == NULL) - continue; + panic("lost a relatab!"); relalim = rela + ef->relatab[i].nrela; base = findbase(ef, ef->relatab[i].sec); for ( ; rela < relalim; rela++) { @@ -925,7 +921,7 @@ link_elf_reloc_local(linker_file_t lf) for (i = 0; i < ef->nrel; i++) { rel = ef->reltab[i].rel; if (rel == NULL) - continue; + panic("lost a reltab!"); rellim = rel + ef->reltab[i].nrel; base = findbase(ef, ef->reltab[i].sec); for ( ; rel < rellim; rel++) { @@ -945,7 +941,7 @@ link_elf_reloc_local(linker_file_t lf) for (i = 0; i < ef->nrela; i++) { rela = ef->relatab[i].rela; if (rela == NULL) - continue; + panic("lost a relatab!"); relalim = rela + ef->relatab[i].nrela; base = findbase(ef, ef->relatab[i].sec); for ( ; rela < relalim; rela++) { |
