backport: rs6000.c (rs6000_option_override_internal): Clear MASK_VSX from set_masks...

2013-02-08  David Edelsohn  <dje.gcc@gmail.com>
            Michael Meissner  <meissner@linux.vnet.ibm.com>

        Backport from mainline
        * config/rs6000/rs6000.c (rs6000_option_override_internal): Clear
        MASK_VSX from set_masks if OS_MISSING_ALTIVEC.

Co-Authored-By: Michael Meissner <meissner@linux.vnet.ibm.com>
From-SVN: r195889

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 45e913cf2475cea507be0b6b1dcb935f47d7403c..49c39456a357125e1153307684c1a0e459aa0f65 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-08  David Edelsohn  <dje.gcc@gmail.com>
+           Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+       Backport from mainline
+       * config/rs6000/rs6000.c (rs6000_option_override_internal): Clear
+       MASK_VSX from set_masks if OS_MISSING_ALTIVEC.
+
 2013-02-01  Eric Botcazou  <ebotcazou@adacore.com>
 
        * fold-const.c (make_range_step) <TRUTH_NOT_EXPR>: Bail out if the

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 36aba430eb933fa56638d3937db4ce0e62be0496..730e23445bfd7833b921b88ceaa7ab33712471d0 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1,6 +1,6 @@
 /* Subroutines used for code generation on IBM RS/6000.
    Copyright (C) 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013
    Free Software Foundation, Inc.
    Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
 
@@ -2698,7 +2698,7 @@ rs6000_option_override_internal (bool global_init_p)
 #endif
 #ifdef OS_MISSING_ALTIVEC
   if (OS_MISSING_ALTIVEC)
-    set_masks &= ~MASK_ALTIVEC;
+    set_masks &= ~(MASK_ALTIVEC | MASK_VSX);
 #endif
 
   /* Don't override by the processor default if given explicitly.  */