From 9706b5e627dfae1ab0a2788dda8a2aa5a0e09af7 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 4 Oct 2015 06:14:13 -0700 Subject: Change ch_type to Elf_Word in struct Chdr_data<64> The ch_type field in struct Chdr_data<64> is 4 bytes, followed by a 4-byte padding. This change doesn't introduce any functional change since only the lower 32 bits of the ch_type field are used. PR gold/19060 * elfcpp.h (Chdr::get_ch_type): Change return type to Elf_Word. * elfcpp_internal.h (Chdr_data<64>): Change ch_type to 4 bytes and add ch_reserved. --- elfcpp/elfcpp_internal.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'elfcpp/elfcpp_internal.h') diff --git a/elfcpp/elfcpp_internal.h b/elfcpp/elfcpp_internal.h index 424a1f6..6f9dd48 100644 --- a/elfcpp/elfcpp_internal.h +++ b/elfcpp/elfcpp_internal.h @@ -82,11 +82,23 @@ struct Shdr_data // An ELF compression header. template -struct Chdr_data +struct Chdr_data; + +template<> +struct Chdr_data<32> +{ + Elf_Word ch_type; + Elf_Word ch_size; + Elf_Word ch_addralign; +}; + +template<> +struct Chdr_data<64> { - typename Elf_types::Elf_WXword ch_type; - typename Elf_types::Elf_WXword ch_size; - typename Elf_types::Elf_WXword ch_addralign; + Elf_Word ch_type; + Elf_Word ch_reserved; + Elf_Xword ch_size; + Elf_Xword ch_addralign; }; // An ELF segment header. We use template specialization for the -- cgit v1.1