x86: remove i386-opc.c

Remove the now empty i386-opc.c. To compensate, tie table generation in
opcodes/ to the building of i386-dis.o, despite the file not really
depending on the generated data.

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index cb6ff0ebc5eb5f21f471aaeea561b7dec500ca5b..f657ee88e1cff367c0a24f67df3938b22d260030 100644 (file)
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -160,7 +160,6 @@ TARGET32_LIBOPCODES_CFILES = \
        h8300-dis.c \
        hppa-dis.c \
        i386-dis.c \
-       i386-opc.c \
        ip2k-asm.c \
        ip2k-desc.c \
        ip2k-dis.c \
@@ -560,10 +559,9 @@ $(srcdir)/i386%tbl.h $(srcdir)/i386%init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD)
                < $(srcdir)/i386-opc.tbl \
                | ./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)
 
-i386-opc.lo: $(srcdir)/i386-tbl.h
-# While not really a dependency, specify i386-init.h here as well to make sure
-# it is generated even if i386-tbl.h is present and up-to-date.
-i386-opc.lo: $(srcdir)/i386-init.h
+# While not really dependencies, specify i386-{init,tbl}.h here as well to
+# make sure they are re-generated as necessary.
+i386-dis.lo: $(srcdir)/i386-tbl.h $(srcdir)/i386-init.h
 
 ia64-gen$(EXEEXT_FOR_BUILD): ia64-gen.o $(BUILD_LIB_DEPS)
        $(AM_V_CCLD)$(LINK_FOR_BUILD) ia64-gen.o $(BUILD_LIBS)

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 5524af5ccd2873630752d09233e46fa130360246..db96cd60a9f387375f0555dc4e177c738ac80cfe 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -552,7 +552,6 @@ TARGET32_LIBOPCODES_CFILES = \
        h8300-dis.c \
        hppa-dis.c \
        i386-dis.c \
-       i386-opc.c \
        ip2k-asm.c \
        ip2k-desc.c \
        ip2k-dis.c \
@@ -945,7 +944,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h8300-dis.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hppa-dis.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386-dis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i386-opc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64-dis.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64-opc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ip2k-asm.Plo@am__quote@
@@ -1535,10 +1533,9 @@ $(srcdir)/i386%tbl.h $(srcdir)/i386%init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD)
                < $(srcdir)/i386-opc.tbl \
                | ./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)
 
-i386-opc.lo: $(srcdir)/i386-tbl.h
-# While not really a dependency, specify i386-init.h here as well to make sure
-# it is generated even if i386-tbl.h is present and up-to-date.
-i386-opc.lo: $(srcdir)/i386-init.h
+# While not really dependencies, specify i386-{init,tbl}.h here as well to
+# make sure they are re-generated as necessary.
+i386-dis.lo: $(srcdir)/i386-tbl.h $(srcdir)/i386-init.h
 
 ia64-gen$(EXEEXT_FOR_BUILD): ia64-gen.o $(BUILD_LIB_DEPS)
        $(AM_V_CCLD)$(LINK_FOR_BUILD) ia64-gen.o $(BUILD_LIBS)

diff --git a/opcodes/configure b/opcodes/configure
index 08c57a3385559a23369edef3978c2f8e9173ecac..9dc87d6c19cea91c062a22067b13778ddf143399 100755 (executable)
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -12534,7 +12534,7 @@ if test x${all_targets} = xfalse ; then
        bfd_h8300_arch)         ta="$ta h8300-dis.lo" ;;
        bfd_hppa_arch)          ta="$ta hppa-dis.lo" ;;
        bfd_i386_arch|bfd_iamcu_arch)
-                               ta="$ta i386-dis.lo i386-opc.lo" ;;
+                               ta="$ta i386-dis.lo" ;;
        bfd_ia64_arch)          ta="$ta ia64-dis.lo ia64-opc.lo" ;;
        bfd_ip2k_arch)          ta="$ta ip2k-asm.lo ip2k-desc.lo ip2k-dis.lo ip2k-ibld.lo ip2k-opc.lo" using_cgen=yes ;;
        bfd_epiphany_arch)      ta="$ta epiphany-asm.lo epiphany-desc.lo epiphany-dis.lo epiphany-ibld.lo epiphany-opc.lo" using_cgen=yes ;;

diff --git a/opcodes/configure.ac b/opcodes/configure.ac
index e998d6134363aeee5923fb48359bf7b3aa15ffad..8c79deb9ffc2e9d85ed96dec53ff046f1e17debf 100644 (file)
--- a/opcodes/configure.ac
+++ b/opcodes/configure.ac
@@ -282,7 +282,7 @@ if test x${all_targets} = xfalse ; then
        bfd_h8300_arch)         ta="$ta h8300-dis.lo" ;;
        bfd_hppa_arch)          ta="$ta hppa-dis.lo" ;;
        bfd_i386_arch|bfd_iamcu_arch)
-                               ta="$ta i386-dis.lo i386-opc.lo" ;;
+                               ta="$ta i386-dis.lo" ;;
        bfd_ia64_arch)          ta="$ta ia64-dis.lo ia64-opc.lo" ;;
        bfd_ip2k_arch)          ta="$ta ip2k-asm.lo ip2k-desc.lo ip2k-dis.lo ip2k-ibld.lo ip2k-opc.lo" using_cgen=yes ;;
        bfd_epiphany_arch)      ta="$ta epiphany-asm.lo epiphany-desc.lo epiphany-dis.lo epiphany-ibld.lo epiphany-opc.lo" using_cgen=yes ;;

diff --git a/opcodes/i386-opc.c b/opcodes/i386-opc.c
deleted file mode 100644 (file)
index 4f0c948..0000000
--- a/opcodes/i386-opc.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Intel 80386 opcode table
-   Copyright (C) 2007-2022 Free Software Foundation, Inc.
-
-   This file is part of the GNU opcodes library.
-
-   This library 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, or (at your option)
-   any later version.
-
-   It 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 "libiberty.h"
-#include "i386-opc.h"