gas: constify md_{short,long}opts and md_longopts_size

First of all make the declarations globally visible, such that producer
and consumer actually share them.

For the latter two simply add const (as PPC already had it,), while for
the former achieve the effect by converting to an array: There's no need
for the extra level of indirection.

diff --git a/gas/as.c b/gas/as.c
index 030da2e05011ded8d1ee4a9ac77bf643b2a5ded1..f20b1e0cbe57515d15cfd936da4242f03e9fee62 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -438,7 +438,6 @@ parse_args (int * pargc, char *** pargv)
      the ordering of the two.  We describe each non-option ARGV-element
      as if it were the argument of an option with character code 1.  */
   char *shortopts;
-  extern const char *md_shortopts;
   static const char std_shortopts[] =
   {
     '-', 'J',
@@ -455,8 +454,6 @@ parse_args (int * pargc, char *** pargv)
     '\0'
   };
   struct option *longopts;
-  extern struct option md_longopts[];
-  extern size_t md_longopts_size;
   /* Codes used for the long options with no short synonyms.  */
   enum option_values
     {

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index e94a0cff406aaaf1800979a27991ccbb7e92e917..4970acee19b8a8249d5f11c4b2d0e63c3fee72c1 100644 (file)
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -10467,7 +10467,7 @@ md_begin (void)
 
 /* Command line processing.  */
 
-const char *md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 
 #ifdef AARCH64_BI_ENDIAN
 #define OPTION_EB (OPTION_MD_BASE + 0)
@@ -10480,7 +10480,7 @@ const char *md_shortopts = "m:";
 #endif
 #endif
 
-struct option md_longopts[] = {
+const struct option md_longopts[] = {
 #ifdef OPTION_EB
   {"EB", no_argument, NULL, OPTION_EB},
 #endif
@@ -10490,7 +10490,7 @@ struct option md_longopts[] = {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 struct aarch64_option_table
 {

diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index 0922f19f60fcfdd5f8c840ef849943cd2274de98..05b8ee2f7646a15c54a91b4faeccd0b7b6aa9a1e 100644 (file)
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -243,12 +243,12 @@ const char EXP_CHARS[] = "eE";
 const char FLT_CHARS[] = "rRsSfFdDxXpP";
 
 #ifdef OBJ_EVAX
-const char *md_shortopts = "Fm:g+1h:HG:";
+const char md_shortopts[] = "Fm:g+1h:HG:";
 #else
-const char *md_shortopts = "Fm:gG:";
+const char md_shortopts[] = "Fm:gG:";
 #endif
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
   {
 #define OPTION_32ADDR (OPTION_MD_BASE)
     { "32addr", no_argument, NULL, OPTION_32ADDR },
@@ -269,7 +269,7 @@ struct option md_longopts[] =
     { NULL, no_argument, NULL, 0 }
   };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 \f
 #ifdef OBJ_EVAX
 #define AXP_REG_R0     0

diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 5fd265acaa3910fd0cab7ed11b9fbd0eed0bd636..6a85ca39e26a0ab987f1d97d55b63b103b75a2fe 100644 (file)
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -183,7 +183,7 @@ const pseudo_typeS md_pseudo_table[] =
   { NULL, NULL, 0 }
 };
 
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
 enum options
 {
@@ -229,7 +229,7 @@ enum options
   OPTION_RTSC
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "EB",              no_argument,       NULL, OPTION_EB },
   { "EL",              no_argument,       NULL, OPTION_EL },
@@ -292,7 +292,7 @@ struct option md_longopts[] =
   { NULL,              no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Local data and data types.  */
 

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 540ab4873843a49214d85642b59520ef7a7dd971..a1bf33a90a9636dee8cdd571a5d560b4358e03b8 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -30341,7 +30341,7 @@ md_begin (void)
 
       */
 
-const char * md_shortopts = "m:k";
+const char md_shortopts[] = "m:k";
 
 #ifdef ARM_BI_ENDIAN
 #define OPTION_EB (OPTION_MD_BASE + 0)
@@ -30356,7 +30356,7 @@ const char * md_shortopts = "m:k";
 #define OPTION_FIX_V4BX (OPTION_MD_BASE + 2)
 #define OPTION_FDPIC (OPTION_MD_BASE + 3)
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #ifdef OPTION_EB
   {"EB", no_argument, NULL, OPTION_EB},
@@ -30371,7 +30371,7 @@ struct option md_longopts[] =
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 struct arm_option_table
 {

diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index b9fa9ed8681c88aba09297ef0e4ae0762916a029..9d80965da032575af447271ab6087e1621adbbac 100644 (file)
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -161,7 +161,7 @@ const char line_comment_chars[] = "#";
 const char *avr_line_separator_chars = "$";
 static const char *avr_line_separator_chars_no_dollar = "";
 
-const char *md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 struct mcu_type_s
 {
   const char *name;
@@ -571,7 +571,7 @@ enum options
   OPTION_NO_DOLLAR_LINE_SEPARATOR,
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "mmcu",   required_argument, NULL, OPTION_MMCU        },
   { "mall-opcodes", no_argument, NULL, OPTION_ALL_OPCODES },
@@ -585,7 +585,7 @@ struct option md_longopts[] =
   { NULL, no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Display nicely formatted list of known MCU names.  */
 

diff --git a/gas/config/tc-bfin.c b/gas/config/tc-bfin.c
index 001f90c045c4fc60bf7d204f8edd286831248f73..74937036db6b10d27c4067a01b3edc8a95350cff 100644 (file)
--- a/gas/config/tc-bfin.c
+++ b/gas/config/tc-bfin.c
@@ -314,13 +314,13 @@ struct bfin_cpu bfin_cpus[] =
 };
 
 /* Define bfin-specific command-line options (there are none). */
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
 #define OPTION_FDPIC           (OPTION_MD_BASE)
 #define OPTION_NOPIC           (OPTION_MD_BASE + 1)
 #define OPTION_MCPU            (OPTION_MD_BASE + 2)
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "mcpu",            required_argument,      NULL, OPTION_MCPU       },
   { "mfdpic",          no_argument,            NULL, OPTION_FDPIC      },
@@ -329,7 +329,7 @@ struct option md_longopts[] =
   { NULL,              no_argument,            NULL, 0                 },
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 
 int

diff --git a/gas/config/tc-bpf.c b/gas/config/tc-bpf.c
index effb4838601ec0558edfa40c5d0494c0bb099483..d0c18df636ba3108240a12748c5f30b5dda49112 100644 (file)
--- a/gas/config/tc-bpf.c
+++ b/gas/config/tc-bpf.c
@@ -126,7 +126,7 @@ enum options
   OPTION_NO_RELAX,
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "EL", no_argument, NULL, OPTION_LITTLE_ENDIAN },
   { "EB", no_argument, NULL, OPTION_BIG_ENDIAN },
@@ -137,9 +137,9 @@ struct option md_longopts[] =
   { NULL,          no_argument, NULL, 0 },
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
-const char * md_shortopts = "";
+const char md_shortopts[] = "";
 
 /* BPF supports little-endian and big-endian variants.  The following
    global records what endianness to use.  It can be configured using

diff --git a/gas/config/tc-cr16.c b/gas/config/tc-cr16.c
index e91e41ef41b44fb7bfaa3e419d05ded630f01491..aa4a3441285ffad9b42a6bc5f1dccdc664bedd51 100644 (file)
--- a/gas/config/tc-cr16.c
+++ b/gas/config/tc-cr16.c
@@ -109,12 +109,12 @@ symbolS * GOT_symbol;
 #endif
 
 /* Target-specific multicharacter options, not const-declared at usage.  */
-const char *md_shortopts = "";
-struct option md_longopts[] =
+const char md_shortopts[] = "";
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 static void
 l_cons (int nbytes)

diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c
index 86ec1f701ec9d7759afbbecc5289aae4340abc26..31184f381f6b262d9181881624c5a1eccfe10a06 100644 (file)
--- a/gas/config/tc-cris.c
+++ b/gas/config/tc-cris.c
@@ -414,7 +414,7 @@ const relax_typeS md_cris_relax_table[] =
 #undef BDAP_WB
 
 /* Target-specific multicharacter options, not const-declared.  */
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_NO_US (OPTION_MD_BASE + 0)
   {"no-underscore", no_argument, NULL, OPTION_NO_US},
@@ -432,8 +432,8 @@ struct option md_longopts[] =
 };
 
 /* Not const-declared.  */
-size_t md_longopts_size = sizeof (md_longopts);
-const char *md_shortopts = "hHN";
+const size_t md_longopts_size = sizeof (md_longopts);
+const char md_shortopts[] = "hHN";
 
 /* At first glance, this may seems wrong and should be 4 (ba + nop); but
    since a short_jump must skip a *number* of long jumps, it must also be

diff --git a/gas/config/tc-cris.h b/gas/config/tc-cris.h
index 4dab3adba365746b33b6d235a287d39542088848..8e39c12b00ea001ed71eb2f1e8c832e3c06d5cc8 100644 (file)
--- a/gas/config/tc-cris.h
+++ b/gas/config/tc-cris.h
@@ -44,10 +44,6 @@ extern unsigned int cris_mach (void);
 
 #define TARGET_BYTES_BIG_ENDIAN 0
 
-extern const char *md_shortopts;
-extern struct option md_longopts[];
-extern size_t md_longopts_size;
-
 extern const pseudo_typeS md_pseudo_table[];
 
 /* This should be optional, since it is ignored as an escape (assumed to

diff --git a/gas/config/tc-crx.c b/gas/config/tc-crx.c
index 3a47354c4737d42afb6dc5c9f2afdb9b7d6aaad1..fb128aae7b203673841a5d68f1ab0556c1234f85 100644 (file)
--- a/gas/config/tc-crx.c
+++ b/gas/config/tc-crx.c
@@ -102,12 +102,12 @@ const char EXP_CHARS[] = "eE";
 const char FLT_CHARS[] = "f'";
 
 /* Target-specific multicharacter options, not const-declared at usage.  */
-const char *md_shortopts = "";
-struct option md_longopts[] =
+const char md_shortopts[] = "";
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* This table describes all the machine specific pseudo-ops
    the assembler has to support.  The fields are:

diff --git a/gas/config/tc-csky.c b/gas/config/tc-csky.c
index 0dc8bfd45dc1c6e01ec28c11dd7d0494a9a6a1d2..74762f0ea44e6cb9f5a17241ddfc38c4cb780328 100644 (file)
--- a/gas/config/tc-csky.c
+++ b/gas/config/tc-csky.c
@@ -967,9 +967,9 @@ const char EXP_CHARS[] = "eE";
 
 const char FLT_CHARS[] = "rRsSfFdDxXeEpP";
 
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] = {
+const struct option md_longopts[] = {
 #define OPTION_MARCH (OPTION_MD_BASE + 0)
   {"march", required_argument, NULL, OPTION_MARCH},
 #define OPTION_MCPU (OPTION_MD_BASE + 1)
@@ -1023,7 +1023,7 @@ struct option md_longopts[] = {
   {"mvdsp", no_argument, &do_opt_mvdsp, CSKY_ISA_VDSP},
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 static struct csky_insn_info csky_insn;
 

diff --git a/gas/config/tc-d10v.c b/gas/config/tc-d10v.c
index 6217654df7454db5c2aed9879cf60ee0cb39669b..2be6beb0cc801e3c3435760a5f2e2691d2d34a9a 100644 (file)
--- a/gas/config/tc-d10v.c
+++ b/gas/config/tc-d10v.c
@@ -28,7 +28,7 @@
 const char comment_chars[]        = ";";
 const char line_comment_chars[]   = "#";
 const char line_separator_chars[] = "";
-const char *md_shortopts          = "O";
+const char md_shortopts[]         = "O";
 const char EXP_CHARS[]            = "eE";
 const char FLT_CHARS[]            = "dD";
 
@@ -88,7 +88,7 @@ enum options
   OPTION_NOGSTABSPACKING
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"nowarnswap", no_argument, NULL, OPTION_NOWARNSWAP},
   {"gstabspacking",  no_argument, NULL, OPTION_GSTABSPACKING},
@@ -98,7 +98,7 @@ struct option md_longopts[] =
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Opcode hash table.  */
 static htab_t d10v_hash;

diff --git a/gas/config/tc-d30v.c b/gas/config/tc-d30v.c
index 0eab055e3868a07a68958fd4648c828105bf422f..70ea71cdf6ef03148f7ed9ccb43019eab27c6f1b 100644 (file)
--- a/gas/config/tc-d30v.c
+++ b/gas/config/tc-d30v.c
@@ -27,7 +27,7 @@
 const char comment_chars[]        = ";";
 const char line_comment_chars[]   = "#";
 const char line_separator_chars[] = "";
-const char *md_shortopts          = "OnNcC";
+const char md_shortopts[]         = "OnNcC";
 const char EXP_CHARS[]            = "eE";
 const char FLT_CHARS[]            = "dD";
 
@@ -107,12 +107,12 @@ static symbolS *d30v_last_label;
 #define NOP_RIGHT  ((long long) NOP)
 #define NOP2 (FM00 | NOP_LEFT | NOP_RIGHT)
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Opcode hash table.  */
 static htab_t d30v_hash;

diff --git a/gas/config/tc-dlx.c b/gas/config/tc-dlx.c
index 6a7c520f986e5991b21efbd972c2f8abb752fe35..cb5acf5fd3a34248b39c4b86c3f317f19cb8493c 100644 (file)
--- a/gas/config/tc-dlx.c
+++ b/gas/config/tc-dlx.c
@@ -1047,14 +1047,14 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
     fixP->fx_no_overflow = 1;
 }
 
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
   {
     {NULL, no_argument, NULL, 0}
   };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c     ATTRIBUTE_UNUSED,

diff --git a/gas/config/tc-epiphany.c b/gas/config/tc-epiphany.c
index fd6728cc6170ed131e9de3d404ad6e752f62d8d1..8cd3646298df6aa9a7052f3120155de8503b7d65 100644 (file)
--- a/gas/config/tc-epiphany.c
+++ b/gas/config/tc-epiphany.c
@@ -103,16 +103,16 @@ enum options
   OPTION_CPU_EPIPHANY16
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "mepiphany ",  no_argument, NULL, OPTION_CPU_EPIPHANY },
   { "mepiphany16", no_argument, NULL, OPTION_CPU_EPIPHANY16 },
   { NULL,          no_argument, NULL, 0 },
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
-const char * md_shortopts = "";
+const char md_shortopts[] = "";
 
 int
 md_parse_option (int c ATTRIBUTE_UNUSED, const char * arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-fr30.c b/gas/config/tc-fr30.c
index 1457f6be554c391f8918eb537255582536fd83a9..b4dd307e6dff66515ced92d7d108b3a84b24f758 100644 (file)
--- a/gas/config/tc-fr30.c
+++ b/gas/config/tc-fr30.c
@@ -55,13 +55,13 @@ const char EXP_CHARS[]            = "eE";
 const char FLT_CHARS[]            = "dD";
 \f
 #define FR30_SHORTOPTS ""
-const char * md_shortopts = FR30_SHORTOPTS;
+const char md_shortopts[] = FR30_SHORTOPTS;
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c ATTRIBUTE_UNUSED,

diff --git a/gas/config/tc-frv.c b/gas/config/tc-frv.c
index 40bab49ff6af0cfec4c50e7599d70681e933b517..d7c8c66e1c21cb42212579d95ff803804c449c53 100644 (file)
--- a/gas/config/tc-frv.c
+++ b/gas/config/tc-frv.c
@@ -200,7 +200,7 @@ const pseudo_typeS md_pseudo_table[] =
 
 \f
 #define FRV_SHORTOPTS "G:"
-const char * md_shortopts = FRV_SHORTOPTS;
+const char md_shortopts[] = FRV_SHORTOPTS;
 
 #define OPTION_GPR_32          (OPTION_MD_BASE)
 #define OPTION_GPR_64          (OPTION_MD_BASE + 1)
@@ -226,7 +226,7 @@ const char * md_shortopts = FRV_SHORTOPTS;
 #define OPTION_FDPIC           (OPTION_MD_BASE + 21)
 #define OPTION_NOPIC           (OPTION_MD_BASE + 22)
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "mgpr-32",         no_argument,            NULL, OPTION_GPR_32        },
   { "mgpr-64",         no_argument,            NULL, OPTION_GPR_64        },
@@ -255,7 +255,7 @@ struct option md_longopts[] =
   { NULL,              no_argument,            NULL, 0                 },
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* What value to give to bfd_set_gp_size.  */
 static int g_switch_value = 8;

diff --git a/gas/config/tc-ft32.c b/gas/config/tc-ft32.c
index 7ecfcea991e365f06bbd22cb8376fcbb2cf55a86..74a6bfe9d75a10cb071a1e446d1533df2c753451 100644 (file)
--- a/gas/config/tc-ft32.c
+++ b/gas/config/tc-ft32.c
@@ -487,16 +487,16 @@ md_atof (int type, char *litP, int *sizeP)
   return NULL;
 }
 \f
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_NORELAX (OPTION_MD_BASE)
   {"norelax", no_argument, NULL, OPTION_NORELAX},
   {"no-relax", no_argument, NULL, OPTION_NORELAX},
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* We have no target specific options yet, so these next
    two functions are empty.  */

diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
index aafceb0a6ad0e5feb2f18b11a24905cf82df7b65..08648acef4d40b6690a06376fa0818110bd04619 100644 (file)
--- a/gas/config/tc-h8300.c
+++ b/gas/config/tc-h8300.c
@@ -2076,15 +2076,15 @@ md_atof (int type, char *litP, int *sizeP)
 #define OPTION_H_TICK_HEX      (OPTION_MD_BASE)
 #define OPTION_MACH            (OPTION_MD_BASE+1)
 
-const char *md_shortopts = "";
-struct option md_longopts[] =
+const char md_shortopts[] = "";
+const struct option md_longopts[] =
 {
   { "h-tick-hex", no_argument,       NULL, OPTION_H_TICK_HEX  },
   { "mach", required_argument, NULL, OPTION_MACH },
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 struct mach_func
 {

diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index f209407cfd2078d88c08ea05033c6f85b3d1abf0..bf8a247c7171aafbb39bddd968ff213ff34eeb1d 100644 (file)
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -1631,26 +1631,26 @@ md_estimate_size_before_relax (fragS *fragP, asection *segment ATTRIBUTE_UNUSED)
 \f
 #ifdef OBJ_ELF
 # ifdef WARN_COMMENTS
-const char *md_shortopts = "Vc";
+const char md_shortopts[] = "Vc";
 # else
-const char *md_shortopts = "V";
+const char md_shortopts[] = "V";
 # endif
 #else
 # ifdef WARN_COMMENTS
-const char *md_shortopts = "c";
+const char md_shortopts[] = "c";
 # else
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 # endif
 #endif
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #ifdef WARN_COMMENTS
   {"warn-comment", no_argument, NULL, 'c'},
 #endif
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index a695a1599a2b32d39ff1573cb170fda63143b54b..9f68a2fb41284c2ed59ddee0d2d04e230307d549 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -16756,9 +16756,9 @@ bool i386_record_operator (operatorT op,
 #endif
 \f
 #ifdef OBJ_ELF
-const char *md_shortopts = "kVQ:sqnO::";
+const char md_shortopts[] = "kVQ:sqnO::";
 #else
-const char *md_shortopts = "qnO::";
+const char md_shortopts[] = "qnO::";
 #endif
 
 #define OPTION_32 (OPTION_MD_BASE + 0)
@@ -16798,7 +16798,7 @@ const char *md_shortopts = "qnO::";
 #define OPTION_MUSE_UNALIGNED_VECTOR_MOVE (OPTION_MD_BASE + 34)
 #define OPTION_MTLS_CHECK (OPTION_MD_BASE + 35)
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"32", no_argument, NULL, OPTION_32},
 #if (defined (OBJ_ELF) || defined (TE_PE) || defined (OBJ_MACH_O)) \
@@ -16848,7 +16848,7 @@ struct option md_longopts[] =
   {"mtls-check", required_argument, NULL, OPTION_MTLS_CHECK},
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 666c0ae369b00be0cfef5bba57c2fb150617ff31..d8488bdf4e7a0628702689b78388401696d450ee 100644 (file)
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -210,9 +210,9 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP";
 
 /* ia64-specific option processing:  */
 
-const char *md_shortopts = "m:N:x::";
+const char md_shortopts[] = "m:N:x::";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
   {
 #define OPTION_MCONSTANT_GP (OPTION_MD_BASE + 1)
     {"mconstant-gp", no_argument, NULL, OPTION_MCONSTANT_GP},
@@ -220,7 +220,7 @@ struct option md_longopts[] =
     {"mauto-pic", no_argument, NULL, OPTION_MAUTO_PIC}
   };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 static struct
   {

diff --git a/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c
index 04a75808e91e4d7c92989df09e614309c13ccf34..babdf3470e2648bc9d2a87a47fddc9b841e41bde 100644 (file)
--- a/gas/config/tc-ip2k.c
+++ b/gas/config/tc-ip2k.c
@@ -101,15 +101,15 @@ enum options
   OPTION_CPU_IP2022EXT
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "mip2022",     no_argument, NULL, OPTION_CPU_IP2022 },
   { "mip2022ext",  no_argument, NULL, OPTION_CPU_IP2022EXT },
   { NULL,           no_argument, NULL, 0 },
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
-const char * md_shortopts = "";
+const char md_shortopts[] = "";
 
 int
 md_parse_option (int c ATTRIBUTE_UNUSED, const char * arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-iq2000.c b/gas/config/tc-iq2000.c
index 1c2f4f5d54a5cf9e8264a9c8018d27cc9bc24c49..2198ffda2b971963beb41baf5cb30cdd7fd694fb 100644 (file)
--- a/gas/config/tc-iq2000.c
+++ b/gas/config/tc-iq2000.c
@@ -108,12 +108,12 @@ static struct iq2000_hi_fixup * iq2000_hi_fixup_list;
 /* Macro hash table, which we will add to.  */
 extern struct htab *macro_hash;
 \f
-const char *md_shortopts = "";
-struct option md_longopts[] =
+const char md_shortopts[] = "";
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c ATTRIBUTE_UNUSED,

diff --git a/gas/config/tc-kvx.c b/gas/config/tc-kvx.c
index e0860c0294a857aac25fb39ea2d87c3b39481a29..2cdb84351497927ee753cb7192b2b7dbe4207dda 100644 (file)
--- a/gas/config/tc-kvx.c
+++ b/gas/config/tc-kvx.c
@@ -233,7 +233,7 @@ struct label_fix
 /*   OPTIONS PROCESSING                              */
 /*****************************************************/
 
-const char *md_shortopts = "hV";       /* catted to std short options */
+const char md_shortopts[] = "hV";      /* catted to std short options */
 
 /* added to std long options */
 
@@ -254,7 +254,7 @@ const char *md_shortopts = "hV";    /* catted to std short options */
 #define OPTION_MORE                  (OPTION_MD_BASE + 19)
 #define OPTION_NO_MORE               (OPTION_MD_BASE + 20)
 
-struct option md_longopts[] = {
+const struct option md_longopts[] = {
   { "march",                 required_argument, NULL, OPTION_MARCH                 },
   { "check-resources",       no_argument,       NULL, OPTION_CHECK_RESOURCES       },
   { "no-check-resources",    no_argument,       NULL, OPTION_NO_CHECK_RESOURCES    },
@@ -273,7 +273,7 @@ struct option md_longopts[] = {
   { NULL,                    no_argument,       NULL, 0                            }
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-lm32.c b/gas/config/tc-lm32.c
index 3d6fefe51c150c603654b770be6e4945891b4073..17ab16d685943580d9fc137fa105276c1b734347 100644 (file)
--- a/gas/config/tc-lm32.c
+++ b/gas/config/tc-lm32.c
@@ -85,9 +85,9 @@ const pseudo_typeS md_pseudo_table[] =
 
 /* Target specific command line options.  */
 
-const char * md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_MULTIPLY_ENABLED         (OPTION_MD_BASE + 1)
   { "mmultiply-enabled",            no_argument, NULL, OPTION_MULTIPLY_ENABLED },
@@ -109,7 +109,7 @@ struct option md_longopts[] =
   { "mall-enabled",                 no_argument, NULL, OPTION_ALL_ENABLED },
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Display architecture specific options.  */
 

diff --git a/gas/config/tc-loongarch.c b/gas/config/tc-loongarch.c
index ab98a83e6f8d98b5795f4ff89273890b87c1a4e1..d5236aac5253eaf31145e4a75ecf5b850e4b6c76 100644 (file)
--- a/gas/config/tc-loongarch.c
+++ b/gas/config/tc-loongarch.c
@@ -112,7 +112,7 @@ const char EXP_CHARS[] = "eE";
 /* or    0d1.2345e12.  */
 const char FLT_CHARS[] = "rRsSfFdDxXpP";
 
-const char *md_shortopts = "O::g::G:";
+const char md_shortopts[] = "O::g::G:";
 
 static const char default_arch[] = DEFAULT_ARCH;
 
@@ -154,7 +154,7 @@ enum options
   OPTION_END_OF_ENUM,
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "mabi", required_argument, NULL, OPTION_ABI },
 
@@ -172,7 +172,7 @@ struct option md_longopts[] =
   { NULL, no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/config/tc-m32c.c b/gas/config/tc-m32c.c
index c29f754d4b2d499d4894c1b0fa2127389afe1515..3459b2494bb9a7dbb53d15d42ae45d04ca0f0403 100644 (file)
--- a/gas/config/tc-m32c.c
+++ b/gas/config/tc-m32c.c
@@ -61,7 +61,7 @@ const char EXP_CHARS[]            = "eE";
 const char FLT_CHARS[]            = "dD";
 \f
 #define M32C_SHORTOPTS ""
-const char * md_shortopts = M32C_SHORTOPTS;
+const char md_shortopts[] = M32C_SHORTOPTS;
 
 /* assembler options */
 #define OPTION_CPU_M16C               (OPTION_MD_BASE)
@@ -69,7 +69,7 @@ const char * md_shortopts = M32C_SHORTOPTS;
 #define OPTION_LINKRELAX       (OPTION_MD_BASE + 2)
 #define OPTION_H_TICK_HEX      (OPTION_MD_BASE + 3)
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "m16c",       no_argument,       NULL, OPTION_CPU_M16C   },
   { "m32c",       no_argument,       NULL, OPTION_CPU_M32C   },
@@ -77,7 +77,7 @@ struct option md_longopts[] =
   { "h-tick-hex", no_argument,       NULL, OPTION_H_TICK_HEX  },
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Default machine */
 

diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
index 2deb07817ab6554f2b90117e13c5463c63c9ca17..3b0c50b34dadb6007e2386bf1bc69b7699be819d 100644 (file)
--- a/gas/config/tc-m32r.c
+++ b/gas/config/tc-m32r.c
@@ -189,7 +189,7 @@ allow_m32rx (int on)
 \f
 #define M32R_SHORTOPTS "O::K:"
 
-const char *md_shortopts = M32R_SHORTOPTS;
+const char md_shortopts[] = M32R_SHORTOPTS;
 
 enum md_option_enums
 {
@@ -212,7 +212,7 @@ enum md_option_enums
   OPTION_NO_WARN_UNMATCHED
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"m32r",  no_argument, NULL, OPTION_M32R},
   {"m32rx", no_argument, NULL, OPTION_M32RX},
@@ -243,7 +243,7 @@ struct option md_longopts[] =
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 static void
 little (int on)

diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c
index c7e54e4f6e97c0647863723a9e38e61e3a09da64..71012b8e083e173e2695e66de59db969b7d6af9b 100644 (file)
--- a/gas/config/tc-m68hc11.c
+++ b/gas/config/tc-m68hc11.c
@@ -323,9 +323,9 @@ const pseudo_typeS md_pseudo_table[] =
 \f
 /* Options and initialization.  */
 
-const char *md_shortopts = "Sm:";
+const char md_shortopts[] = "Sm:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_FORCE_LONG_BRANCH (OPTION_MD_BASE)
   {"force-long-branches", no_argument, NULL, OPTION_FORCE_LONG_BRANCH},
@@ -364,7 +364,7 @@ struct option md_longopts[] =
 
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Get the target cpu for the assembler.  This is based on the configure
    options and on the -m68hc11/-m68hc12 option.  If no option is specified,

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index d04aa1edecdbcac278151f69691c748f4c6ebdeb..92959769c8fefa02f8bfa059c6f90e6d4569bf46 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -7341,9 +7341,9 @@ m68k_set_extension (char const *name, int allow_m, int silent)
    Invocation line includes a switch not recognized by the base assembler.
  */
 
-const char *md_shortopts = "lSA:m:kQ:V";
+const char md_shortopts[] = "lSA:m:kQ:V";
 
-struct option md_longopts[] = {
+const struct option md_longopts[] = {
 #define OPTION_PIC (OPTION_MD_BASE)
   {"pic", no_argument, NULL, OPTION_PIC},
 #define OPTION_REGISTER_PREFIX_OPTIONAL (OPTION_MD_BASE + 1)
@@ -7363,7 +7363,7 @@ struct option md_longopts[] = {
   {"pcrel", no_argument, NULL, OPTION_PCREL},
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/config/tc-mcore.c b/gas/config/tc-mcore.c
index 41237dec45ad7f4bf722435942a9021e092cea0e..608db1a59ed0529573b523d9b489c3fa58495978 100644 (file)
--- a/gas/config/tc-mcore.c
+++ b/gas/config/tc-mcore.c
@@ -1629,7 +1629,7 @@ md_atof (int type, char * litP, int * sizeP)
   return ieee_md_atof (type, litP, sizeP, target_big_endian);
 }
 \f
-const char * md_shortopts = "";
+const char md_shortopts[] = "";
 
 enum options
 {
@@ -1642,7 +1642,7 @@ enum options
   OPTION_EL,
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "no-jsri2bsr", no_argument, NULL, OPTION_JSRI2BSR_OFF},
   { "jsri2bsr",    no_argument, NULL, OPTION_JSRI2BSR_ON},
@@ -1654,7 +1654,7 @@ struct option md_longopts[] =
   { NULL,          no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char * arg)

diff --git a/gas/config/tc-mep.c b/gas/config/tc-mep.c
index 2d01730668ff8994758dc4a345e91f1edc269d2e..7119f5a0e6608d3d8a99bed54299789108da15bf 100644 (file)
--- a/gas/config/tc-mep.c
+++ b/gas/config/tc-mep.c
@@ -139,7 +139,7 @@ static struct mep_hi_fixup * mep_hi_fixup_list;
 #define OPTION_NODSP           (OPTION_MD_BASE + 32)
 #define OPTION_LIBRARY         (OPTION_MD_BASE + 33)
 
-struct option md_longopts[] = {
+const struct option md_longopts[] = {
   { "EB",          no_argument, NULL, OPTION_EB},
   { "EL",          no_argument, NULL, OPTION_EL},
   { "mconfig",     required_argument, NULL, OPTION_CONFIG},
@@ -170,7 +170,7 @@ struct option md_longopts[] = {
   { "mno-dsp",     no_argument, NULL, OPTION_NODSP},
   { "mlibrary",    no_argument, NULL, OPTION_LIBRARY},
   { NULL, 0, NULL, 0 } };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Options which default to on/off together.  See the comment where
    this is used for details.  Note that CP and CP64 are not in this
@@ -189,7 +189,7 @@ size_t md_longopts_size = sizeof (md_longopts);
        | (1 << CGEN_INSN_OPTIONAL_UCI_INSN) \
        | (1 << CGEN_INSN_OPTIONAL_DSP_INSN) )
 
-const char * md_shortopts = "";
+const char md_shortopts[] = "";
 static int optbits = 0;
 static int optbitset = 0;
 

diff --git a/gas/config/tc-metag.c b/gas/config/tc-metag.c
index 66afa15709b8e6b6d4d71a4d8f7194cedb3886d4..314f3feae142a3fa84e4d1ef1c89520fbcd3ae1b 100644 (file)
--- a/gas/config/tc-metag.c
+++ b/gas/config/tc-metag.c
@@ -81,13 +81,13 @@ static unsigned int mcpu_opt = CoreMeta12;
 static unsigned int mfpu_opt = 0;
 static unsigned int mdsp_opt = 0;
 
-const char * md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Parser hash tables.  */
 static htab_t mnemonic_htab;

diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
index c971d187095cc766864e9be68a40af33d9c7970c..43e69d615b5cedf43246c0fb613224f781210e5d 100644 (file)
--- a/gas/config/tc-microblaze.c
+++ b/gas/config/tc-microblaze.c
@@ -1901,9 +1901,9 @@ md_atof (int type, char * litP, int * sizeP)
   return NULL;
 }
 \f
-const char * md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"EB", no_argument, NULL, OPTION_EB},
   {"EL", no_argument, NULL, OPTION_EL},
@@ -1912,7 +1912,7 @@ struct option md_longopts[] =
   { NULL,          no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int md_short_jump_size;
 

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index f4125c1b118018c009193eba74c7023f4f7cfe09..b7ab1627e3c17d81fcf025d3065068a28516f604 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -1450,7 +1450,7 @@ static const struct mips_cpu_info *mips_cpu_info_from_isa (int);
 static const struct mips_cpu_info *mips_cpu_info_from_arch (int);
 \f
 /* Command-line options.  */
-const char *md_shortopts = "O::g::G:";
+const char md_shortopts[] = "O::g::G:";
 
 enum options
   {
@@ -1585,7 +1585,7 @@ enum options
     OPTION_END_OF_ENUM
   };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   /* Options which specify architecture.  */
   {"march", required_argument, NULL, OPTION_MARCH},
@@ -1738,7 +1738,7 @@ struct option md_longopts[] =
 
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 \f
 /* Information about either an Application Specific Extension or an
    optional architecture feature that, for simplicity, we treat in the

diff --git a/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
index 4d0f94eda48eb669abacfa89738cf72cef6355b9..f2a16e6f6404e3a231ceef2eecebc67f7b208d7b 100644 (file)
--- a/gas/config/tc-mmix.c
+++ b/gas/config/tc-mmix.c
@@ -80,7 +80,7 @@ static void mmix_cons (int);
    }                                           \
  while (0)
 
-const char *md_shortopts = "x";
+const char md_shortopts[] = "x";
 static int current_fb_label = -1;
 static char *pending_label = NULL;
 
@@ -189,7 +189,7 @@ static int doing_bspec = 0;
 static const char *bspec_file;
 static unsigned int bspec_line;
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
  {
 #define OPTION_RELAX  (OPTION_MD_BASE)
 #define OPTION_NOEXPAND  (OPTION_RELAX + 1)
@@ -215,7 +215,7 @@ struct option md_longopts[] =
    {NULL, no_argument, NULL, 0}
  };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 static htab_t mmix_opcode_hash;
 

diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c
index 66db9e3d81c04807ff33d8b72125298d35596550..b191e2654d592cca5419920baed1005c96f2db46 100644 (file)
--- a/gas/config/tc-mn10200.c
+++ b/gas/config/tc-mn10200.c
@@ -85,14 +85,14 @@ struct mn10200_fixup
 struct mn10200_fixup fixups[MAX_INSN_FIXUPS];
 static int fc;
 \f
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* The target specific pseudo-ops which we support.  */
 const pseudo_typeS md_pseudo_table[] =

diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
index be79b19b66b8a8f0079bf07b7d8d55e881fc51af..099d20580268c80fc219d1ffe61fdef76e79ce2c 100644 (file)
--- a/gas/config/tc-mn10300.c
+++ b/gas/config/tc-mn10300.c
@@ -107,14 +107,14 @@ static int fc;
    verify that certain registers do not match.  */
 int mn10300_reg_operands[MN10300_MAX_OPERANDS];
 \f
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 #define HAVE_AM33_2 (current_machine == AM33_2)
 #define HAVE_AM33   (current_machine == AM33 || HAVE_AM33_2)

diff --git a/gas/config/tc-moxie.c b/gas/config/tc-moxie.c
index 266afff5b23ec52181609e57744c17a82263e151..d1923f09964209aae2bd57d0c15d766f0ec9639a 100644 (file)
--- a/gas/config/tc-moxie.c
+++ b/gas/config/tc-moxie.c
@@ -606,16 +606,16 @@ enum options
   OPTION_EL,
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "EB",          no_argument, NULL, OPTION_EB},
   { "EL",          no_argument, NULL, OPTION_EL},
   { NULL,          no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 \f
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
 int
 md_parse_option (int c ATTRIBUTE_UNUSED, const char *arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
index 19ea7fab9d68106ec4cbbe953421ed7aa22d6346..32c57eea6216b8911da0e9e17f63e2071c9449f5 100644 (file)
--- a/gas/config/tc-msp430.c
+++ b/gas/config/tc-msp430.c
@@ -1742,9 +1742,9 @@ const pseudo_typeS md_pseudo_table[] =
   {NULL, NULL, 0}
 };
 
-const char *md_shortopts = "mm:,mP,mQ,ml,mN,mn,my,mY,mu,mU";
+const char md_shortopts[] = "mm:,mP,mQ,ml,mN,mn,my,mY,mu,mU";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"msilicon-errata", required_argument, NULL, OPTION_SILICON_ERRATA},
   {"msilicon-errata-warn", required_argument, NULL, OPTION_SILICON_ERRATA_WARN},
@@ -1764,7 +1764,7 @@ struct option md_longopts[] =
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 void
 md_show_usage (FILE * stream)

diff --git a/gas/config/tc-mt.c b/gas/config/tc-mt.c
index 42028bda150e36a9db1a933228be8029f7ccdba1..09cf397addd01b1d2f28d96155aeb73117b94910 100644 (file)
--- a/gas/config/tc-mt.c
+++ b/gas/config/tc-mt.c
@@ -68,7 +68,7 @@ const pseudo_typeS md_pseudo_table[] =
 
 static int no_scheduling_restrictions = 0;
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_NO_SCHED_REST   (OPTION_MD_BASE)
   { "nosched",    no_argument, NULL, OPTION_NO_SCHED_REST },
@@ -76,9 +76,9 @@ struct option md_longopts[] =
   { "march", required_argument, NULL, OPTION_MARCH},
   { NULL,         no_argument, NULL, 0 },
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
-const char * md_shortopts = "";
+const char md_shortopts[] = "";
 
 /* Mach selected from command line.  */
 static int mt_mach = bfd_mach_ms1;

diff --git a/gas/config/tc-nds32.c b/gas/config/tc-nds32.c
index 99254a1581d72be7c3bc5dbd6abdc68ec1e46cb9..b41182420a3a382307b469a57364dd64746768a1 100644 (file)
--- a/gas/config/tc-nds32.c
+++ b/gas/config/tc-nds32.c
@@ -2313,8 +2313,8 @@ enum options
   OPTION_OPTIMIZE_SPACE
 };
 
-const char *md_shortopts = "m:O:";
-struct option md_longopts[] =
+const char md_shortopts[] = "m:O:";
+const struct option md_longopts[] =
 {
   {"O1", no_argument, NULL, OPTION_OPTIMIZE},
   {"Os", no_argument, NULL, OPTION_OPTIMIZE_SPACE},
@@ -2334,7 +2334,7 @@ struct option md_longopts[] =
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 struct nds32_parse_option_table
 {

diff --git a/gas/config/tc-nios2.c b/gas/config/tc-nios2.c
index 3d48b1e5938f6f33a67f01c7ad549cf14e01517d..bd96629fe9110d249076ef5c73f3c6271d2f95d6 100644 (file)
--- a/gas/config/tc-nios2.c
+++ b/gas/config/tc-nios2.c
@@ -68,9 +68,9 @@ const char FLT_CHARS[] = "rRsSfFdDxXpP";
 
 /* Machine-dependent command-line options.  */
 
-const char *md_shortopts = "r";
+const char md_shortopts[] = "r";
 
-struct option md_longopts[] = {
+const struct option md_longopts[] = {
 #define OPTION_RELAX_ALL (OPTION_MD_BASE + 0)
   {"relax-all", no_argument, NULL, OPTION_RELAX_ALL},
 #define OPTION_NORELAX (OPTION_MD_BASE + 1)
@@ -85,7 +85,7 @@ struct option md_longopts[] = {
   {"march", required_argument, NULL, OPTION_MARCH}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* The assembler supports three different relaxation modes, controlled by
    command-line options.  */

diff --git a/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c
index bdd34749ca5b683c18a4f38d243f34a4e564342a..6e2ebd9c55ad11ed754067c3472cff2ccad81226 100644 (file)
--- a/gas/config/tc-ns32k.c
+++ b/gas/config/tc-ns32k.c
@@ -2109,16 +2109,16 @@ md_create_long_jump (char *ptr,
   md_number_to_disp (ptr + 1, (valueT) offset, 4);
 }
 \f
-const char *md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_DISP_SIZE (OPTION_MD_BASE)
   {"disp-size-default", required_argument , NULL, OPTION_DISP_SIZE},
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/config/tc-or1k.c b/gas/config/tc-or1k.c
index 14b09c9c3e6dff14fbfb61b20e986c4a3c23d76f..c91ac11c04a503fe71a40e9845c4907485d9c21e 100644 (file)
--- a/gas/config/tc-or1k.c
+++ b/gas/config/tc-or1k.c
@@ -56,13 +56,13 @@ const char EXP_CHARS[]            = "eE";
 const char FLT_CHARS[]            = "dD";
 
 #define OR1K_SHORTOPTS "m:"
-const char * md_shortopts = OR1K_SHORTOPTS;
+const char md_shortopts[] = OR1K_SHORTOPTS;
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 unsigned long or1k_machine = 0; /* default */
 

diff --git a/gas/config/tc-pdp11.c b/gas/config/tc-pdp11.c
index 3054ad1b2ae419f2053a5395caf0297119f9f6b9..a0e06a3b5011db3e6c1c770feaea9e0ba056408e 100644 (file)
--- a/gas/config/tc-pdp11.c
+++ b/gas/config/tc-pdp11.c
@@ -1271,9 +1271,9 @@ set_machine_model (const char *arg)
     return 0;
 }
 
-const char *md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_CPU 257
   { "cpu", required_argument, NULL, OPTION_CPU },
@@ -1284,7 +1284,7 @@ struct option md_longopts[] =
   { NULL, no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Invocation line includes a switch not recognized by the base assembler.
    See if it's a processor-specific option.  */

diff --git a/gas/config/tc-pj.c b/gas/config/tc-pj.c
index 38116373971970d13d3458622604fae9c344a143..bc49776af9084fdc13046aece7ec1301f6421e32 100644 (file)
--- a/gas/config/tc-pj.c
+++ b/gas/config/tc-pj.c
@@ -319,9 +319,9 @@ md_atof (int type, char *litP, int *sizeP)
   return ieee_md_atof (type, litP, sizeP, target_big_endian);
 }
 \f
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_LITTLE (OPTION_MD_BASE)
 #define OPTION_BIG    (OPTION_LITTLE + 1)
@@ -330,7 +330,7 @@ struct option md_longopts[] =
   {"big", no_argument, NULL, OPTION_BIG},
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 41007999731281161d3baccddfadc3652ab67b01..07e0f936d0bb3dbf377da4f54c6ec55be56d335f 100644 (file)
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1098,9 +1098,9 @@ unsigned int ppc_apuinfo_num_alloc;
 #endif /* OBJ_ELF */
 \f
 #ifdef OBJ_ELF
-const char *const md_shortopts = "b:l:usm:K:VQ:";
+const char md_shortopts[] = "b:l:usm:K:VQ:";
 #else
-const char *const md_shortopts = "um:";
+const char md_shortopts[] = "um:";
 #endif
 #define OPTION_NOPS (OPTION_MD_BASE + 0)
 const struct option md_longopts[] = {

diff --git a/gas/config/tc-pru.c b/gas/config/tc-pru.c
index fb158fb06e60e0f6bda30f59a9388eb172a586e7..cfed102da2180c16f795f50a7e1348fcc428e71b 100644 (file)
--- a/gas/config/tc-pru.c
+++ b/gas/config/tc-pru.c
@@ -75,7 +75,7 @@ struct pru_opt_s
 
 static struct pru_opt_s pru_opt = { true, true };
 
-const char *md_shortopts = "r";
+const char md_shortopts[] = "r";
 
 enum options
 {
@@ -84,7 +84,7 @@ enum options
   OPTION_NO_WARN_REGNAME_LABEL,
 };
 
-struct option md_longopts[] = {
+const struct option md_longopts[] = {
   { "mlink-relax",  no_argument, NULL, OPTION_LINK_RELAX  },
   { "mno-link-relax",  no_argument, NULL, OPTION_NO_LINK_RELAX  },
   { "mno-warn-regname-label",  no_argument, NULL,
@@ -92,7 +92,7 @@ struct option md_longopts[] = {
   { NULL, no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 typedef struct pru_insn_reloc
 {

diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
index 4e804ffa4c8fecc92b3918c23cd24f3f36c310d5..e19142dca19787496471d1ed0a87d74a68659bfc 100644 (file)
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -4305,7 +4305,7 @@ md_number_to_chars (char *buf, valueT val, int n)
     number_to_chars_littleendian (buf, val, n);
 }
 
-const char *md_shortopts = "O::g::G:";
+const char md_shortopts[] = "O::g::G:";
 
 enum options
 {
@@ -4326,7 +4326,7 @@ enum options
   OPTION_END_OF_ENUM
 };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"march", required_argument, NULL, OPTION_MARCH},
   {"fPIC", no_argument, NULL, OPTION_PIC},
@@ -4346,7 +4346,7 @@ struct option md_longopts[] =
 
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/config/tc-rl78.c b/gas/config/tc-rl78.c
index 3be82f36035a5c67a85f581875d7d649c6660aa3..4b6564eec807449138bef9c7058c1e6d54713c87 100644 (file)
--- a/gas/config/tc-rl78.c
+++ b/gas/config/tc-rl78.c
@@ -288,10 +288,10 @@ enum options
 };
 
 #define RL78_SHORTOPTS ""
-const char * md_shortopts = RL78_SHORTOPTS;
+const char md_shortopts[] = RL78_SHORTOPTS;
 
 /* Assembler options.  */
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"relax", no_argument, NULL, OPTION_RELAX},
   {"norelax", no_argument, NULL, OPTION_NORELAX},
@@ -303,7 +303,7 @@ struct option md_longopts[] =
   {"m64bit-doubles", no_argument, NULL, OPTION_64BIT_DOUBLES},
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char * arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-rx.c b/gas/config/tc-rx.c
index 157f8958e199d0d3a2032f172938559c13df751f..a881f2a112b98e6b159a3a4e073ffa39bb4442c1 100644 (file)
--- a/gas/config/tc-rx.c
+++ b/gas/config/tc-rx.c
@@ -78,10 +78,10 @@ enum options
 };
 
 #define RX_SHORTOPTS ""
-const char * md_shortopts = RX_SHORTOPTS;
+const char md_shortopts[] = RX_SHORTOPTS;
 
 /* Assembler options.  */
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"mbig-endian-data", no_argument, NULL, OPTION_BIG},
   {"mlittle-endian-data", no_argument, NULL, OPTION_LITTLE},
@@ -105,7 +105,7 @@ struct option md_longopts[] =
   {"mno-allow-string-insns", no_argument, NULL, OPTION_DISALLOW_STRING_INSNS},
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 struct cpu_type
 {

diff --git a/gas/config/tc-s12z.c b/gas/config/tc-s12z.c
index 0f8044de6a8a571476fd48fda2c3fc6d8130c7c1..c0920f18ca4d563ef691ae1e7277d47202bd412c 100644 (file)
--- a/gas/config/tc-s12z.c
+++ b/gas/config/tc-s12z.c
@@ -84,9 +84,9 @@ s12z_strtol (const char *str, char ** endptr)
 \f
 /* Options and initialization.  */
 
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
   {
 #define OPTION_REG_PREFIX (OPTION_MD_BASE)
    {"mreg-prefix", required_argument, NULL, OPTION_REG_PREFIX},
@@ -95,7 +95,7 @@ struct option md_longopts[] =
    {NULL, no_argument, NULL, 0}
   };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 \f
 
 relax_typeS md_relax_table[] =

diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 055b6948c8421e5da6c6f9e7dcf43922f0daafee..d8f31daeef2298acf76ffd4b277e756483ff5d57 100644 (file)
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -254,11 +254,11 @@ int md_short_jump_size = 4;
 int md_long_jump_size = 4;
 #endif
 
-const char *md_shortopts = "A:m:kVQ:";
-struct option md_longopts[] = {
+const char md_shortopts[] = "A:m:kVQ:";
+const struct option md_longopts[] = {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Initialize the default opcode arch and word size from the default
    architecture name if not specified by an option.  */

diff --git a/gas/config/tc-score.c b/gas/config/tc-score.c
index 707bd6f1891a66be99f1311cf50ed97cab370544..2c24f42a65942dcefed69023b4ef1c994c535d33 100644 (file)
--- a/gas/config/tc-score.c
+++ b/gas/config/tc-score.c
@@ -216,8 +216,8 @@ const pseudo_typeS md_pseudo_table[] =
   {0, 0, 0}
 };
 
-const char *md_shortopts = "nO::g::G:";
-struct option md_longopts[] =
+const char md_shortopts[] = "nO::g::G:";
+const struct option md_longopts[] =
 {
 #ifdef OPTION_EB
   {"EB"     , no_argument, NULL, OPTION_EB},
@@ -239,7 +239,7 @@ struct option md_longopts[] =
   {NULL     , no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 #define s3_GP                     28
 #define s3_PIC_CALL_REG           29

diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 78c3fca955a939b52ecf22edd89877fb5c7d46fe..1509a56c8b9ec8596a2addcee20ffbfdfe35a6c1 100644 (file)
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -2708,8 +2708,8 @@ enum options
   OPTION_DUMMY  /* Not used.  This is just here to make it easy to add and subtract options from this enum.  */
 };
 
-const char *md_shortopts = "";
-struct option md_longopts[] =
+const char md_shortopts[] = "";
+const struct option md_longopts[] =
 {
   {"relax", no_argument, NULL, OPTION_RELAX},
   {"big", no_argument, NULL, OPTION_BIG},
@@ -2732,7 +2732,7 @@ struct option md_longopts[] =
 
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index bd489d5d26bb21febeb0dd59ef61f683054ac8e9..5dedd4299e466e7c993e67671be6005a16fde46d 100644 (file)
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -401,8 +401,8 @@ sparc_target_format (void)
  *             error.  For example, from sparclite to v9.
  */
 
-const char *md_shortopts = "A:K:VQ:sq";
-struct option md_longopts[] = {
+const char md_shortopts[] = "A:K:VQ:sq";
+const struct option md_longopts[] = {
 #define OPTION_BUMP (OPTION_MD_BASE)
   {"bump", no_argument, NULL, OPTION_BUMP},
 #define OPTION_SPARC (OPTION_MD_BASE + 1)
@@ -442,7 +442,7 @@ struct option md_longopts[] = {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/config/tc-spu.c b/gas/config/tc-spu.c
index ea9d859091b6ef5253626f79e44ead1c4891732c..8793b5778fdf4babdc96e08998f3223277c04d9f 100644 (file)
--- a/gas/config/tc-spu.c
+++ b/gas/config/tc-spu.c
@@ -120,8 +120,8 @@ md_begin (void)
     str_hash_insert (op_hash, spu_opcodes[i].mnemonic, &spu_opcodes[i], 0);
 }
 \f
-const char *md_shortopts = "";
-struct option md_longopts[] = {
+const char md_shortopts[] = "";
+const struct option md_longopts[] = {
 #define OPTION_APUASM (OPTION_MD_BASE)
   {"apuasm", no_argument, NULL, OPTION_APUASM},
 #define OPTION_DD2 (OPTION_MD_BASE+1)
@@ -132,7 +132,7 @@ struct option md_longopts[] = {
   {"mdd3.0", no_argument, NULL, OPTION_DD3},
   { NULL, no_argument, NULL, 0 }
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* When set (by -apuasm) our assembler emulates the behaviour of apuasm.
  * e.g. don't add bias to float conversion and don't right shift

diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c
index 8377f28a50525f81b5801039d9a82bd0336b0cba..a76c12664c6ae2ed82eec8104a9e27083b36c66d 100644 (file)
--- a/gas/config/tc-tic30.c
+++ b/gas/config/tc-tic30.c
@@ -40,13 +40,13 @@ const char comment_chars[]        = ";";
 const char line_comment_chars[]   = "*";
 const char line_separator_chars[] = "";
 
-const char *md_shortopts = "";
-struct option md_longopts[] =
+const char md_shortopts[] = "";
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* Chars that mean this number is a floating point constant.
    As in 0f12.456

diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
index 6c86b21a8872cb51bf4a45dc8d124106ca075b07..3b4e4112814125c984ade5af0b67506f6475a391 100644 (file)
--- a/gas/config/tc-tic4x.c
+++ b/gas/config/tc-tic4x.c
@@ -77,8 +77,8 @@ static unsigned long tic4x_oplevel = 0;   /* Opcode level */
 #define OPTION_ENHANCED (OPTION_MD_BASE + 7)
 #define OPTION_REV      (OPTION_MD_BASE + 8)
 
-const char *md_shortopts = "bm:prs";
-struct option md_longopts[] =
+const char md_shortopts[] = "bm:prs";
+const struct option md_longopts[] =
 {
   { "mcpu",   required_argument, NULL, OPTION_CPU },
   { "mdsp",   required_argument, NULL, OPTION_CPU },
@@ -93,8 +93,7 @@ struct option md_longopts[] =
   { NULL, no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
-
+const size_t md_longopts_size = sizeof (md_longopts);
 
 typedef enum
   {

diff --git a/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c
index 5a0722085d81b3e4e48ea1a0a7fa49d87fcfcf25..b60b1a7777ba69ffa9dde8972f8fabd67c331dcd 100644 (file)
--- a/gas/config/tc-tic54x.c
+++ b/gas/config/tc-tic54x.c
@@ -138,14 +138,14 @@ const char FLT_CHARS[] = "fF";
    nums.  */
 const char EXP_CHARS[] = "eE";
 
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
 #define OPTION_ADDRESS_MODE     (OPTION_MD_BASE)
 #define OPTION_CPU_VERSION      (OPTION_ADDRESS_MODE + 1)
 #define OPTION_COFF_VERSION     (OPTION_CPU_VERSION + 1)
 #define OPTION_STDERR_TO_FILE   (OPTION_COFF_VERSION + 1)
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "mfar-mode",       no_argument,        NULL, OPTION_ADDRESS_MODE },
   { "mf",             no_argument,         NULL, OPTION_ADDRESS_MODE },
@@ -155,7 +155,7 @@ struct option md_longopts[] =
   { NULL,              no_argument,         NULL, 0},
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 static int assembly_begun = 0;
 /* Addressing mode is not entirely implemented; the latest rev of the Other

diff --git a/gas/config/tc-tic6x.c b/gas/config/tc-tic6x.c
index 302043a26765862940df8a3cc5459b293e52319b..8a2d4e3bb969302bcbe817df0e56266e61e0017c 100644 (file)
--- a/gas/config/tc-tic6x.c
+++ b/gas/config/tc-tic6x.c
@@ -48,7 +48,7 @@ const char line_separator_chars[] = "@";
 const char EXP_CHARS[] = "eE";
 const char FLT_CHARS[] = "dDfF";
 
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
 enum
   {
@@ -63,7 +63,7 @@ enum
     OPTION_MGENERATE_REL
   };
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
   {
     { "march", required_argument, NULL, OPTION_MARCH },
     { "mbig-endian", no_argument, NULL, OPTION_MBIG_ENDIAN },
@@ -76,7 +76,7 @@ struct option md_longopts[] =
     { "mgenerate-rel", no_argument, NULL, OPTION_MGENERATE_REL },
     { NULL, no_argument, NULL, 0 }
   };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* The instructions enabled based only on the selected architecture
    (all instructions, if no architecture specified).  */

diff --git a/gas/config/tc-tilegx.c b/gas/config/tc-tilegx.c
index 4e81af71e454fcb8d15c83248b0b2f202f7e148c..1c249e0e8326f7ffb5af0cfd2850be520b2b6e4e 100644 (file)
--- a/gas/config/tc-tilegx.c
+++ b/gas/config/tc-tilegx.c
@@ -84,9 +84,9 @@ tilegx_target_format (void)
 #define OPTION_EB (OPTION_MD_BASE + 2)
 #define OPTION_EL (OPTION_MD_BASE + 3)
 
-const char *md_shortopts = "VQ:";
+const char md_shortopts[] = "VQ:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {"32", no_argument, NULL, OPTION_32},
   {"64", no_argument, NULL, OPTION_64},
@@ -95,7 +95,7 @@ struct option md_longopts[] =
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-tilepro.c b/gas/config/tc-tilepro.c
index dced4e28dd991d5add3906e35c0871a05ccd7394..a0ea5055e24750085c2757e750e7b2d8f7a15e33 100644 (file)
--- a/gas/config/tc-tilepro.c
+++ b/gas/config/tc-tilepro.c
@@ -61,14 +61,14 @@ const char EXP_CHARS[] = "eE";
    as in 0d1.0.  */
 const char FLT_CHARS[] = "rRsSfFdDxXpP";
 
-const char *md_shortopts = "VQ:";
+const char md_shortopts[] = "VQ:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg ATTRIBUTE_UNUSED)

diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c
index cb518a7da05694c2421efdf455184fcf5a90e51e..e66a74e8a272deb838e136468fa7483c34ebecef 100644 (file)
--- a/gas/config/tc-v850.c
+++ b/gas/config/tc-v850.c
@@ -1515,9 +1515,9 @@ parse_register_list (unsigned long *insn,
   return NULL;
 }
 
-const char *md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_DISP_SIZE_DEFAULT_22 (OPTION_MD_BASE)
   {"disp-size-default-22", no_argument, NULL, OPTION_DISP_SIZE_DEFAULT_22},
@@ -1526,7 +1526,7 @@ struct option md_longopts[] =
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 static bool v850_data_8 = false;
 

diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c
index cab1264e8769fe5f0c698abdcfebc167979cd2b0..9125611ae52683d1fa1783f42b9f5f7fbdcd4aeb 100644 (file)
--- a/gas/config/tc-vax.c
+++ b/gas/config/tc-vax.c
@@ -2190,18 +2190,18 @@ md_create_long_jump (char *ptr,
 }
 \f
 #ifdef OBJ_ELF
-const char *md_shortopts = "d:STt:VkQ:";
+const char md_shortopts[] = "d:STt:VkQ:";
 #else
-const char *md_shortopts = "d:STt:V";
+const char md_shortopts[] = "d:STt:V";
 #endif
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #ifdef OBJ_ELF
   { "pic", no_argument, NULL, 'k' },
 #endif
   { NULL, no_argument, NULL, 0 }
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/config/tc-visium.c b/gas/config/tc-visium.c
index fcb128a1abbcc93babc03b71e11098c723e1cc39..62880210f5bb86bfceb115db327d3c8dcfb3d8f6 100644 (file)
--- a/gas/config/tc-visium.c
+++ b/gas/config/tc-visium.c
@@ -218,14 +218,14 @@ md_undefined_symbol (char *name ATTRIBUTE_UNUSED)
 }
 
 /* The parse options.  */
-const char *md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 struct visium_option_table
 {

diff --git a/gas/config/tc-wasm32.c b/gas/config/tc-wasm32.c
index 71f58bc1047a71bc72aac7dcf999cf506f8be2d5..b0af6f86ab617c973b3bec77755dd28e53e9213b 100644 (file)
--- a/gas/config/tc-wasm32.c
+++ b/gas/config/tc-wasm32.c
@@ -78,7 +78,7 @@ const char comment_chars[] = ";#";
 const char line_comment_chars[] = ";#";
 const char line_separator_chars[] = "";
 
-const char *md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 
 const char EXP_CHARS[] = "eE";
 const char FLT_CHARS[] = "dD";
@@ -94,12 +94,12 @@ const pseudo_typeS md_pseudo_table[] =
 
 static htab_t wasm32_hash;
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 /* No relaxation/no machine-dependent frags.  */
 

diff --git a/gas/config/tc-xgate.c b/gas/config/tc-xgate.c
index d55e7a91395c645d5f8a73493ddec7070ee66531..6a345c5a0a5ac1021f0a3d273e959e6aebe24366 100644 (file)
--- a/gas/config/tc-xgate.c
+++ b/gas/config/tc-xgate.c
@@ -163,9 +163,9 @@ const pseudo_typeS md_pseudo_table[] =
   {0, 0, 0}
 };
 
-const char *md_shortopts = "m:";
+const char md_shortopts[] = "m:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
 #define OPTION_PRINT_INSN_SYNTAX  (OPTION_MD_BASE + 0)
   { "print-insn-syntax", no_argument, NULL, OPTION_PRINT_INSN_SYNTAX },
@@ -191,7 +191,7 @@ struct option md_longopts[] =
   { NULL, no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 const char *
 md_atof (int type, char *litP, int *sizeP)

diff --git a/gas/config/tc-xstormy16.c b/gas/config/tc-xstormy16.c
index eb070791db9329a355e644b838712cb969926b73..a0336947e43f52daf9508852dbdf09b0239ad48b 100644 (file)
--- a/gas/config/tc-xstormy16.c
+++ b/gas/config/tc-xstormy16.c
@@ -56,13 +56,13 @@ const char FLT_CHARS[]            = "dD";
 #define O_fptr_symbol  (O_max + 1)
 \f
 #define XSTORMY16_SHORTOPTS ""
-const char * md_shortopts = XSTORMY16_SHORTOPTS;
+const char md_shortopts[] = XSTORMY16_SHORTOPTS;
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int    c ATTRIBUTE_UNUSED,

diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index deecbb143d018aa52548745191ac0481248a3d06..8206b1a25914c99cdceec04c40406f01ca118bd2 100644 (file)
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -735,9 +735,9 @@ enum
   option_abi_call0,
 };
 
-const char *md_shortopts = "";
+const char md_shortopts[] = "";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "density", no_argument, NULL, option_density },
   { "no-density", no_argument, NULL, option_no_density },
@@ -820,8 +820,7 @@ struct option md_longopts[] =
   { NULL, no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof md_longopts;
-
+const size_t md_longopts_size = sizeof md_longopts;
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c
index eaabb261168282af8ac31fa79d8febbb60e07596..86f8e6be673c9996e0c99082fff1abe4a70edf7a 100644 (file)
--- a/gas/config/tc-z80.c
+++ b/gas/config/tc-z80.c
@@ -34,7 +34,7 @@ const char EXP_CHARS[] = "eE\0";
 const char FLT_CHARS[] = "RrDdFfSsHh\0";
 
 /* For machine specific options.  */
-const char * md_shortopts = ""; /* None yet.  */
+const char md_shortopts[] = ""; /* None yet.  */
 
 enum options
 {
@@ -80,7 +80,7 @@ enum options
 #define INS_UNDOC (INS_IDX_HALF | INS_IN_F_C)
 #define INS_UNPORT (INS_OUT_C_0 | INS_SLI | INS_ROT_II_LD)
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
 {
   { "march",     required_argument, NULL, OPTION_MARCH},
   { "z80",       no_argument, NULL, OPTION_MACH_Z80},
@@ -115,7 +115,7 @@ struct option md_longopts[] =
   { NULL, no_argument, NULL, 0 }
 } ;
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 extern int coff_flags;
 /* Instruction classes that silently assembled.  */

diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index b23f152aa73f814b38bcebc18c98d6eebbe1e826..b96b5cf5160d06f8cab9f1c51bb829c4c8f3c003 100644 (file)
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -1309,16 +1309,16 @@ md_atof (int type, char *litP, int *sizeP)
   return ieee_md_atof (type, litP, sizeP, true);
 }
 \f
-const char *md_shortopts = "z:";
+const char md_shortopts[] = "z:";
 
-struct option md_longopts[] =
+const struct option md_longopts[] =
   {
 #define OPTION_RELAX  (OPTION_MD_BASE)
     {"linkrelax", no_argument, NULL, OPTION_RELAX},
     {NULL, no_argument, NULL, 0}
   };
 
-size_t md_longopts_size = sizeof (md_longopts);
+const size_t md_longopts_size = sizeof (md_longopts);
 
 int
 md_parse_option (int c, const char *arg)

diff --git a/gas/doc/internals.texi b/gas/doc/internals.texi
index e59d67655d7cf8baced27f5de52993051bf55e40..18fca0ebdef41a90dc8240932e37132de82293b5 100644 (file)
--- a/gas/doc/internals.texi
+++ b/gas/doc/internals.texi
@@ -814,7 +814,7 @@ zero if the target is little endian.
 @cindex md_show_usage
 @cindex md_after_parse_args
 GAS uses these variables and functions during option processing.
-@code{md_shortopts} is a @code{const char *} which GAS adds to the machine
+@code{md_shortopts} is a @code{const char []} which GAS adds to the machine
 independent string passed to @code{getopt}.  @code{md_longopts} is a
 @code{struct option []} which GAS adds to the machine independent long options
 passed to @code{getopt}; you may use @code{OPTION_MD_BASE}, defined in

diff --git a/gas/tc.h b/gas/tc.h
index ec47d45b73936a67591e53a92259ea139045089d..4e387d12f442492b12296964b5200f211386dcea 100644 (file)
--- a/gas/tc.h
+++ b/gas/tc.h
@@ -22,6 +22,10 @@
 /* In theory (mine, at least!) the machine dependent part of the assembler
    should only have to include one file.  This one.  -- JF */
 
+extern const char md_shortopts[];
+extern const struct option md_longopts[];
+extern const size_t md_longopts_size;
+
 extern const pseudo_typeS md_pseudo_table[];
 
 const char * md_atof (int, char *, int *);