diff options
| author | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-06-13 15:28:42 +0000 |
|---|---|---|
| committer | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-06-13 15:28:42 +0000 |
| commit | 9db6f2e077fd3129939c44c091b379ef5772df94 (patch) | |
| tree | d41ae523d6a651c6b075587f699edee57e471c90 | |
| parent | 6d91118f94287fed49e8b3c5646a9c238823ec86 (diff) | |
| download | gcc-9db6f2e077fd3129939c44c091b379ef5772df94.tar.gz | |
* 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
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | 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 <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 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); |