From 0ba9378a2ad073524f20e9637dac8369ef06c639 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 23 Sep 2019 10:13:26 +0930 Subject: [PATCH] ecoff bfd.h tidy bfd/ * bfd-in.h: Move ecoff function declarations.. * ecoff-bfd.h: ..to here, new file. * ecoff.c: Include ecoff-bfd.h. * ecofflink.c: Likewise. * elf64-alpha.c: Likewise. * elfxx-mips.c: Likewise. * bfd-in2.h: Regenerate. gas/ * config/obj-ecoff.c: Include ecoff-bfd.h. * config/obj-elf.c: Likewise. --- bfd/ChangeLog | 10 +++++++ bfd/bfd-in.h | 42 ------------------------------ bfd/bfd-in2.h | 42 ------------------------------ bfd/ecoff-bfd.h | 59 ++++++++++++++++++++++++++++++++++++++++++ bfd/ecoff.c | 1 + bfd/ecofflink.c | 1 + bfd/elf64-alpha.c | 1 + bfd/elfxx-mips.c | 1 + gas/ChangeLog | 5 ++++ gas/config/obj-ecoff.c | 1 + gas/config/obj-elf.c | 1 + 11 files changed, 80 insertions(+), 84 deletions(-) create mode 100644 bfd/ecoff-bfd.h diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 62115f25c66..923adb4ea6f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2019-09-23 Alan Modra + + * bfd-in.h: Move ecoff function declarations.. + * ecoff-bfd.h: ..to here, new file. + * ecoff.c: Include ecoff-bfd.h. + * ecofflink.c: Likewise. + * elf64-alpha.c: Likewise. + * elfxx-mips.c: Likewise. + * bfd-in2.h: Regenerate. + 2019-09-23 Alan Modra * bfd-in.h (enum notice_asneeded_action): Move to bfdlink.h. diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index de8479cf727..4d2f09f7183 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -526,48 +526,6 @@ extern bfd_boolean _bfd_handle_already_linked (struct bfd_section *, struct bfd_section_already_linked *, struct bfd_link_info *); -/* Externally visible ECOFF routines. */ - -extern bfd_boolean bfd_ecoff_set_gp_value - (bfd *abfd, bfd_vma gp_value); -extern bfd_boolean bfd_ecoff_set_regmasks - (bfd *abfd, unsigned long gprmask, unsigned long fprmask, - unsigned long *cprmask); -extern void *bfd_ecoff_debug_init - (bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, struct bfd_link_info *); -extern void bfd_ecoff_debug_free - (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, struct bfd_link_info *); -extern bfd_boolean bfd_ecoff_debug_accumulate - (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, bfd *input_bfd, - struct ecoff_debug_info *input_debug, - const struct ecoff_debug_swap *input_swap, struct bfd_link_info *); -extern bfd_boolean bfd_ecoff_debug_accumulate_other - (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, bfd *input_bfd, - struct bfd_link_info *); -extern bfd_boolean bfd_ecoff_debug_externals - (bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, bfd_boolean relocatable, - bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *), - void (*set_index) (struct bfd_symbol *, bfd_size_type)); -extern bfd_boolean bfd_ecoff_debug_one_external - (bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, const char *name, - struct ecoff_extr *esym); -extern bfd_size_type bfd_ecoff_debug_size - (bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap); -extern bfd_boolean bfd_ecoff_write_debug - (bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, file_ptr where); -extern bfd_boolean bfd_ecoff_write_accumulated_debug - (void *handle, bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, - struct bfd_link_info *info, file_ptr where); - /* Externally visible ELF routines. */ /* Create a new BFD as if by bfd_openr. Rather than opening a file, diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 30b2685a83e..16fa4624302 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -533,48 +533,6 @@ extern bfd_boolean _bfd_handle_already_linked (struct bfd_section *, struct bfd_section_already_linked *, struct bfd_link_info *); -/* Externally visible ECOFF routines. */ - -extern bfd_boolean bfd_ecoff_set_gp_value - (bfd *abfd, bfd_vma gp_value); -extern bfd_boolean bfd_ecoff_set_regmasks - (bfd *abfd, unsigned long gprmask, unsigned long fprmask, - unsigned long *cprmask); -extern void *bfd_ecoff_debug_init - (bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, struct bfd_link_info *); -extern void bfd_ecoff_debug_free - (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, struct bfd_link_info *); -extern bfd_boolean bfd_ecoff_debug_accumulate - (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, bfd *input_bfd, - struct ecoff_debug_info *input_debug, - const struct ecoff_debug_swap *input_swap, struct bfd_link_info *); -extern bfd_boolean bfd_ecoff_debug_accumulate_other - (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, - const struct ecoff_debug_swap *output_swap, bfd *input_bfd, - struct bfd_link_info *); -extern bfd_boolean bfd_ecoff_debug_externals - (bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, bfd_boolean relocatable, - bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *), - void (*set_index) (struct bfd_symbol *, bfd_size_type)); -extern bfd_boolean bfd_ecoff_debug_one_external - (bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, const char *name, - struct ecoff_extr *esym); -extern bfd_size_type bfd_ecoff_debug_size - (bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap); -extern bfd_boolean bfd_ecoff_write_debug - (bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, file_ptr where); -extern bfd_boolean bfd_ecoff_write_accumulated_debug - (void *handle, bfd *abfd, struct ecoff_debug_info *debug, - const struct ecoff_debug_swap *swap, - struct bfd_link_info *info, file_ptr where); - /* Externally visible ELF routines. */ /* Create a new BFD as if by bfd_openr. Rather than opening a file, diff --git a/bfd/ecoff-bfd.h b/bfd/ecoff-bfd.h new file mode 100644 index 00000000000..00ecf010f41 --- /dev/null +++ b/bfd/ecoff-bfd.h @@ -0,0 +1,59 @@ +/* Externally visible ECOFF routines. + Copyright (C) 2019 Free Software Foundation, Inc. + + This file is part of BFD, the Binary File Descriptor library. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ + +extern bfd_boolean bfd_ecoff_set_gp_value + (bfd *abfd, bfd_vma gp_value); +extern bfd_boolean bfd_ecoff_set_regmasks + (bfd *abfd, unsigned long gprmask, unsigned long fprmask, + unsigned long *cprmask); +extern void *bfd_ecoff_debug_init + (bfd *output_bfd, struct ecoff_debug_info *output_debug, + const struct ecoff_debug_swap *output_swap, struct bfd_link_info *); +extern void bfd_ecoff_debug_free + (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, + const struct ecoff_debug_swap *output_swap, struct bfd_link_info *); +extern bfd_boolean bfd_ecoff_debug_accumulate + (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, + const struct ecoff_debug_swap *output_swap, bfd *input_bfd, + struct ecoff_debug_info *input_debug, + const struct ecoff_debug_swap *input_swap, struct bfd_link_info *); +extern bfd_boolean bfd_ecoff_debug_accumulate_other + (void *handle, bfd *output_bfd, struct ecoff_debug_info *output_debug, + const struct ecoff_debug_swap *output_swap, bfd *input_bfd, + struct bfd_link_info *); +extern bfd_boolean bfd_ecoff_debug_externals + (bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap, bfd_boolean relocatable, + bfd_boolean (*get_extr) (struct bfd_symbol *, struct ecoff_extr *), + void (*set_index) (struct bfd_symbol *, bfd_size_type)); +extern bfd_boolean bfd_ecoff_debug_one_external + (bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap, const char *name, + struct ecoff_extr *esym); +extern bfd_size_type bfd_ecoff_debug_size + (bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap); +extern bfd_boolean bfd_ecoff_write_debug + (bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap, file_ptr where); +extern bfd_boolean bfd_ecoff_write_accumulated_debug + (void *handle, bfd *abfd, struct ecoff_debug_info *debug, + const struct ecoff_debug_swap *swap, + struct bfd_link_info *info, file_ptr where); diff --git a/bfd/ecoff.c b/bfd/ecoff.c index 30adba0e6d2..be3d42e305f 100644 --- a/bfd/ecoff.c +++ b/bfd/ecoff.c @@ -24,6 +24,7 @@ #include "bfd.h" #include "bfdlink.h" #include "libbfd.h" +#include "ecoff-bfd.h" #include "aout/ar.h" #include "aout/stab_gnu.h" diff --git a/bfd/ecofflink.c b/bfd/ecofflink.c index 47e210b56ef..1345e917ac7 100644 --- a/bfd/ecofflink.c +++ b/bfd/ecofflink.c @@ -23,6 +23,7 @@ #include "bfd.h" #include "bfdlink.h" #include "libbfd.h" +#include "ecoff-bfd.h" #include "objalloc.h" #include "aout/stab_gnu.h" #include "coff/internal.h" diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c index 84ec83b74af..3ea12891579 100644 --- a/bfd/elf64-alpha.c +++ b/bfd/elf64-alpha.c @@ -27,6 +27,7 @@ #include "bfd.h" #include "libbfd.h" #include "elf-bfd.h" +#include "ecoff-bfd.h" #include "elf/alpha.h" diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index 496e42e7c5d..3462c8b1511 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -33,6 +33,7 @@ #include "libbfd.h" #include "libiberty.h" #include "elf-bfd.h" +#include "ecoff-bfd.h" #include "elfxx-mips.h" #include "elf/mips.h" #include "elf-vxworks.h" diff --git a/gas/ChangeLog b/gas/ChangeLog index cab918a49c3..764789bca0d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2019-09-23 Alan Modra + + * config/obj-ecoff.c: Include ecoff-bfd.h. + * config/obj-elf.c: Likewise. + 2019-09-23 Alan Modra * config/tc-arm.c: Include cpu-arm.h. diff --git a/gas/config/obj-ecoff.c b/gas/config/obj-ecoff.c index a5616f388e8..d8e4f400d7b 100644 --- a/gas/config/obj-ecoff.c +++ b/gas/config/obj-ecoff.c @@ -25,6 +25,7 @@ #include "coff/internal.h" #include "bfd/libcoff.h" #include "bfd/libecoff.h" +#include "bfd/ecoff-bfd.h" /* Almost all of the ECOFF support is actually in ecoff.c in the main gas directory. This file mostly just arranges to call that one at diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index 56293584a0a..ee93628d70a 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -33,6 +33,7 @@ #ifdef NEED_ECOFF_DEBUG #include "ecoff.h" +#include "bfd/ecoff-bfd.h" #endif #ifdef TC_ALPHA -- 2.30.2