diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7845c7b51a..c1f9da7b31f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-2014-11-25  Mark Wielaard  <mjw@redhat.com>
+2014-11-26  Richard Biener  <rguenther@suse.de>
+
+	* gimple-fold.c (get_symbol_constant_value): Allow all
+	GIMPLE register type zero-constants.
+
+2014-11-26  Mark Wielaard  <mjw@redhat.com>
 
 	* dwarf2out.c (gen_subprogram_die): Add DW_AT_noreturn when the
 	function decl has TREE_THIS_VOLATILE.
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 98ec1176a7c..5c75671c310 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -254,8 +254,7 @@ get_symbol_constant_value (tree sym)
 	 have zero as the initializer if they may not be
 	 overridden at link or run time.  */
       if (!val
-          && (INTEGRAL_TYPE_P (TREE_TYPE (sym))
-	       || SCALAR_FLOAT_TYPE_P (TREE_TYPE (sym))))
+          && is_gimple_reg_type (TREE_TYPE (sym)))
 	return build_zero_cst (TREE_TYPE (sym));
     }