S/390: Fix mtune default.

When building with --with-tune=zEC12 and calling the resulting gcc
with --march=z13 (no extra -mtune), the binary would unexpectedly be compiled
with -march=z13 -mtune=zEC12.  This patch avoids using the default tune
parameter if -march is specified as argument but the user can still
explicitly state -march=z13 -mtune=zEC12.

gcc/ChangeLog:

2018-06-26  Robin Dapp  <rdapp@linux.vnet.ibm.com>

	* config/s390/s390.h (enum processor_flags): Do not use
	default tune parameter when -march was specified.

From-SVN: r262143

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13b648cab29ec25ab7b744c7104f114cf824af07..c3314b44a30b91ead3cb08399c20f274d8767ada 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-26  Robin Dapp  <rdapp@linux.vnet.ibm.com>
+
+        * config/s390/s390.h (enum processor_flags): Do not use
+        default tune parameter when -march was specified.
+
 2018-06-26  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/86314

diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index de71fd927e21c7d06485cdd9ab9a86a64b02b531..71a12b8c92eec3b835d97111cf55c67d068b26bc 100644 (file)
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -205,7 +205,7 @@ enum processor_flags
 #define OPTION_DEFAULT_SPECS                                   \
   { "mode", "%{!mesa:%{!mzarch:-m%(VALUE)}}" },                        \
   { "arch", "%{!march=*:-march=%(VALUE)}" },                   \
-  { "tune", "%{!mtune=*:-mtune=%(VALUE)}" }
+  { "tune", "%{!mtune=*:%{!march=*:-mtune=%(VALUE)}}" }
 
 #ifdef __s390__
 extern const char *s390_host_detect_local_cpu (int argc, const char **argv);