[binutils-gdb] opcodes sources should not include libbfd.h

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=29e0f0a144fcabb6fa088c58b49e5924d7c43967

commit 29e0f0a144fcabb6fa088c58b49e5924d7c43967
Author: Alan Modra <amodra@gmail.com>
Date:   Fri May 18 08:31:13 2018 +0930

    opcodes sources should not include libbfd.h
    
    	* nfp-dis.c: Don't #include libbfd.h.
    	(init_nfp3200_priv): Use bfd_get_section_contents.
    	(nit_nfp6000_mecsr_sec): Likewise.

Diff:
---
 opcodes/ChangeLog |  6 ++++++
 opcodes/nfp-dis.c | 11 ++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d4b74bc..c3f345b 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-18  Alan Modra  <amodra@gmail.com>
+
+	* nfp-dis.c: Don't #include libbfd.h.
+	(init_nfp3200_priv): Use bfd_get_section_contents.
+	(nit_nfp6000_mecsr_sec): Likewise.
+
 2018-05-17  Nick Clifton  <nickc@redhat.com>
 
 	* po/zh_CN.po: Updated simplified Chinese translation.
diff --git a/opcodes/nfp-dis.c b/opcodes/nfp-dis.c
index 9dda34b..e501b14 100644
--- a/opcodes/nfp-dis.c
+++ b/opcodes/nfp-dis.c
@@ -34,7 +34,6 @@
 #include "elf-bfd.h"
 #include "bfd.h"
 #include "bfd_stdint.h"
-#include "libbfd.h"
 
 #define _NFP_ERR_STOP -1
 #define _NFP_ERR_CONT -8
@@ -2573,9 +2572,8 @@ init_nfp3200_priv (nfp_priv_data * priv, struct disassemble_info *dinfo)
 
       mecfg = &priv->mecfgs[isl][menum][1];
 
-      if (!_bfd_generic_get_section_contents (dinfo->section->owner,
-					      sec->bfd_section, buffer,
-					      roff, sizeof (buffer)))
+      if (!bfd_get_section_contents (dinfo->section->owner, sec->bfd_section,
+				     buffer, roff, sizeof (buffer)))
 	return FALSE;
 
       mecfg_ent.ctx_enables = bfd_getl32 (buffer + offsetof (Elf_Nfp_MeConfig,
@@ -2622,9 +2620,8 @@ init_nfp6000_mecsr_sec (nfp_priv_data * priv, Elf_Internal_Shdr * sec,
       uint32_t csr_off;
       nfp_priv_mecfg *mecfg;
 
-      if (!_bfd_generic_get_section_contents (dinfo->section->owner,
-					      sec->bfd_section, buffer,
-					      ireg_off, sizeof (buffer)))
+      if (!bfd_get_section_contents (dinfo->section->owner, sec->bfd_section,
+				     buffer, ireg_off, sizeof (buffer)))
 	return FALSE;
 
       ireg.cpp_offset_lo = bfd_getl32 (buffer