diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-16 13:15:49 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-16 13:15:49 +0000 |
| commit | a5eadbaff02d98924e94bf0c59710e3eb2a4d1e1 (patch) | |
| tree | b31602dad4582408e721d0c6ff19f7f77d9e8681 /gcc/emit-rtl.c | |
| parent | e627ae86ff9e3a99ba3f151a698b48c0efb5b78f (diff) | |
| download | gcc-a5eadbaff02d98924e94bf0c59710e3eb2a4d1e1.tar.gz | |
2013-01-16 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 195233 using svnmerge.py
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@195235 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/emit-rtl.c')
| -rw-r--r-- | gcc/emit-rtl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index e7e904a040b..f997e5d319b 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -1839,7 +1839,12 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp, if (!align_computed) { - unsigned int obj_align = get_object_alignment (t); + unsigned int obj_align; + unsigned HOST_WIDE_INT obj_bitpos; + get_object_alignment_1 (t, &obj_align, &obj_bitpos); + obj_bitpos = (obj_bitpos - bitpos) & (obj_align - 1); + if (obj_bitpos != 0) + obj_align = (obj_bitpos & -obj_bitpos); attrs.align = MAX (attrs.align, obj_align); } } @@ -6014,7 +6019,7 @@ insn_file (const_rtx insn) bool need_atomic_barrier_p (enum memmodel model, bool pre) { - switch (model) + switch (model & MEMMODEL_MASK) { case MEMMODEL_RELAXED: case MEMMODEL_CONSUME: |