varasm.c (force_const_mem): Revert 2013-06-07 change.

	* varasm.c (force_const_mem): Revert 2013-06-07 change.

From-SVN: r200071

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c37468695f51ca1d5883313217f4a53b7e6a595a..4b4fbe09c09a43bbfd1312c378cce830ee68fbaa 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-14  Alan Modra  <amodra@gmail.com>
+
+       * varasm.c (force_const_mem): Revert 2013-06-07 change.
+
 2013-06-13  Jan Hubicka  <jh@suse.cz>
 
        * ipa.c (cgraph_externally_visible_p, varpool_externally_visible_p):

diff --git a/gcc/varasm.c b/gcc/varasm.c
index d817067adf7b918ff65aa9e35398f3bb91d4f0ce..c21a25fcd25c394612f14711b1ce1f1ae92260b5 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -3639,8 +3639,7 @@ force_const_mem (enum machine_mode mode, rtx x)
   *slot = desc;
 
   /* Align the location counter as required by EXP's data type.  */
-  gcc_checking_assert (mode != VOIDmode && mode != BLKmode);
-  align = GET_MODE_ALIGNMENT (mode);
+  align = GET_MODE_ALIGNMENT (mode == VOIDmode ? word_mode : mode);
 #ifdef CONSTANT_ALIGNMENT
   {
     tree type = lang_hooks.types.type_for_mode (mode, 0);