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 c1f82cda92c08eac4fc2d86414480f102cc3594c..696eeacc5595fe196c98dff1228dff3de94e6119 100644 (file)
--- 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 124a0c2b817e32623fedca1637a547dd4fc78814..a629a8430dfd94394cfc274851cada781577c621 100644 (file)
--- 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 052a826176e6e0a3b5cfc6becb41ca62a7430ea3..e7537f7eaff7dec769a37e1168a505d8243cb01e 100644 (file)
--- 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 20c2a44e33e2323d0c9f18cce59f1edf97ab96f8..b88c5bee02c968f98ac16405374b483fa0438af3 100644 (file)
--- 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 a2ac2b752d949909779c04b39d7922dfcb46f6bf..45817f41ec99ff077ddc4d503a55b60a7f23d279 100644 (file)
--- 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 85304d0c37fcf064ecffe28d451d3ea48e72ce3b..6c4737e7095045545b641be7070a9fac714c9a44 100644 (file)
--- 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>