This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Fix 64-bit libjava breakage on Solaris 2/SPARC (PR middle-end/48819)
- From: Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Cc: java-patches at gcc dot gnu dot org, Richard Guenther <rguenther at suse dot de>
- Date: Fri, 29 Apr 2011 21:40:44 +0200
- Subject: Fix 64-bit libjava breakage on Solaris 2/SPARC (PR middle-end/48819)
This patch fixes 350 64-bit libjava execution failures on Solaris
2/SPARC. It was provided and approved by Richard in the PR.
Tested by rebuilding libjava with the patched jc1 on
sparc-sun-solaris2.11. All testsuite failures are now gone.
Installed on mainline.
Rainer
2011-04-29 Richard Guenther <rguenther@suse.de>
PR middle-end/48819
* constants.c (build_constants_constructor): Use ptr_type_node for
temp.
Index: gcc/java/constants.c
===================================================================
--- gcc/java/constants.c (revision 173182)
+++ gcc/java/constants.c (working copy)
@@ -1,6 +1,6 @@
/* Handle the constant pool of the Java(TM) Virtual Machine.
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
- 2007, 2008, 2010 Free Software Foundation, Inc.
+ 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
This file is part of GCC.
@@ -544,10 +544,7 @@
temp <<= ((POINTER_SIZE > 32) ? POINTER_SIZE - 32 : 0);
CONSTRUCTOR_PREPEND_VALUE (t, get_tag_node (outgoing_cpool->tags[i]));
- CONSTRUCTOR_PREPEND_VALUE (d,
- fold_convert (ptr_type_node,
- (build_int_cst (NULL_TREE,
- temp))));
+ CONSTRUCTOR_PREPEND_VALUE (d, build_int_cst (ptr_type_node, temp));
}
break;
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University