From 2b12962772d3b0e85d860609f32bfb28515d5ba9 Mon Sep 17 00:00:00 2001 From: Joern Rennecke Date: Tue, 16 Nov 2010 21:46:28 +0000 Subject: re PR java/46386 (negative shift count in build_constants_constructor for 16 bit pointer targets) 2010-11-09 Joern Rennecke Andrew Haley PR java/46386 gcc/java: * constants.c (build_constants_constructor): Avoid negative shift. gcc: * config/pdp11/t-pdp11 (java/constants.o-warn): Remove. * config/t-pnt16-warn (java/constants.o-warn): Likewise. Co-Authored-By: Andrew Haley From-SVN: r166826 --- gcc/ChangeLog | 4 ++++ gcc/config/pdp11/t-pdp11 | 4 ---- gcc/config/t-pnt16-warn | 4 ---- gcc/java/ChangeLog | 6 ++++++ gcc/java/constants.c | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5ed02311dac..a572780b53e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -70,6 +70,10 @@ * config/score/score-conv.h (UIMM_IN_RANGE, SIMM_IN_RANGE): Allow (W) == HOST_BITS_PER_WIDE_INT. + PR java/46386 + * config/pdp11/t-pdp11 (java/constants.o-warn): Remove. + * config/t-pnt16-warn (java/constants.o-warn): Likewise. + 2010-11-16 Nathan Froyd * config/arc/arc.c: Delete pasto. diff --git a/gcc/config/pdp11/t-pdp11 b/gcc/config/pdp11/t-pdp11 index e45e0cbeced..fb22a9bac51 100644 --- a/gcc/config/pdp11/t-pdp11 +++ b/gcc/config/pdp11/t-pdp11 @@ -42,7 +42,3 @@ MULTILIB_OPTIONS = msoft-float # We could say "-Werror -Wno-error=type-limits", alas, not all supported # gcc bootstrap compilers support the latter option. dwarf2out.o-warn = -Wno-error - -# Likewise, java/constants.c:build_constants_constructor has a negative shift -# count (in never-executed code) due to the small POINTER_SIZE. -java/constants.o-warn = -Wno-error diff --git a/gcc/config/t-pnt16-warn b/gcc/config/t-pnt16-warn index 97bac09a9f2..0bd52029cb8 100644 --- a/gcc/config/t-pnt16-warn +++ b/gcc/config/t-pnt16-warn @@ -25,7 +25,3 @@ # We could say "-Werror -Wno-error=type-limits", alas, not all supported # gcc bootstrap compilers support the latter option. dwarf2out.o-warn = -Wno-error - -# Likewise, java/constants.c:build_constants_constructor has a negative shift -# count (in never-executed code) due to the small POINTER_SIZE. -java/constants.o-warn = -Wno-error diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 893291355a3..825f02fc11b 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2010-11-09 Joern Rennecke + Andrew Haley + + PR java/46386 + * config/pdp11/t-pdp11 (java/constants.o-warn): Remove. + 2010-11-12 Joseph Myers * Make-lang.in (jvspec.o, java/lang.o): Use $(OPTS_H). diff --git a/gcc/java/constants.c b/gcc/java/constants.c index 14410d1df18..c80afc7b992 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, -- cgit v1.2.3