From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 1 Aug 2025 07:18:31 +0000 (+0200)
Subject: opcodes/x86: make i386_mnem[] static
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=711667472193c31b67eb3c190d7c91f660ac4bb0;p=thirdparty%2Fbinutils-gdb.git

opcodes/x86: make i386_mnem[] static

With the tables no longer being part of libopcodes (but rather being
compiled directly into gas), this table doesn't need exposing anymore.
The declaration cannot be avoided, though, as the first use of the
array sits ahead of its definition (in i386-tbl.h).
---

diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index a128a1bf012..a9d229c236e 100644
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -2062,8 +2062,8 @@ process_i386_opcodes (FILE *table)
   process_copyright (fp);
 
   fprintf (table, "\n/* i386 mnemonics table.  */\n\n");
-  fprintf (table, "const char i386_mnemonics[] =\n");
-  fprintf (fp, "\nextern const char i386_mnemonics[];\n\n");
+  fprintf (table, "static const char i386_mnemonics[] =\n");
+  fprintf (fp, "\nstatic const char i386_mnemonics[];\n\n");
 
   str = NULL;
   for (l = strlen (opcode_array[offs = j = 0]->name); j < i; j++)
diff --git a/opcodes/i386-mnem.h b/opcodes/i386-mnem.h
index 3e694159032..001d10d5e11 100644
--- a/opcodes/i386-mnem.h
+++ b/opcodes/i386-mnem.h
@@ -18,7 +18,7 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-extern const char i386_mnemonics[];
+static const char i386_mnemonics[];
 
 #define MN_ud0 0x1
 #define MN_prefetcht0 0x5
diff --git a/opcodes/i386-tbl.h b/opcodes/i386-tbl.h
index ba453ad5fad..c8fbb93d414 100644
--- a/opcodes/i386-tbl.h
+++ b/opcodes/i386-tbl.h
@@ -48232,7 +48232,7 @@ static const i386_op_off_t i386_op_sets[] =
 
 /* i386 mnemonics table.  */
 
-const char i386_mnemonics[] =
+static const char i386_mnemonics[] =
   "\0""ud0"
   "\0""prefetcht0"
   "\0""prefetchit0"