Fix Unreasonable arch and cpu conflict warning for ther CSky architecture.

	* config/tc-csky.c (md_begin): Fix tests of arch and mach flags.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ef6fc5a3ed63a89dada20af66442eed7e5012bf6..fdbba0e5bb9e55e6a6db2071e11c9289d6dfca87 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-21  Cooper Qu  <cooper.qu@linux.alibaba.com>
+
+       * config/tc-csky.c (md_begin): Fix tests of arch and mach flags.
+
 2020-07-21  Jan Beulich  <jbeulich@suse.com>
 
        * testsuite/gas/i386/evex-no-scale-32.d,

diff --git a/gas/config/tc-csky.c b/gas/config/tc-csky.c
index be54afbd679cc7e8ab207de47268faf14f3f3ed5..e90ebc2d88d3ab49dc5e69ddf9a5d63b44c43852 100644 (file)
--- a/gas/config/tc-csky.c
+++ b/gas/config/tc-csky.c
@@ -1181,9 +1181,11 @@ md_begin (void)
 
   if (mach_flag != 0)
     {
-      if ((mach_flag & CSKY_ARCH_MASK) != arch_flag && arch_flag != 0)
+      if (((mach_flag & CSKY_ARCH_MASK) != (arch_flag & CSKY_ARCH_MASK))
+          && arch_flag != 0)
        as_warn (_("-mcpu conflict with -march option, using -mcpu"));
-      if ((mach_flag & ~CSKY_ARCH_MASK) != flags && flags != 0)
+      if (((mach_flag & ~CSKY_ARCH_MASK) != (flags & ~CSKY_ARCH_MASK))
+         && flags != 0)
        as_warn (_("-mcpu conflict with other model parameters, using -mcpu"));
     }
   else if (arch_flag != 0)