constants.c (build_constants_constructor): Use POINTER_SIZE insead of…

constants.c (build_constants_constructor): Use POINTER_SIZE insead of BITS_PER_WORD in big-endian work around.

2007-11-16  David Daney  <ddaney@avtrex.com>
	    Andrew Haley  <aph@redhat.com>

	* constants.c (build_constants_constructor):  Use POINTER_SIZE
	insead of BITS_PER_WORD in big-endian work around.

From-SVN: r130267

gcc/java/ChangeLog

+2007-11-17  David Daney  <ddaney@avtrex.com>
+	    Andrew Haley  <aph@redhat.com>
+
+	* constants.c (build_constants_constructor):  Use POINTER_SIZE
+	insead of BITS_PER_WORD in big-endian work around.
+
 2007-11-07  Tom Tromey  <tromey@redhat.com>
 
 	PR java/34019:
@@ -51,7 +57,7 @@
 
 2007-09-07  Roman Zippel  <zippel@linux-m68k.org>
 
-	boehm.c (mark_reference_fields): Move misaligned pointer check
+	* boehm.c (mark_reference_fields): Move misaligned pointer check
 	after JREFERENCE_TYPE_P test
 
 2007-09-06  Roman Zippel  <zippel@linux-m68k.org>

gcc/java/constants.c

@@ -518,13 +518,13 @@ build_constants_constructor (void)
 	{
 	  unsigned HOST_WIDE_INT temp = outgoing_cpool->data[i].w;
 
-	  /* Make sure that on a 64-bit big-endian machine this
-	     32-bit jint appears in the first word.  
+	  /* Make sure that on a big-endian machine with 64-bit
+	     pointers this 32-bit jint appears in the first word.
 	     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 && BITS_PER_WORD > 32)
-	    temp <<= BITS_PER_WORD - 32;
+	  if (BYTES_BIG_ENDIAN && POINTER_SIZE > 32)
+	    temp <<= POINTER_SIZE - 32;
 
 	  tags_list
 	    = tree_cons (NULL_TREE, get_tag_node (outgoing_cpool->tags[i]),