aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Bergner <bergner@vnet.ibm.com>2010-07-09 10:00:55 -0500
committerPeter Bergner <bergner@gcc.gnu.org>2010-07-09 10:00:55 -0500
commit2c9ccc21b11aa2bb63b908b33c8f9bc9c15c960d (patch)
tree190f3c716623791adf7277b5949fd23b9d1d215e
parent5c9fae0d6eee586bce72f832e535d218ddd9bd5a (diff)
downloadgcc-2c9ccc21b11aa2bb63b908b33c8f9bc9c15c960d.zip
gcc-2c9ccc21b11aa2bb63b908b33c8f9bc9c15c960d.tar.gz
gcc-2c9ccc21b11aa2bb63b908b33c8f9bc9c15c960d.tar.bz2
rs6000.c (rs6000_override_options): Fix setting of default ISA flags.
* config/rs6000/rs6000.c (rs6000_override_options): Fix setting of default ISA flags. * config/rs6000/rs6000.h (ASM_CPU_SPEC): Add -mvsx. From-SVN: r161999
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/rs6000/rs6000.c6
-rw-r--r--gcc/config/rs6000/rs6000.h1
3 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7cad422..1bfd18e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-09 Peter Bergner <bergner@vnet.ibm.com>
+
+ * config/rs6000/rs6000.c (rs6000_override_options): Fix setting of
+ default ISA flags.
+ * config/rs6000/rs6000.h (ASM_CPU_SPEC): Add -mvsx.
+
2010-07-09 Tom de Vries <tjvries@xs4all.nl>
* tree.c (type_hash_if_marked_p): Removed non-ggc_marked_p clause.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 0edd6be..2d075c6 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -2683,11 +2683,11 @@ rs6000_override_options (const char *default_cpu)
/* For the newer switches (vsx, dfp, etc.) set some of the older options,
unless the user explicitly used the -mno-<option> to disable the code. */
if (TARGET_VSX)
- target_flags |= (ISA_2_6_MASKS & (target_flags_explicit & ~ISA_2_6_MASKS));
+ target_flags |= (ISA_2_6_MASKS & ~target_flags_explicit);
else if (TARGET_DFP)
- target_flags |= (ISA_2_5_MASKS & (target_flags_explicit & ~ISA_2_5_MASKS));
+ target_flags |= (ISA_2_5_MASKS & ~target_flags_explicit);
else if (TARGET_ALTIVEC)
- target_flags |= (MASK_PPC_GFXOPT & (target_flags_explicit & ~MASK_PPC_GFXOPT));
+ target_flags |= (MASK_PPC_GFXOPT & ~target_flags_explicit);
/* Set debug flags */
if (rs6000_debug_name)
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 2ee3da1..68aec5b 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -160,6 +160,7 @@
%{mcpu=e500mc: -me500mc} \
%{mcpu=e500mc64: -me500mc64} \
%{maltivec: -maltivec} \
+%{mvsx: -mvsx %{!maltivec: -maltivec} %{!mcpu*: %(asm_cpu_power7)}} \
-many"
#define CPP_DEFAULT_SPEC ""