diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d34287c7781..0afa5b3b985 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-13  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR rtl-optimization/30967
+	* config/rs6000/rs6000.c (rs6000_rtx_costs): Don't consider
+	destination mode for the cost of scc patterns.
+
 2015-05-13  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.md (*mul<mode>3_1): Merge with *mulhi3_1
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index ec7332c9963..50d63911fa5 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -30640,7 +30640,7 @@ rs6000_rtx_costs (rtx x, int code, int outer_code, int opno ATTRIBUTE_UNUSED,
 		*total = COSTS_N_INSNS (2);
 	      return true;
 	    }
-	  else if (mode == Pmode)
+	  else
 	    {
 	      *total = COSTS_N_INSNS (3);
 	      return false;