From 72de5009312d26000c098d9876e30e631b80fc95 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 13 Mar 2008 05:27:42 +0000
Subject: 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 | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
(limited to 'include/elf')
diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog
index 621f48e4ade..b2e4bebfc5d 100644
--- a/include/elf/ChangeLog
+++ b/include/elf/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-13 Alan Modra <amodra@bigpond.net.au>
+
+ * 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 <amodra@bigpond.net.au>
PR 5900
diff --git a/include/elf/internal.h b/include/elf/internal.h
index cacfc63bf1f..513f6763c82 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 */
+ file_ptr sh_offset; /* Section file offset */
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 */
- 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 */
/* The internal rep also has some cached info associated with it. */
asection * bfd_section; /* Associated BFD section. */
--
cgit v1.2.1