From 768875a86fdf0a487ba662404e04f1898ce88c1e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 3 Mar 2005 01:03:28 +0000 Subject: [PATCH] re PR target/20277 (-mcpu=power4 vs. -maltivec) PR target/20277 * config/rs6000/rs6000.c (rs6000_override_options): Don't allow -mcpu to override any other explicitly given flags. From-SVN: r95820 --- gcc/ChangeLog | 6 ++++++ gcc/config/rs6000/rs6000.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8e4d6dc15a6..ac00e934878 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-03-03 Alan Modra + + PR target/20277 + * config/rs6000/rs6000.c (rs6000_override_options): Don't allow + -mcpu to override any other explicitly given flags. + 2005-03-02 J"orn Rennecke * recog.c (verify_changes, confirm_change_group): New functions, diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index ff6d09d3ba0..2687a1acb1c 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -1192,9 +1192,8 @@ rs6000_override_options (const char *default_cpu) set_masks &= ~MASK_ALTIVEC; #endif - /* Don't override these by the processor default if given explicitly. */ - set_masks &= ~(target_flags_explicit - & (MASK_MULTIPLE | MASK_STRING | MASK_SOFT_FLOAT)); + /* Don't override by the processor default if given explicitly. */ + set_masks &= ~target_flags_explicit; /* Identify the processor type. */ rs6000_select[0].string = default_cpu; -- 2.30.2