Rename OPTION_OMIT_LOCK_PREFIX to OPTION_MOMIT_LOCK_PREFIX

Use OPTION_MXXX for -mxxx option in x86 assembler.

	* config/tc-i386.c (OPTION_OMIT_LOCK_PREFIX): Renamed to ...
	(OPTION_MOMIT_LOCK_PREFIX): This.
	(md_longopts): Updated.
	(md_parse_option): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 910af9d97da88f976510df10a1007320bbbe24b1..eb9fff1b29cf4251acf18afbb7b5c13957bf88b1 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * config/tc-i386.c (OPTION_OMIT_LOCK_PREFIX): Renamed to ...
+       (OPTION_MOMIT_LOCK_PREFIX): This.
+       (md_longopts): Updated.
+       (md_parse_option): Likewise.
+
 2016-01-25  Catherine Moore  <clm@codesourcery.com>
 
        * config/mips/tc-mips.c (md_begin): Avoid gp-relative addressing

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 435454966c606f359e73e4b191d633c02a4f8f71..62f247c7af48d34908477fea6a46a144e28f8e26 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -9617,7 +9617,7 @@ const char *md_shortopts = "qn";
 #define OPTION_MEVEXLIG (OPTION_MD_BASE + 16)
 #define OPTION_MEVEXWIG (OPTION_MD_BASE + 17)
 #define OPTION_MBIG_OBJ (OPTION_MD_BASE + 18)
-#define OPTION_OMIT_LOCK_PREFIX (OPTION_MD_BASE + 19)
+#define OPTION_MOMIT_LOCK_PREFIX (OPTION_MD_BASE + 19)
 #define OPTION_MEVEXRCIG (OPTION_MD_BASE + 20)
 #define OPTION_MSHARED (OPTION_MD_BASE + 21)
 #define OPTION_MAMD64 (OPTION_MD_BASE + 22)
@@ -9652,7 +9652,7 @@ struct option md_longopts[] =
 # if defined (TE_PE) || defined (TE_PEP)
   {"mbig-obj", no_argument, NULL, OPTION_MBIG_OBJ},
 #endif
-  {"momit-lock-prefix", required_argument, NULL, OPTION_OMIT_LOCK_PREFIX},
+  {"momit-lock-prefix", required_argument, NULL, OPTION_MOMIT_LOCK_PREFIX},
   {"mevexrcig", required_argument, NULL, OPTION_MEVEXRCIG},
   {"mamd64", no_argument, NULL, OPTION_MAMD64},
   {"mintel64", no_argument, NULL, OPTION_MINTEL64},
@@ -9963,7 +9963,7 @@ md_parse_option (int c, char *arg)
       break;
 #endif
 
-    case OPTION_OMIT_LOCK_PREFIX:
+    case OPTION_MOMIT_LOCK_PREFIX:
       if (strcasecmp (arg, "yes") == 0)
         omit_lock_prefix = 1;
       else if (strcasecmp (arg, "no") == 0)