From 800c5dd7b39a305af2878dc66e69945ea1aedcc6 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 27 Jan 2023 09:20:58 +0100
Subject: [PATCH] opcodes: suppress internationalization on build helper tools

While one of the two actually having been instrumented (i386-gen.c) now
has that instrumentation dropped, there's still no point in honoring
such instrumentation in general (i.e. now for ia64-gen.c only), as that
only leads to a waste of resources.

With CFILES then being merely an alias of LIBOPCODES_CFILES, drop the
former variable altogether.
---
 opcodes/Makefile.am    | 18 +-----------------
 opcodes/Makefile.in    | 19 +------------------
 opcodes/po/POTFILES.in | 12 ------------
 3 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index acb39c43fd1..578fdc056c5 100644
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -277,22 +277,6 @@ LIBOPCODES_CFILES = \
 	dis-init.c \
 	disassemble.c
 
-# C source files that correspond to .o's.
-CFILES = \
-	$(LIBOPCODES_CFILES) \
-	aarch64-gen.c \
-	i386-gen.c \
-	ia64-asmtab.c \
-	ia64-gen.c \
-	ia64-opc-a.c \
-	ia64-opc-b.c \
-	ia64-opc-f.c \
-	ia64-opc-i.c \
-	ia64-opc-m.c \
-	ia64-opc-d.c \
-	s390-mkopc.c \
-	z8kgen.c
-
 ALL32_MACHINES = $(TARGET32_LIBOPCODES_CFILES:.c=.lo)
 ALL64_MACHINES = $(TARGET64_LIBOPCODES_CFILES:.c=.lo)
 
@@ -341,7 +325,7 @@ stamp-lib: libopcodes.la
 
 libopcodes.a: stamp-lib ; @true
 
-POTFILES = $(HFILES) $(CFILES)
+POTFILES = $(HFILES) $(LIBOPCODES_CFILES)
 po/POTFILES.in: @MAINT@ Makefile
 	for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \
 	  && mv tmp $(srcdir)/po/POTFILES.in
diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 059ac19751f..2db307e8d7c 100644
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -670,23 +670,6 @@ LIBOPCODES_CFILES = \
 	dis-init.c \
 	disassemble.c
 
-
-# C source files that correspond to .o's.
-CFILES = \
-	$(LIBOPCODES_CFILES) \
-	aarch64-gen.c \
-	i386-gen.c \
-	ia64-asmtab.c \
-	ia64-gen.c \
-	ia64-opc-a.c \
-	ia64-opc-b.c \
-	ia64-opc-f.c \
-	ia64-opc-i.c \
-	ia64-opc-m.c \
-	ia64-opc-d.c \
-	s390-mkopc.c \
-	z8kgen.c
-
 ALL32_MACHINES = $(TARGET32_LIBOPCODES_CFILES:.c=.lo)
 ALL64_MACHINES = $(TARGET64_LIBOPCODES_CFILES:.c=.lo)
 OFILES = @BFD_MACHINES@
@@ -706,7 +689,7 @@ EXTRA_libopcodes_la_SOURCES = $(LIBOPCODES_CFILES)
 # should be removed if everything else starts using libtool.  FIXME.
 noinst_LIBRARIES = libopcodes.a
 libopcodes_a_SOURCES = 
-POTFILES = $(HFILES) $(CFILES)
+POTFILES = $(HFILES) $(LIBOPCODES_CFILES)
 CLEANFILES = \
 	stamp-epiphany stamp-fr30 stamp-frv stamp-ip2k stamp-iq2000 stamp-lm32 \
 	stamp-m32c stamp-m32r stamp-mep stamp-mt stamp-or1k stamp-xstormy16 \
diff --git a/opcodes/po/POTFILES.in b/opcodes/po/POTFILES.in
index effd73f8f78..c303d98f1f1 100644
--- a/opcodes/po/POTFILES.in
+++ b/opcodes/po/POTFILES.in
@@ -4,7 +4,6 @@ aarch64-asm.h
 aarch64-dis-2.c
 aarch64-dis.c
 aarch64-dis.h
-aarch64-gen.c
 aarch64-opc-2.c
 aarch64-opc.c
 aarch64-opc.h
@@ -72,18 +71,9 @@ ft32-opc.c
 h8300-dis.c
 hppa-dis.c
 i386-dis.c
-i386-gen.c
 i386-opc.h
-ia64-asmtab.c
 ia64-asmtab.h
 ia64-dis.c
-ia64-gen.c
-ia64-opc-a.c
-ia64-opc-b.c
-ia64-opc-d.c
-ia64-opc-f.c
-ia64-opc-i.c
-ia64-opc-m.c
 ia64-opc.c
 ia64-opc.h
 ip2k-asm.c
@@ -191,7 +181,6 @@ rx-dis.c
 s12z-dis.c
 s12z-opc.c
 s390-dis.c
-s390-mkopc.c
 s390-opc.c
 score-dis.c
 score-opc.h
@@ -231,4 +220,3 @@ xtensa-dis.c
 z80-dis.c
 z8k-dis.c
 z8k-opc.h
-z8kgen.c
-- 
2.30.2