Skip to content

Commit

Permalink
Don't include libbfd.h outside of bfd, part 2
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
amodra committed Jul 16, 2016
1 parent 76e7a75 commit 00dad9a
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 12 deletions.
6 changes: 6 additions & 0 deletions bfd/ChangeLog
Original file line number Diff line number Diff line change
@@ -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..
Expand Down
2 changes: 1 addition & 1 deletion bfd/archures.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions bfd/bfd-in2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions bfd/libbfd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
11 changes: 11 additions & 0 deletions gas/ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 0 additions & 1 deletion gas/config/tc-epiphany.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
1 change: 0 additions & 1 deletion gas/config/tc-frv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion gas/config/tc-ip2k.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
1 change: 0 additions & 1 deletion gas/config/tc-iq2000.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "cgen.h"
#include "elf/common.h"
#include "elf/iq2000.h"
#include "libbfd.h"
#include "sb.h"
#include "macro.h"

Expand Down
1 change: 0 additions & 1 deletion gas/config/tc-m32c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion gas/config/tc-mep.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion gas/config/tc-mt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
1 change: 0 additions & 1 deletion gas/config/tc-nios2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 00dad9a

Please sign in to comment.