diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/constants.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 8932913..825f02f 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2010-11-09 Joern Rennecke <amylaar@spamcop.net> + Andrew Haley <aph@redhat.com> + + PR java/46386 + * config/pdp11/t-pdp11 (java/constants.o-warn): Remove. + 2010-11-12 Joseph Myers <joseph@codesourcery.com> * Make-lang.in (jvspec.o, java/lang.o): Use $(OPTS_H). diff --git a/gcc/java/constants.c b/gcc/java/constants.c index 14410d1..c80afc7 100644 --- a/gcc/java/constants.c +++ b/gcc/java/constants.c @@ -540,8 +540,8 @@ build_constants_constructor (void) FIXME: This is a kludge. The field we're initializing is not a scalar but a union, and that's how we should represent it in the compiler. We should fix this. */ - if (BYTES_BIG_ENDIAN && POINTER_SIZE > 32) - temp <<= POINTER_SIZE - 32; + if (BYTES_BIG_ENDIAN) + temp <<= ((POINTER_SIZE > 32) ? POINTER_SIZE - 32 : 0); CONSTRUCTOR_PREPEND_VALUE (t, get_tag_node (outgoing_cpool->tags[i])); CONSTRUCTOR_PREPEND_VALUE (d, |