From e30d16e9ecd56cd2557b30ae1116946d772944b3 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Wed, 9 Apr 2014 13:25:04 +0930
Subject: [PATCH] Fix fallout from splitting ldbuildid.[ch] off elf32.em.

bfd/
	* libcoff.h: Regenerate.
ld/
	* emultempl/spuelf.em: Include safe-ctype.h, remove duplicate errno.h.
	* emultempl/nds32elf.em: Include bfd_stdint.h.
	* po/POTFILES.in: Regenerate.
---
 bfd/ChangeLog            | 4 ++++
 bfd/libcoff.h            | 2 +-
 ld/ChangeLog             | 6 ++++++
 ld/emultempl/nds32elf.em | 1 +
 ld/emultempl/spuelf.em   | 2 +-
 ld/po/POTFILES.in        | 2 ++
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b95d49c6f2..e38c6a4d5d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-09  Alan Modra  <amodra@gmail.com>
+
+	* libcoff.h: Regenerate.
+
 2014-04-09  Alan Modra  <amodra@gmail.com>
 
 	* elf32-ppc.c (ppc_elf_relocate_section): Remove bctr from list
diff --git a/bfd/libcoff.h b/bfd/libcoff.h
index 6cb387ceb8..19ba7e7cf9 100644
--- a/bfd/libcoff.h
+++ b/bfd/libcoff.h
@@ -124,7 +124,7 @@ typedef struct pe_tdata
   bfd_boolean (*in_reloc_p) (bfd *, reloc_howto_type *);
   flagword real_flags;
 
-  /* build-id info. */
+  /* Build-id info.  */
   struct
   {
     bfd_boolean (*after_write_object_contents) (bfd *);
diff --git a/ld/ChangeLog b/ld/ChangeLog
index b64c2e6af6..447e4a71ce 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-09  Alan Modra  <amodra@gmail.com>
+
+	* emultempl/spuelf.em: Include safe-ctype.h, remove duplicate errno.h.
+	* emultempl/nds32elf.em: Include bfd_stdint.h.
+	* po/POTFILES.in: Regenerate.
+
 2014-04-09  Alan Modra  <amodra@gmail.com>
 
 	* emultempl/ppc32elf.em (no_zero_padding, ppc_finish): New functions.
diff --git a/ld/emultempl/nds32elf.em b/ld/emultempl/nds32elf.em
index 417eda5bc3..96e6aa3810 100644
--- a/ld/emultempl/nds32elf.em
+++ b/ld/emultempl/nds32elf.em
@@ -25,6 +25,7 @@ fragment <<EOF
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/nds32.h"
+#include "bfd_stdint.h"
 #include "elf32-nds32.h"
 
 static int relax_fp_as_gp = 1;		/* --mrelax-omit-fp  */
diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
index eaf4de70e4..5167b35a75 100644
--- a/ld/emultempl/spuelf.em
+++ b/ld/emultempl/spuelf.em
@@ -447,7 +447,7 @@ EOF
 
 if grep -q 'ld_elf.*ppc.*_emulation' ldemul-list.h; then
   fragment <<EOF
-#include <errno.h>
+#include "safe-ctype.h"
 #include "filenames.h"
 #include "libiberty.h"
 
diff --git a/ld/po/POTFILES.in b/ld/po/POTFILES.in
index 55cbd13cc3..fcc2894406 100644
--- a/ld/po/POTFILES.in
+++ b/ld/po/POTFILES.in
@@ -3,6 +3,8 @@ elf-hints-local.h
 emultempl/armcoff.em
 emultempl/pe.em
 ld.h
+ldbuildid.c
+ldbuildid.h
 ldcref.c
 ldctor.c
 ldctor.h
-- 
2.34.1