From ca437b1b5fe3d3dd7987ddf6c373bc2221c0726e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 23 Sep 2019 10:03:04 +0930 Subject: [PATCH] h8300 bfd.h tidy * bfd-in.h: Move h8300 function declaration to.. * cpu-h8300.h: ..here, new file. * cpu-h8300.c: Include cpu-h8300.h. * elf32-h8300.c: Likewise. * bfd-in2.h: Regenerate. --- bfd/ChangeLog | 8 ++++++++ bfd/bfd-in.h | 4 ---- bfd/bfd-in2.h | 4 ---- bfd/cpu-h8300.c | 1 + bfd/cpu-h8300.h | 22 ++++++++++++++++++++++ bfd/elf32-h8300.c | 1 + 6 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 bfd/cpu-h8300.h diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a08cd7e20f0..9130fd510bb 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2019-09-23 Alan Modra + + * bfd-in.h: Move h8300 function declaration to.. + * cpu-h8300.h: ..here, new file. + * cpu-h8300.c: Include cpu-h8300.h. + * elf32-h8300.c: Likewise. + * bfd-in2.h: Regenerate. + 2019-09-23 Alan Modra * bfd-in.h: Move ia64 function declarations.. diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 1d0262ffaec..4216808c2ad 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -1001,7 +1001,3 @@ extern void bfd_ticoff_set_section_load_page extern int bfd_ticoff_get_section_load_page (struct bfd_section *); - -/* H8/300 functions. */ -extern bfd_vma bfd_h8300_pad_address - (bfd *, bfd_vma); diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 88ca55011a2..a5c0f5806d3 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1008,10 +1008,6 @@ extern void bfd_ticoff_set_section_load_page extern int bfd_ticoff_get_section_load_page (struct bfd_section *); - -/* H8/300 functions. */ -extern bfd_vma bfd_h8300_pad_address - (bfd *, bfd_vma); /* Extracted from init.c. */ unsigned int bfd_init (void); diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c index 53dd4ec52b5..3dc2ac7c1b6 100644 --- a/bfd/cpu-h8300.c +++ b/bfd/cpu-h8300.c @@ -22,6 +22,7 @@ #include "sysdep.h" #include "bfd.h" #include "libbfd.h" +#include "cpu-h8300.h" static bfd_boolean h8300_scan (const struct bfd_arch_info *info, const char *string) diff --git a/bfd/cpu-h8300.h b/bfd/cpu-h8300.h new file mode 100644 index 00000000000..9a51089c93f --- /dev/null +++ b/bfd/cpu-h8300.h @@ -0,0 +1,22 @@ +/* H8/300 functions. + 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_vma bfd_h8300_pad_address + (bfd *, bfd_vma); diff --git a/bfd/elf32-h8300.c b/bfd/elf32-h8300.c index ba7c8b2062d..f0a04e222d4 100644 --- a/bfd/elf32-h8300.c +++ b/bfd/elf32-h8300.c @@ -23,6 +23,7 @@ #include "libbfd.h" #include "elf-bfd.h" #include "elf/h8.h" +#include "cpu-h8300.h" static reloc_howto_type *elf32_h8_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code); -- 2.30.2