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: r95822

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 15dc08ecf1216814a323249c40aaf14141a3d3c4..6a69237c20aac046c847135a4a154ba4f165cdc3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-03  Alan Modra  <amodra@bigpond.net.au>
+
+       PR target/20277
+       * config/rs6000/rs6000.c (rs6000_override_options): Don't allow
+       -mcpu to override any other explicitly given flags.
+
 2005-03-02  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/19916

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 4a4092890d76e480bab0e3de8b590d1012bc4d8e..f23de4c3f76153a07fe5b7756b683e57ceca7365 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -754,9 +754,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;