From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 28 Sep 2018 22:29:33 +0000 (-0700)
Subject: bfd: Use elfclass instead of bed->s->elfclass
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79c1bf3c71fcf5d453733ee45321e3fbc57b04b2;p=binutils-gdb.git

bfd: Use elfclass instead of bed->s->elfclass

elfclass has been set to bed->s->elfclass earlier.

	* elf-properties.c (_bfd_elf_link_setup_gnu_properties): Use
	elfclass instead of bed->s->elfclass.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fe595c34882..31fb5479a13 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf-properties.c (_bfd_elf_link_setup_gnu_properties): Use
+	elfclass instead of bed->s->elfclass.
+
 2018-09-27  Jim Wilson  <jimw@sifive.com>
 
 	* elfnn-riscv.c (riscv_init_pcgp_relocs): Add explanatory comment.
@@ -239,7 +244,7 @@
 	to calculate header and padding size.  Use filepos of the first
 	section otherwise.
 
-018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/23600
 	* archures.c (bfd_arch_get_compatible): Allow an IR object with
diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c
index 0d98ef1eec6..861db73170b 100644
--- a/bfd/elf-properties.c
+++ b/bfd/elf-properties.c
@@ -488,7 +488,7 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
     {
       bfd_size_type size;
       bfd_byte *contents;
-      unsigned int align_size = bed->s->elfclass == ELFCLASS64 ? 8 : 4;
+      unsigned int align_size = elfclass == ELFCLASS64 ? 8 : 4;
 
       sec = bfd_get_section_by_name (first_pbfd,
 				     NOTE_GNU_PROPERTY_SECTION_NAME);