aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRobin Dapp <rdapp@linux.vnet.ibm.com>2018-06-26 11:50:09 +0000
committerRobin Dapp <rdapp@gcc.gnu.org>2018-06-26 11:50:09 +0000
commit4723f0fb4ec50e716da4e1e19909cdc735fadcbb (patch)
treeb652830b14d5c8d03afd079cb984afc6bc6c6f0a /gcc
parentd37a91e5c57c518c91de2e570fdbf9d96f90dd41 (diff)
downloadgcc-4723f0fb4ec50e716da4e1e19909cdc735fadcbb.zip
gcc-4723f0fb4ec50e716da4e1e19909cdc735fadcbb.tar.gz
gcc-4723f0fb4ec50e716da4e1e19909cdc735fadcbb.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/s390/s390.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13b648c..c3314b4 100644
--- 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 de71fd9..71a12b8 100644
--- 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);