From 4723f0fb4ec50e716da4e1e19909cdc735fadcbb Mon Sep 17 00:00:00 2001 From: Robin Dapp Date: Tue, 26 Jun 2018 11:50:09 +0000 Subject: [PATCH] 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 * config/s390/s390.h (enum processor_flags): Do not use default tune parameter when -march was specified. From-SVN: r262143 --- gcc/ChangeLog | 5 +++++ gcc/config/s390/s390.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 13b648cab29..c3314b44a30 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-06-26 Robin Dapp + + * config/s390/s390.h (enum processor_flags): Do not use + default tune parameter when -march was specified. + 2018-06-26 Jakub Jelinek PR target/86314 diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h index de71fd927e2..71a12b8c92e 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); -- 2.30.2