From: Alan Modra <amodra@gmail.com>
Date: Mon, 23 Sep 2019 00:37:40 +0000 (+0930)
Subject: coff bfd.h tidy
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=aa739c59d3db95d1709b0417cdf7d082bfdea911;p=deliverable%2Fbinutils-gdb.git

coff bfd.h tidy

bfd/
	* bfd-in.h: Delete coff forward refs and move coff declaration..
	* coff-bfd.h: ..to here.
	* bfd-in2.h: Regenerate.
binutils/
	* dlltool.c: Include coff-bfd.h.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c1f82cda92..696eeacc55 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2019-09-23  Alan Modra  <amodra@gmail.com>
+
+	* bfd-in.h: Delete coff forward refs and move coff declaration..
+	* coff-bfd.h: ..to here.
+	* bfd-in2.h: Regenerate.
+
 2019-09-23  Alan Modra  <amodra@gmail.com>
 
 	* bfd-in.h: Move arm declaraions..
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 124a0c2b81..a629a8430d 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -753,13 +753,3 @@ extern bfd_boolean bfd_xcoff_link_generate_rtinit
 /* XCOFF support routines for ar.  */
 extern bfd_boolean bfd_xcoff_ar_archive_set_magic
   (bfd *, char *);
-
-/* Externally visible COFF routines.  */
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct internal_syment;
-union internal_auxent;
-#endif
-
-extern bfd_boolean bfd_coff_set_symbol_class
-  (bfd *, struct bfd_symbol *, unsigned int);
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 052a826176..e7537f7eaf 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -760,16 +760,6 @@ extern bfd_boolean bfd_xcoff_link_generate_rtinit
 /* XCOFF support routines for ar.  */
 extern bfd_boolean bfd_xcoff_ar_archive_set_magic
   (bfd *, char *);
-
-/* Externally visible COFF routines.  */
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct internal_syment;
-union internal_auxent;
-#endif
-
-extern bfd_boolean bfd_coff_set_symbol_class
-  (bfd *, struct bfd_symbol *, unsigned int);
 /* Extracted from init.c.  */
 unsigned int bfd_init (void);
 
diff --git a/bfd/coff-bfd.h b/bfd/coff-bfd.h
index 20c2a44e33..b88c5bee02 100644
--- a/bfd/coff-bfd.h
+++ b/bfd/coff-bfd.h
@@ -86,3 +86,6 @@ extern bfd_boolean bfd_coff_get_syment
 
 extern bfd_boolean bfd_coff_get_auxent
   (bfd *, struct bfd_symbol *, int, union internal_auxent *);
+
+extern bfd_boolean bfd_coff_set_symbol_class
+  (bfd *, struct bfd_symbol *, unsigned int);
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a2ac2b752d..45817f41ec 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-23  Alan Modra  <amodra@gmail.com>
+
+	* dlltool.c: Include coff-bfd.h.
+
 2019-09-23  Alan Modra  <amodra@gmail.com>
 
 	PR 25018
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 85304d0c37..6c4737e709 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -240,6 +240,7 @@
 #include "bucomm.h"
 #include "dlltool.h"
 #include "safe-ctype.h"
+#include "coff-bfd.h"
 
 #include <time.h>
 #include <assert.h>