From f5c5b7c124934b464b67c7c3c53a1c62a7f4e98a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sep 23 2019 00:57:22 +0000 Subject: m68k bfd.h tidy bfd/ * bfd-in.h: Move m68k function declaration.. * cpu-m68k.h: ..to here, new file.. * elf32-m68k.h: ..and here, new file. * elf32-m68k.c: Include cpu-m68k.h and elf32-m68k.h. * bfd-in2.h: Regenerate. ld/ * emultempl/m68kelf.em: Include elf32-m68k.h. opcodes/ * m68k-dis.c: Include cpu-m68k.h --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 36a3c61..fa67c70 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,13 @@ 2019-09-23 Alan Modra + * bfd-in.h: Move m68k function declaration.. + * cpu-m68k.h: ..to here, new file.. + * elf32-m68k.h: ..and here, new file. + * elf32-m68k.c: Include cpu-m68k.h and elf32-m68k.h. + * bfd-in2.h: Regenerate. + +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. diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 7cc35d9..d61467b 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -664,16 +664,6 @@ _bfd_nearby_section (bfd *, struct bfd_section *, bfd_vma); extern void _bfd_fix_excluded_sec_syms (bfd *, struct bfd_link_info *); -extern unsigned bfd_m68k_mach_to_features (int); - -extern int bfd_m68k_features_to_mach (unsigned); - -extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs - (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, - char **); - -extern void bfd_elf_m68k_set_target_options (struct bfd_link_info *, int); - /* mmap hacks */ struct _bfd_window_internal; diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 424c27b..4d27076 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -671,16 +671,6 @@ _bfd_nearby_section (bfd *, struct bfd_section *, bfd_vma); extern void _bfd_fix_excluded_sec_syms (bfd *, struct bfd_link_info *); -extern unsigned bfd_m68k_mach_to_features (int); - -extern int bfd_m68k_features_to_mach (unsigned); - -extern bfd_boolean bfd_m68k_elf32_create_embedded_relocs - (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, - char **); - -extern void bfd_elf_m68k_set_target_options (struct bfd_link_info *, int); - /* mmap hacks */ struct _bfd_window_internal; diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c index b3d3358..bfd32e3 100644 --- a/bfd/cpu-m68k.c +++ b/bfd/cpu-m68k.c @@ -23,6 +23,7 @@ #include "bfd.h" #include "libbfd.h" #include "opcode/m68k.h" +#include "cpu-m68k.h" static const bfd_arch_info_type * bfd_m68k_compatible (const bfd_arch_info_type *a, diff --git a/bfd/cpu-m68k.h b/bfd/cpu-m68k.h new file mode 100644 index 0000000..aed97db --- /dev/null +++ b/bfd/cpu-m68k.h @@ -0,0 +1,23 @@ +/* BFD library support 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 unsigned bfd_m68k_mach_to_features (int); + +extern int bfd_m68k_features_to_mach (unsigned); diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 559578d..9b8652f 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -25,6 +25,8 @@ #include "elf-bfd.h" #include "elf/m68k.h" #include "opcode/m68k.h" +#include "cpu-m68k.h" +#include "elf32-m68k.h" static bfd_boolean elf_m68k_discard_copies (struct elf_link_hash_entry *, void *); diff --git a/bfd/elf32-m68k.h b/bfd/elf32-m68k.h new file mode 100644 index 0000000..63ce667 --- /dev/null +++ b/bfd/elf32-m68k.h @@ -0,0 +1,25 @@ +/* Motorola 68k series 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_m68k_elf32_create_embedded_relocs + (bfd *, struct bfd_link_info *, struct bfd_section *, struct bfd_section *, + char **); + +extern void bfd_elf_m68k_set_target_options (struct bfd_link_info *, int); diff --git a/ld/ChangeLog b/ld/ChangeLog index 1cea946..07e4611 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,9 @@ 2019-09-23 Alan Modra + * emultempl/m68kelf.em: Include elf32-m68k.h. + +2019-09-23 Alan Modra + * emultempl/bfin.em: Include elf32-bfin.h. 2019-09-23 Alan Modra diff --git a/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em index c8d9eea..570891f 100644 --- a/ld/emultempl/m68kelf.em +++ b/ld/emultempl/m68kelf.em @@ -45,6 +45,8 @@ esac fragment < + * m68k-dis.c: Include cpu-m68k.h + +2019-09-23 Alan Modra + * mips-dis.c: Include elfxx-mips.h. Move "elf-bfd.h" and "elf/mips.h" earlier. diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c index 45af5ff..7584541 100644 --- a/opcodes/m68k-dis.c +++ b/opcodes/m68k-dis.c @@ -23,7 +23,7 @@ #include "floatformat.h" #include "libiberty.h" #include "opintl.h" - +#include "cpu-m68k.h" #include "opcode/m68k.h" /* Local function prototypes. */