diff options
| author | Alan Modra <amodra@gmail.com> | 2016-07-16 13:25:11 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-07-16 13:25:11 +0930 |
| commit | 76e7a75123dc36dbc4ddce8a23d2acb171c2bce2 (patch) | |
| tree | 4db37956bee46faf43010262730aa55fded02d33 /binutils | |
| parent | 235fa74903061daff9980668423860ecc760665a (diff) | |
| download | gdb-76e7a75123dc36dbc4ddce8a23d2acb171c2bce2.zip gdb-76e7a75123dc36dbc4ddce8a23d2acb171c2bce2.tar.gz gdb-76e7a75123dc36dbc4ddce8a23d2acb171c2bce2.tar.bz2 | |
Don't include libbfd.h outside of bfd, part 1
Make BFD_ALIGN available to objcopy. Fix assertions. Don't use
bfd_log2 in ppc32elf.em or bfd_malloc in xtensaelf.em and bucomm.c.
bfd/
* libbfd-in.h (BFD_ALIGN): Move to..
* bfd-in.h: ..here.
* elf32-ppc.h (struct ppc_elf_params): Add pagesize.
* elf32-ppc.c (default_params): Adjust init.
(ppc_elf_link_params): Set pagesize_p2.
* libbfd.h: Regenerate.
* bfd-in2.h: Regenerate.
binutils/
* ar.c: Don't include libbfd.h.
* objcopy.c: Likewise.
* bucomm.c (bfd_get_archive_filename): Use xmalloc rather than
bfd_malloc.
gas/
* config/bfin-parse.y: Don't include libbfd.h.
* config/tc-bfin.c: Likewise.
* config/tc-rl78.c: Likewise.
* config/tc-rx.c: Likewise.
* config/tc-metag.c: Likewise.
(create_dspreg_htabs, create_scond_htab): Use gas_assert not BFD_ASSERT.
* Makefile.am: Update dependencies.
* Makefile.in: Regenerate.
ld/
* ldlang.c: Don't include libbfd.h.
* emultempl/nds32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
(pagesize): Delete.
(params): Update init.
(ppc_after_open_output): Use params.pagesize. Don't call bfd_log2.
(PARSE_AND_LIST_ARGS_CASES): Use params.pagesize.
* emultempl/sh64elf.em: Don't include libbfd.h.
(after_allocation): Use ASSERT, not BFD_ASSERT.
* emultempl/xtensaelf.em: Don't include libbfd.h.
(replace_insn_sec_with_prop_sec): Use xmalloc, not bfd_malloc.
* Makefile.am: Update dependencies.
* Makefile.in: Regenerate.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/ar.c | 1 | ||||
| -rw-r--r-- | binutils/bucomm.c | 9 | ||||
| -rw-r--r-- | binutils/objcopy.c | 1 |
4 files changed, 8 insertions, 10 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index bbf94d2..94ec445 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,10 @@ +2016-07-16 Alan Modra <amodra@gmail.com> + + * ar.c: Don't include libbfd.h. + * objcopy.c: Likewise. + * bucomm.c (bfd_get_archive_filename): Use xmalloc rather than + bfd_malloc. + 2016-07-15 Alan Modra <amodra@gmail.com> * testsuite/binutils-all/remove-relocs-01.s: Use .dc.a, not .word. diff --git a/binutils/ar.c b/binutils/ar.c index 3afa253..1337710 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -29,7 +29,6 @@ #include "progress.h" #include "getopt.h" #include "aout/ar.h" -#include "libbfd.h" #include "bucomm.h" #include "arsup.h" #include "filenames.h" diff --git a/binutils/bucomm.c b/binutils/bucomm.c index 8ecd7f2..e719cd3 100644 --- a/binutils/bucomm.c +++ b/binutils/bucomm.c @@ -616,14 +616,7 @@ bfd_get_archive_filename (const bfd *abfd) if (curr) free (buf); curr = needed + (needed >> 1); - buf = (char *) bfd_malloc (curr); - /* If we can't malloc, fail safe by returning just the file name. - This function is only used when building error messages. */ - if (!buf) - { - curr = 0; - return bfd_get_filename (abfd); - } + buf = (char *) xmalloc (curr); } sprintf (buf, "%s(%s)", bfd_get_filename (abfd->my_archive), bfd_get_filename (abfd)); diff --git a/binutils/objcopy.c b/binutils/objcopy.c index cf3f983..2e8ff27 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -28,7 +28,6 @@ #include "filenames.h" #include "fnmatch.h" #include "elf-bfd.h" -#include "libbfd.h" #include "coff/internal.h" #include "libcoff.h" |