Ignore properly -mdirect-move (PR target/87164).

2018-09-05  Martin Liska  <mliska@suse.cz>

	PR target/87164
	* config/rs6000/rs6000.opt: Mark the option as Deprecated.
	* optc-gen.awk: Allow 'Var' for Deprecated options in order
	to generate a MASK value.

From-SVN: r264111

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b19487000ac914d606883871d6d7190347cd541..ce7a3b1370071dc34fdaa52ad7a80f2d0aec303b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-09-05  Martin Liska  <mliska@suse.cz>
+
+       PR target/87164
+       * config/rs6000/rs6000.opt: Mark the option as Deprecated.
+       * optc-gen.awk: Allow 'Var' for Deprecated options in order
+       to generate a MASK value.
+
 2018-09-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR debug/86593

diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 0abeeafc64699977316c8b7ea324e5dabb8242cf..138ce26d03f5e03f8360e3b9004644e1b8096c4c 100644 (file)
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -483,9 +483,8 @@ mcrypto
 Target Report Mask(CRYPTO) Var(rs6000_isa_flags)
 Use ISA 2.07 Category:Vector.AES and Category:Vector.SHA2 instructions.
 
-; We can't use Ignore flag because DIRECT_MOVE mask is still used.
 mdirect-move
-Target Undocumented Mask(DIRECT_MOVE) Var(rs6000_isa_flags) Warn(%qs is deprecated)
+Target Undocumented Mask(DIRECT_MOVE) Var(rs6000_isa_flags) Deprecated
 
 mhtm
 Target Report Mask(HTM) Var(rs6000_isa_flags)

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index 9a79bb862435230d9275ee5077f40c3dfd061579..3668b3ef0e4ab470a00c7b61de5592b51e607539 100644 (file)
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -336,8 +336,6 @@ for (i = 0; i < n_opts; i++) {
                          alias_data = "NULL, NULL, OPT_SPECIAL_deprecated"
         if (warn_message != "NULL")
                                  print "#error Deprecated option with Warn"
-        if (var_name(flags[i]) != "")
-                                 print "#error Deprecated option with Var"
         if (flag_set_p("Report", flags[i]))
                                  print "#error Deprecated option with Report"
       }