(processor_target_table): Use new macros.

From-SVN: r7429

gcc/config/rs6000/rs6000.c

@@ -75,7 +75,9 @@ rs6000_override_options ()
      variant and any PowerPC variant.  */
 
 #define POWER_MASKS (MASK_POWER | MASK_POWER2)
-#define POWERPC_MASKS (MASK_POWERPC | MASK_PPCFPX | MASK_POWERPC64)
+#define POWERPC_MASKS (MASK_POWERPC | MASK_PPC_GPOPT \
+		       | MASK_PPC_GFXOPT | MASK_POWERPC64)
+#define POWERPC_OPT_MASKS (MASK_PPC_GPOPT | MASK_PPC_GFXOPT)
 
   static struct ptt
     {
@@ -90,7 +92,7 @@ rs6000_override_options ()
 	    MASK_POWER2 | POWERPC_MASKS | MASK_NEW_MNEMONICS},
 	 {"powerpc", PROCESSOR_POWERPC,
 	    MASK_POWERPC | MASK_NEW_MNEMONICS,
-	    POWER_MASKS | MASK_PPCFPX | MASK_POWERPC64},
+	    POWER_MASKS | POWERPC_OPT_MASKS | MASK_POWERPC64},
 	 {"rios", PROCESSOR_RIOS1,
 	    MASK_POWER,
 	    MASK_POWER2 | POWERPC_MASKS | MASK_NEW_MNEMONICS},
@@ -108,41 +110,41 @@ rs6000_override_options ()
 	    POWERPC_MASKS | MASK_NEW_MNEMONICS},
 	 {"601", PROCESSOR_PPC601,
 	    MASK_POWER | MASK_POWERPC | MASK_NEW_MNEMONICS,
-	    MASK_POWER2 | MASK_PPCFPX | MASK_POWERPC64},
+	    MASK_POWER2 | POWERPC_OPT_MASKS | MASK_POWERPC64},
 	 {"mpc601", PROCESSOR_PPC601,
 	    MASK_POWER | MASK_POWERPC | MASK_NEW_MNEMONICS,
-	    MASK_POWER2 | MASK_PPCFPX | MASK_POWERPC64},
+	    MASK_POWER2 | POWERPC_OPT_MASKS | MASK_POWERPC64},
 	 {"ppc601", PROCESSOR_PPC601,
 	    MASK_POWER | MASK_POWERPC | MASK_NEW_MNEMONICS,
-	    MASK_POWER2 | MASK_PPCFPX | MASK_POWERPC64},
+	    MASK_POWER2 | POWERPC_OPT_MASKS | MASK_POWERPC64},
 	 {"603", PROCESSOR_PPC603,
-	    MASK_POWERPC | MASK_PPCFPX | MASK_NEW_MNEMONICS,
-	    POWER_MASKS | MASK_POWERPC64},
+	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
+	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"mpc603", PROCESSOR_PPC603,
-	    MASK_POWERPC | MASK_PPCFPX | MASK_NEW_MNEMONICS,
-	    POWER_MASKS | MASK_POWERPC64},
+	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
+	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"ppc603", PROCESSOR_PPC603,
-	    MASK_POWERPC | MASK_PPCFPX | MASK_NEW_MNEMONICS,
-	    POWER_MASKS | MASK_POWERPC64},
+	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
+	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"604", PROCESSOR_PPC604,
-	    MASK_POWERPC | MASK_PPCFPX | MASK_NEW_MNEMONICS,
-	    POWER_MASKS | MASK_POWERPC64},
+	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
+	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"mpc604", PROCESSOR_PPC604,
-	    MASK_POWERPC | MASK_PPCFPX | MASK_NEW_MNEMONICS,
-	    POWER_MASKS | MASK_POWERPC64},
+	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
+	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"ppc604", PROCESSOR_PPC604,
-	    MASK_POWERPC | MASK_PPCFPX | MASK_NEW_MNEMONICS,
-	    POWER_MASKS | MASK_POWERPC64},
+	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
+	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"620", PROCESSOR_PPC620,
-	    (MASK_POWERPC | MASK_PPCFPX | MASK_POWERPC64
+	    (MASK_POWERPC | POWERPC_OPT_MASKS | MASK_POWERPC64
 	     | MASK_NEW_MNEMONICS),
 	      POWER_MASKS},
 	 {"mpc620", PROCESSOR_PPC620,
-	    (MASK_POWERPC | MASK_PPCFPX | MASK_POWERPC64
+	    (MASK_POWERPC | POWERPC_OPT_MASKS | MASK_POWERPC64
 	     | MASK_NEW_MNEMONICS),
 	      POWER_MASKS},
 	 {"ppc620", PROCESSOR_PPC620,
-	    (MASK_POWERPC | MASK_PPCFPX | MASK_POWERPC64
+	    (MASK_POWERPC | POWERPC_OPT_MASKS | MASK_POWERPC64
 	     | MASK_NEW_MNEMONICS),
 	      POWER_MASKS}};