From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 17 Nov 2022 17:04:00 +0000 (-0800)
Subject: i386: Move i386_seg_prefixes to gas
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3bfea8baf6168b58e9ecdf2cd7f3e9b41f1815c7;p=binutils-gdb.git

i386: Move i386_seg_prefixes to gas

gas/

	* config/tc-i386.c (i386_seg_prefixes): New. Moved from opcodes.

opcodes/

	* i386-opc.c (i386_seg_prefixes): Removed.
	* i386-opc.h (i386_seg_prefixes): Likewise.
---

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 5bc3a56e4b2..f54e7fddee0 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -464,6 +464,16 @@ static const struct RC_name RC_NamesTable[] =
   {  saeonly,  STRING_COMMA_LEN ("sae") },
 };
 
+/* To be indexed by segment register number.  */
+static const unsigned char i386_seg_prefixes[] = {
+  ES_PREFIX_OPCODE,
+  CS_PREFIX_OPCODE,
+  SS_PREFIX_OPCODE,
+  DS_PREFIX_OPCODE,
+  FS_PREFIX_OPCODE,
+  GS_PREFIX_OPCODE
+};
+
 /* List of chars besides those in app.c:symbol_chars that can start an
    operand.  Used to prevent the scrubber eating vital white-space.  */
 const char extra_symbol_chars[] = "*%-([{}"
diff --git a/opcodes/i386-opc.c b/opcodes/i386-opc.c
index 66566bd54b6..729c22932b1 100644
--- a/opcodes/i386-opc.c
+++ b/opcodes/i386-opc.c
@@ -22,13 +22,3 @@
 #include "libiberty.h"
 #include "i386-opc.h"
 #include "i386-tbl.h"
-
-/* To be indexed by segment register number.  */
-const unsigned char i386_seg_prefixes[] = {
-  ES_PREFIX_OPCODE,
-  CS_PREFIX_OPCODE,
-  SS_PREFIX_OPCODE,
-  DS_PREFIX_OPCODE,
-  FS_PREFIX_OPCODE,
-  GS_PREFIX_OPCODE
-};
diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h
index 168729fec62..459268f3656 100644
--- a/opcodes/i386-opc.h
+++ b/opcodes/i386-opc.h
@@ -1014,4 +1014,3 @@ reg_entry;
 
 extern const reg_entry i386_regtab[];
 extern const unsigned int i386_regtab_size;
-extern const unsigned char i386_seg_prefixes[6];