From 8410a6589d7fd1e02489e7ab57bda0fcba305dba Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 23 Sep 2019 10:10:28 +0930 Subject: [PATCH] bfin bfd.h tidy bfd/ * bfd-in.h: Move bfin function declaration.. * elf32-bfin.h: ..to here, new file. * elf32-bfin.c: Include elf32-bfin.h. * bfd-in2.h: Regenerate. ld/ * emultempl/bfin.em: Include elf32-bfin.h. --- bfd/ChangeLog | 7 +++++++ bfd/bfd-in.h | 4 ---- bfd/bfd-in2.h | 4 ---- bfd/elf32-bfin.c | 1 + bfd/elf32-bfin.h | 23 +++++++++++++++++++++++ ld/ChangeLog | 4 ++++ ld/emultempl/bfin.em | 1 + 7 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 bfd/elf32-bfin.h diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0b5ef9786fc..36a3c61974d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2019-09-23 Alan Modra + + * bfd-in.h: Move bfin function declaration.. + * elf32-bfin.h: ..to here, new file. + * elf32-bfin.c: Include elf32-bfin.h. + * bfd-in2.h: Regenerate. + 2019-09-23 Alan Modra * bfd-in.h: Move cr16 function declaration.. diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 61992feacb7..7cc35d99854 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -674,10 +674,6 @@ extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs extern void bfd_elf_m68k_set_target_options (struct bfd_link_info *, int); -extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs - (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, - char **); - /* mmap hacks */ struct _bfd_window_internal; diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 257f9307cc9..424c27b53d1 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -681,10 +681,6 @@ extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs extern void bfd_elf_m68k_set_target_options (struct bfd_link_info *, int); -extern bfd_boolean bfd_bfin_elf32_create_embedded_relocs - (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, - char **); - /* mmap hacks */ struct _bfd_window_internal; diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c index 6efee04c8bb..c4f8874b24f 100644 --- a/bfd/elf32-bfin.c +++ b/bfd/elf32-bfin.c @@ -25,6 +25,7 @@ #include "elf/bfin.h" #include "dwarf2.h" #include "hashtab.h" +#include "elf32-bfin.h" /* FUNCTION : bfin_pltpc_reloc ABSTRACT : TODO : figure out how to handle pltpc relocs. */ diff --git a/bfd/elf32-bfin.h b/bfd/elf32-bfin.h new file mode 100644 index 00000000000..1f294e8f390 --- /dev/null +++ b/bfd/elf32-bfin.h @@ -0,0 +1,23 @@ +/* ADI Blackfin BFD support for 32-bit ELF. + 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_bfin_elf32_create_embedded_relocs + (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, + char **); diff --git a/ld/ChangeLog b/ld/ChangeLog index 60a1fd6f025..1cea946ce40 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2019-09-23 Alan Modra + + * emultempl/bfin.em: Include elf32-bfin.h. + 2019-09-23 Alan Modra * emultempl/cr16elf.em: Include elf32-cr16.h. diff --git a/ld/emultempl/bfin.em b/ld/emultempl/bfin.em index c6b3ae007dd..75aa36b54a9 100644 --- a/ld/emultempl/bfin.em +++ b/ld/emultempl/bfin.em @@ -25,6 +25,7 @@ fragment <