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

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

varasm.c (force_const_mem): Revert 2013-06-07 change.
* varasm.c (force_const_mem): Revert 2013-06-07 change. From-SVN: r200071
0597fb9c · Alan Modra · Alan Modra · fffad99b · 0597fb9c · 0597fb9c
Commit 0597fb9c authored Jun 14, 2013 by Alan Modra Committed by Alan Modra Jun 14, 2013
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

gcc/ChangeLog
+4 -0

gcc/varasm.c
+1 -2

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
+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):

--- 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);