From fe389b5bfae10772b1d311ecd2e38323b4d10c5e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 13 Mar 2008 05:27:41 +0000 Subject: [PATCH] include/elf/ * internal.h (Elf_Internal_Shdr): Change sh_link and sh_info from unsigned long to unsigned int. Change sh_addralign to bfd_vma. Order struct as for external version. bfd/ * elf.c (_bfd_elf_make_section_from_shdr): Remove unnecessary cast. (_bfd_elf_assign_file_position_for_section): Simplify align. (_bfd_elf_init_reloc_shdr): Ensure shift expression wide enough for sh_addralign. (elf_fake_sections, swap_out_syms): Likewise. * elflink.c (bfd_elf_final_link): Likewise. binutils/ * readelf.c: Use %u throughout when printing sh_link or sh_info, %lu when printing sh_addralign. (process_version_sections): Use identical formats when printing all offset and sh_link fields. --- include/elf/ChangeLog | 6 ++++++ include/elf/internal.h | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 621f48e4a..b2e4bebfc 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,9 @@ +2008-03-13 Alan Modra + + * internal.h (Elf_Internal_Shdr): Change sh_link and sh_info from + unsigned long to unsigned int. Change sh_addralign to bfd_vma. + Order struct as for external version. + 2008-03-12 Alan Modra PR 5900 diff --git a/include/elf/internal.h b/include/elf/internal.h index cacfc63bf..513f6763c 100644 --- a/include/elf/internal.h +++ b/include/elf/internal.h @@ -105,12 +105,12 @@ typedef struct elf_internal_shdr { unsigned int sh_type; /* Type of section */ bfd_vma sh_flags; /* Miscellaneous section attributes */ bfd_vma sh_addr; /* Section virtual addr at execution */ - bfd_size_type sh_size; /* Size of section in bytes */ - bfd_size_type sh_entsize; /* Entry size if section holds table */ - unsigned long sh_link; /* Index of another section */ - unsigned long sh_info; /* Additional section information */ file_ptr sh_offset; /* Section file offset */ - unsigned int sh_addralign; /* Section alignment */ + bfd_size_type sh_size; /* Size of section in bytes */ + unsigned int sh_link; /* Index of another section */ + unsigned int sh_info; /* Additional section information */ + bfd_vma sh_addralign; /* Section alignment */ + bfd_size_type sh_entsize; /* Entry size if section holds table */ /* The internal rep also has some cached info associated with it. */ asection * bfd_section; /* Associated BFD section. */