From 086b06f3c9daa4eee3c1ddd547af32553d1187d6 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 27 Jan 2020 14:09:00 +0100 Subject: [PATCH] Remove cpu-plugin.c After commit 999d6dff80f cpu-plugin.c is no longer begin used. * Makefile.am (ALL_MACHINES): Remove cpu-plugin.lo. (ALL_MACHINES_CFILES): Remove cpu-plugin.c. * Makefile.in: Regenerate. * cpu-plugin.c: Remove. * archures.c (enum bfd_architecture): Remove bfd_arch_plugin. (bfd_plugin_arch): Remove declaration. * bfd-in2.h: Regenerate. * po/SRC-POTFILES.in: Regenerate. --- bfd/ChangeLog | 11 +++++++++++ bfd/Makefile.am | 2 -- bfd/Makefile.in | 3 --- bfd/archures.c | 2 -- bfd/bfd-in2.h | 1 - bfd/cpu-plugin.c | 41 ----------------------------------------- bfd/po/SRC-POTFILES.in | 1 - 7 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 bfd/cpu-plugin.c diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3deba430f1..afa8928eec 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2020-01-27 Andreas Schwab + + * Makefile.am (ALL_MACHINES): Remove cpu-plugin.lo. + (ALL_MACHINES_CFILES): Remove cpu-plugin.c. + * Makefile.in: Regenerate. + * cpu-plugin.c: Remove. + * archures.c (enum bfd_architecture): Remove bfd_arch_plugin. + (bfd_plugin_arch): Remove declaration. + * bfd-in2.h: Regenerate. + * po/SRC-POTFILES.in: Regenerate. + 2020-01-27 H.J. Lu Alan Modra diff --git a/bfd/Makefile.am b/bfd/Makefile.am index d32640a12c..7053a678a7 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -144,7 +144,6 @@ ALL_MACHINES = \ cpu-or1k.lo \ cpu-pdp11.lo \ cpu-pj.lo \ - cpu-plugin.lo \ cpu-powerpc.lo \ cpu-pru.lo \ cpu-rs6000.lo \ @@ -229,7 +228,6 @@ ALL_MACHINES_CFILES = \ cpu-or1k.c \ cpu-pdp11.c \ cpu-pj.c \ - cpu-plugin.c \ cpu-powerpc.c \ cpu-pru.c \ cpu-rs6000.c \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 78555ccbbc..c055a9e4a2 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -568,7 +568,6 @@ ALL_MACHINES = \ cpu-or1k.lo \ cpu-pdp11.lo \ cpu-pj.lo \ - cpu-plugin.lo \ cpu-powerpc.lo \ cpu-pru.lo \ cpu-rs6000.lo \ @@ -653,7 +652,6 @@ ALL_MACHINES_CFILES = \ cpu-or1k.c \ cpu-pdp11.c \ cpu-pj.c \ - cpu-plugin.c \ cpu-powerpc.c \ cpu-pru.c \ cpu-rs6000.c \ @@ -1382,7 +1380,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-or1k.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pdp11.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pj.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-plugin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-powerpc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pru.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-riscv.Plo@am__quote@ diff --git a/bfd/archures.c b/bfd/archures.c index 232103817c..89c79900a8 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -232,7 +232,6 @@ DESCRIPTION .#define bfd_mach_h8300sx 6 .#define bfd_mach_h8300sxn 7 . bfd_arch_pdp11, {* DEC PDP-11. *} -. bfd_arch_plugin, . bfd_arch_powerpc, {* PowerPC. *} .#define bfd_mach_ppc 32 .#define bfd_mach_ppc64 64 @@ -654,7 +653,6 @@ extern const bfd_arch_info_type bfd_ns32k_arch; extern const bfd_arch_info_type bfd_or1k_arch; extern const bfd_arch_info_type bfd_pdp11_arch; extern const bfd_arch_info_type bfd_pj_arch; -extern const bfd_arch_info_type bfd_plugin_arch; extern const bfd_arch_info_type bfd_powerpc_archs[]; #define bfd_powerpc_arch bfd_powerpc_archs[0] extern const bfd_arch_info_type bfd_pru_arch; diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 7c13bc8c91..8144b167e0 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1615,7 +1615,6 @@ enum bfd_architecture #define bfd_mach_h8300sx 6 #define bfd_mach_h8300sxn 7 bfd_arch_pdp11, /* DEC PDP-11. */ - bfd_arch_plugin, bfd_arch_powerpc, /* PowerPC. */ #define bfd_mach_ppc 32 #define bfd_mach_ppc64 64 diff --git a/bfd/cpu-plugin.c b/bfd/cpu-plugin.c deleted file mode 100644 index 23991c2886..0000000000 --- a/bfd/cpu-plugin.c +++ /dev/null @@ -1,41 +0,0 @@ -/* BFD support for plugins. - Copyright (C) 2009-2020 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. */ - -#include "sysdep.h" -#include "bfd.h" -#include "libbfd.h" - -const bfd_arch_info_type bfd_plugin_arch = -{ - 32, /* Bits in a word. */ - 32, /* Bits in an address. */ - 8, /* Bits in a byte. */ - bfd_arch_plugin, - 0, /* Only 1 machine. */ - "plugin", - "plugin", - 3, - TRUE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - NULL, - 0 /* Maximum offset of a reloc from the start of an insn. */ -}; diff --git a/bfd/po/SRC-POTFILES.in b/bfd/po/SRC-POTFILES.in index dc5ef9e5ef..2d0051498c 100644 --- a/bfd/po/SRC-POTFILES.in +++ b/bfd/po/SRC-POTFILES.in @@ -99,7 +99,6 @@ cpu-ns32k.c cpu-or1k.c cpu-pdp11.c cpu-pj.c -cpu-plugin.c cpu-powerpc.c cpu-pru.c cpu-riscv.c -- 2.34.1