Fix build for OLD_FREEBSD_ABI_LABEL

	PR ld/17440
	* elf32-i386.c (elf_i386_fbsd_post_process_headers): Fix build
	for OLD_FREEBSD_ABI_LABEL.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f70cad6ff4ca8bb679a308192e6afb87c68cb53f..e4445dcbb27414257630531435dca0d19c7602da 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/17440
+       * elf32-i386.c (elf_i386_fbsd_post_process_headers): Fix build
+       for OLD_FREEBSD_ABI_LABEL.
+
 2014-09-24  Markus Trippelsdorf  <markus@trippelsdorf.de>
 
        PR 17422

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index a00d47cb5b8cbb850994fb9a9ba98d2261d07da1..afa21b5b6e0ec0076e10ce19303f84c1a8bc1eb6 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -5120,8 +5120,11 @@ elf_i386_fbsd_post_process_headers (bfd *abfd, struct bfd_link_info *info)
   _bfd_elf_post_process_headers (abfd, info);
 
 #ifdef OLD_FREEBSD_ABI_LABEL
-  /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard.  */
-  memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
+  {
+    /* The ABI label supported by FreeBSD <= 4.0 is quite nonstandard.  */
+    Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd);
+    memcpy (&i_ehdrp->e_ident[EI_ABIVERSION], "FreeBSD", 8);
+  }
 #endif
 }