diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-10-15 09:34:25 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-10-15 09:34:25 +0200 |
| commit | b44dd04358b39eefa5e622728c9668aa1f19a983 (patch) | |
| tree | 65e29c4ec431dfce6fba26cfff14cd88345e0ad6 /gcc | |
| parent | 49d60f14c0f142c86b5e86c7b8ce4f9b6e05ee63 (diff) | |
| download | gcc-b44dd04358b39eefa5e622728c9668aa1f19a983.zip gcc-b44dd04358b39eefa5e622728c9668aa1f19a983.tar.gz gcc-b44dd04358b39eefa5e622728c9668aa1f19a983.tar.bz2 | |
option-defaults.h (OPTION_DEFAULT_SPECS): Don't add --with-tune{,-32,-64} configured default for -mtune if...
* config/rs6000/option-defaults.h (OPTION_DEFAULT_SPECS): Don't
add --with-tune{,-32,-64} configured default for -mtune if explicit
-mcpu is used.
From-SVN: r152799
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/rs6000/option-defaults.h | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a161100..f7743f6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-10-15 Jakub Jelinek <jakub@redhat.com> + + * config/rs6000/option-defaults.h (OPTION_DEFAULT_SPECS): Don't + add --with-tune{,-32,-64} configured default for -mtune if explicit + -mcpu is used. + 2009-10-14 DJ Delorie <dj@redhat.com> * config/h8300/h8300.c (F): New. diff --git a/gcc/config/rs6000/option-defaults.h b/gcc/config/rs6000/option-defaults.h index 682add7..7e117d7 100644 --- a/gcc/config/rs6000/option-defaults.h +++ b/gcc/config/rs6000/option-defaults.h @@ -50,15 +50,15 @@ /* Support for a compile-time default CPU, et cetera. The rules are: --with-cpu is ignored if -mcpu is specified; likewise --with-cpu-32 and --with-cpu-64. - --with-tune is ignored if -mtune is specified; likewise --with-tune-32 - and --with-tune-64. + --with-tune is ignored if -mtune or -mcpu is specified; likewise + --with-tune-32 and --with-tune-64. --with-float is ignored if -mhard-float or -msoft-float are - specified. */ + specified. */ #define OPTION_DEFAULT_SPECS \ + {"tune", "%{!mtune=*:%{!mcpu=*:-mtune=%(VALUE)}}" }, \ + {"tune_32", "%{" OPT_ARCH32 ":%{!mtune=*:%{!mcpu=*:-mtune=%(VALUE)}}}" }, \ + {"tune_64", "%{" OPT_ARCH64 ":%{!mtune=*:%{!mcpu=*:-mtune=%(VALUE)}}}" }, \ {"cpu", "%{!mcpu=*:-mcpu=%(VALUE)}" }, \ {"cpu_32", "%{" OPT_ARCH32 ":%{!mcpu=*:-mcpu=%(VALUE)}}" }, \ {"cpu_64", "%{" OPT_ARCH64 ":%{!mcpu=*:-mcpu=%(VALUE)}}" }, \ - {"tune", "%{!mtune=*:-mtune=%(VALUE)}" }, \ - {"tune_32", "%{" OPT_ARCH32 ":%{!mtune=*:-mtune=%(VALUE)}}" }, \ - {"tune_64", "%{" OPT_ARCH64 ":%{!mtune=*:-mtune=%(VALUE)}}" }, \ {"float", "%{!msoft-float:%{!mhard-float:-m%(VALUE)-float}}" } |