From 9db6f2e077fd3129939c44c091b379ef5772df94 Mon Sep 17 00:00:00 2001 From: amodra Date: Thu, 13 Jun 2013 15:28:42 +0000 Subject: * varasm.c (force_const_mem): Revert 2013-06-07 change. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@200071 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/varasm.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c37468695f5..4b4fbe09c09 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2013-06-14 Alan Modra + + * varasm.c (force_const_mem): Revert 2013-06-07 change. + 2013-06-13 Jan Hubicka * ipa.c (cgraph_externally_visible_p, varpool_externally_visible_p): diff --git a/gcc/varasm.c b/gcc/varasm.c index d817067adf7..c21a25fcd25 100644 --- 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); -- cgit v1.2.1