Don't include libbfd.h outside of bfd, part 2

Make bfd_default_set_arch_mach available to a bunch of gas backend
files.

bfd/
	* archures.c (bfd_default_set_arch_mach): Make available in bfd.h.
	* libbfd.h: Regenerate.
	* bfd-in2.h: Regenerate.
gas/
	* config/tc-epiphany.c: Don't include libbfd.h.
	* config/tc-frv.c: Likewise.
	* config/tc-ip2k.c: Likewise.
	* config/tc-iq2000.c: Likewise.
	* config/tc-m32c.c: Likewise.
	* config/tc-mep.c: Likewise.
	* config/tc-mt.c: Likewise.
	* config/tc-nios2.c: Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2c67bd7674641529de42866ce8fd660aeedd7c9b..ba678b6a9470ade4647bcd9851ab39441b1cb033 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-16  Alan Modra  <amodra@gmail.com>
+
+       * archures.c (bfd_default_set_arch_mach): Make available in bfd.h.
+       * libbfd.h: Regenerate.
+       * bfd-in2.h: Regenerate.
+
 2016-07-16  Alan Modra  <amodra@gmail.com>
 
        * libbfd-in.h (BFD_ALIGN): Move to..

diff --git a/bfd/archures.c b/bfd/archures.c
index 96c91099ac203ec7c5f26b3aa0ff597b3b9d2522..af70b18157c000a3681e8866c683c4e4b4d40c88 100644 (file)
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -934,7 +934,7 @@ bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg)
 }
 
 /*
-INTERNAL_FUNCTION
+FUNCTION
        bfd_default_set_arch_mach
 
 SYNOPSIS

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 5fffc46c333aa1b9d6f4ed42254b2063644208e3..8b12547d9a576c9cb0750ad60069b837367c09b0 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -2387,6 +2387,9 @@ const bfd_arch_info_type *bfd_arch_get_compatible
 
 void bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg);
 
+bfd_boolean bfd_default_set_arch_mach
+   (bfd *abfd, enum bfd_architecture arch, unsigned long mach);
+
 enum bfd_architecture bfd_get_arch (bfd *abfd);
 
 unsigned long bfd_get_mach (bfd *abfd);

diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index eb6312b1ea0cb569414128d6350fb58b873d66b1..9d751ee43a3688f59b7b698bda3624bcb4b50a4f 100644 (file)
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -3148,9 +3148,6 @@ bfd_byte *bfd_generic_get_relocated_section_contents
 
 /* Extracted from archures.c.  */
 extern const bfd_arch_info_type bfd_default_arch_struct;
-bfd_boolean bfd_default_set_arch_mach
-   (bfd *abfd, enum bfd_architecture arch, unsigned long mach);
-
 const bfd_arch_info_type *bfd_default_compatible
    (const bfd_arch_info_type *a, const bfd_arch_info_type *b);
 

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 582655e832168a13c89ddf5aedd5635aaf4ea9fe..eaaf1081283e32918190cb2c4c5cd28b661b6288 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+2016-07-16  Alan Modra  <amodra@gmail.com>
+
+       * config/tc-epiphany.c: Don't include libbfd.h.
+       * config/tc-frv.c: Likewise.
+       * config/tc-ip2k.c: Likewise.
+       * config/tc-iq2000.c: Likewise.
+       * config/tc-m32c.c: Likewise.
+       * config/tc-mep.c: Likewise.
+       * config/tc-mt.c: Likewise.
+       * config/tc-nios2.c: Likewise.
+
 2016-07-16  Alan Modra  <amodra@gmail.com>
 
        * config/bfin-parse.y: Don't include libbfd.h.

diff --git a/gas/config/tc-epiphany.c b/gas/config/tc-epiphany.c
index f35198e4e8b9b40f5201796cbae8c429876dd524..d14c3a0f686c321a7f8f40d45d19e165ba292ce9 100644 (file)
--- a/gas/config/tc-epiphany.c
+++ b/gas/config/tc-epiphany.c
@@ -28,7 +28,6 @@
 #include "elf/common.h"
 #include "elf/epiphany.h"
 #include "dwarf2dbg.h"
-#include "libbfd.h"
 
 /* Structure to hold all of the different components describing
    an individual instruction.  */

diff --git a/gas/config/tc-frv.c b/gas/config/tc-frv.c
index 8912f44edc5a6b38d0fa3a6d2ae32cb22fd81b4a..f49096db5005f570f518982585acefd3a05bd417 100644 (file)
--- a/gas/config/tc-frv.c
+++ b/gas/config/tc-frv.c
@@ -24,7 +24,6 @@
 #include "opcodes/frv-desc.h"
 #include "opcodes/frv-opc.h"
 #include "cgen.h"
-#include "libbfd.h"
 #include "elf/common.h"
 #include "elf/frv.h"
 #include "dwarf2dbg.h"

diff --git a/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c
index 642dfea089a44a698d371e7ce101793ea04870af..c1e50c1bdf851b9be510e8d9d2ef181b366cc3e1 100644 (file)
--- a/gas/config/tc-ip2k.c
+++ b/gas/config/tc-ip2k.c
@@ -26,7 +26,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/ip2k.h"
-#include "libbfd.h"
 
 /* Structure to hold all of the different components describing
    an individual instruction.  */

diff --git a/gas/config/tc-iq2000.c b/gas/config/tc-iq2000.c
index f150e19d028805563f9ac25ff676c98343854e08..3bb8726054b55a3cf56170c2eec55d2f0639b91b 100644 (file)
--- a/gas/config/tc-iq2000.c
+++ b/gas/config/tc-iq2000.c
@@ -27,7 +27,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/iq2000.h"
-#include "libbfd.h"
 #include "sb.h"
 #include "macro.h"
 

diff --git a/gas/config/tc-m32c.c b/gas/config/tc-m32c.c
index b28797b38e3f7cd33b3a254498f614f1dfac7f00..ed1d1c83be384b52a676ac1bb4aacef2ca949142 100644 (file)
--- a/gas/config/tc-m32c.c
+++ b/gas/config/tc-m32c.c
@@ -27,7 +27,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/m32c.h"
-#include "libbfd.h"
 #include "safe-ctype.h"
 
 /* Structure to hold all of the different components

diff --git a/gas/config/tc-mep.c b/gas/config/tc-mep.c
index 6128b6e66901db6111c1eb84dceeaf633d7c9a13..f018f742747cea708804835395939546b0febef6 100644 (file)
--- a/gas/config/tc-mep.c
+++ b/gas/config/tc-mep.c
@@ -28,7 +28,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/mep.h"
-#include "libbfd.h"
 #include "xregex.h"
 
 /* Structure to hold all of the different components describing

diff --git a/gas/config/tc-mt.c b/gas/config/tc-mt.c
index e0bca88669470616e880586823d711537fb3c91b..bbcd87e1a0d81b928147b37d0e16431dcc536e60 100644 (file)
--- a/gas/config/tc-mt.c
+++ b/gas/config/tc-mt.c
@@ -27,7 +27,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/mt.h"
-#include "libbfd.h"
 
 /* Structure to hold all of the different components
    describing an individual instruction.  */

diff --git a/gas/config/tc-nios2.c b/gas/config/tc-nios2.c
index 0ddc5017bc738059d679d0558e2b225090a33964..0a1286a0f92cf96cc797b839e9cd3df0686f66b3 100644 (file)
--- a/gas/config/tc-nios2.c
+++ b/gas/config/tc-nios2.c
@@ -25,7 +25,6 @@
 #include "elf/nios2.h"
 #include "tc-nios2.h"
 #include "bfd.h"
-#include "libbfd.h"
 #include "dwarf2dbg.h"
 #include "subsegs.h"
 #include "safe-ctype.h"