Thu Nov 22 11:02:05 2012 UTC ()
lang/openjdk7: return NULL, not bool, for pointers

Patches taken from upstream, source listed in patch comments.
Patch replaces return value "false" with "NULL"
Fixes build on gcc 4.7.x


(marino)
diff -r1.19 -r1.20 pkgsrc/lang/openjdk7/distinfo
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_share_vm_oops_constantPoolOop.cpp
diff -r0 -r1.1 pkgsrc/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_loopnode.cpp

cvs diff -r1.19 -r1.20 pkgsrc/lang/openjdk7/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/distinfo 2012/11/03 20:03:02 1.19
+++ pkgsrc/lang/openjdk7/Attic/distinfo 2012/11/22 11:02:05 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.19 2012/11/03 20:03:02 joerg Exp $ 1$NetBSD: distinfo,v 1.20 2012/11/22 11:02:05 marino Exp $
2 2
3SHA1 (openjdk7/61e08e67b176.tar.bz2) = 3db5488f3c0ea1b9c83a74632d300d8717c9b478 3SHA1 (openjdk7/61e08e67b176.tar.bz2) = 3db5488f3c0ea1b9c83a74632d300d8717c9b478
4RMD160 (openjdk7/61e08e67b176.tar.bz2) = c0dd67a6ae982f09b3675c164b5decab4f7e140f 4RMD160 (openjdk7/61e08e67b176.tar.bz2) = c0dd67a6ae982f09b3675c164b5decab4f7e140f
5Size (openjdk7/61e08e67b176.tar.bz2) = 609340 bytes 5Size (openjdk7/61e08e67b176.tar.bz2) = 609340 bytes
6SHA1 (openjdk7/8ac25d11a9e5.tar.bz2) = 3c31d1d850b833fcaf01ecec542257eba0de4343 6SHA1 (openjdk7/8ac25d11a9e5.tar.bz2) = 3c31d1d850b833fcaf01ecec542257eba0de4343
7RMD160 (openjdk7/8ac25d11a9e5.tar.bz2) = 8ac6d3415014192b775dadb1f8296aa04e929352 7RMD160 (openjdk7/8ac25d11a9e5.tar.bz2) = 8ac6d3415014192b775dadb1f8296aa04e929352
8Size (openjdk7/8ac25d11a9e5.tar.bz2) = 3566464 bytes 8Size (openjdk7/8ac25d11a9e5.tar.bz2) = 3566464 bytes
9SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 9SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
10RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f 10RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
11Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes 11Size (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7426 bytes
12SHA1 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1 12SHA1 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 0e0359f04b3d84fed75b3a1ab02cbc415c8864a1
13RMD160 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 2666bd4ca16228a09a7c696cdb7c6108404f21b5 13RMD160 (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 2666bd4ca16228a09a7c696cdb7c6108404f21b5
14Size (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 6702817 bytes 14Size (openjdk7/apache-ant-1.8.1-bin.tar.bz2) = 6702817 bytes
@@ -81,13 +81,15 @@ SHA1 (patch-ba) = 2c56f89ea6297689fec7a7 @@ -81,13 +81,15 @@ SHA1 (patch-ba) = 2c56f89ea6297689fec7a7
81SHA1 (patch-bc) = 91223f23dcc27f1c26242654458e2f27ea9ffbf9 81SHA1 (patch-bc) = 91223f23dcc27f1c26242654458e2f27ea9ffbf9
82SHA1 (patch-bd) = 991b0ad5b325f7dd8a0141d5d9089be5d85df805 82SHA1 (patch-bd) = 991b0ad5b325f7dd8a0141d5d9089be5d85df805
83SHA1 (patch-be) = e89f8420a9cf97c416ef6d1343d837c16623e02f 83SHA1 (patch-be) = e89f8420a9cf97c416ef6d1343d837c16623e02f
84SHA1 (patch-bf) = a793cacf3fd92f49f24228ea8034d13007e47e0c 84SHA1 (patch-bf) = a793cacf3fd92f49f24228ea8034d13007e47e0c
85SHA1 (patch-bg) = 393c1bac2e83078bc02810eefd79ab8f0dd25170 85SHA1 (patch-bg) = 393c1bac2e83078bc02810eefd79ab8f0dd25170
86SHA1 (patch-bh) = 52b01c8b418efff5f3cc628b305a6d25ef4d13b3 86SHA1 (patch-bh) = 52b01c8b418efff5f3cc628b305a6d25ef4d13b3
87SHA1 (patch-bi) = 5ab48c6618f562c7bb6126dbb8f072cb5719dfe1 87SHA1 (patch-bi) = 5ab48c6618f562c7bb6126dbb8f072cb5719dfe1
88SHA1 (patch-bj) = 4198e1aa8e3c65434fbb947a00eed49e73106291 88SHA1 (patch-bj) = 4198e1aa8e3c65434fbb947a00eed49e73106291
89SHA1 (patch-bk) = 66bccfdf42fcc6f6995f3f18fc2515d55cab46c6 89SHA1 (patch-bk) = 66bccfdf42fcc6f6995f3f18fc2515d55cab46c6
90SHA1 (patch-bl) = a3b3bd6007c83664538baf401447fd0df9f4143b 90SHA1 (patch-bl) = a3b3bd6007c83664538baf401447fd0df9f4143b
91SHA1 (patch-bm) = 40c83ad219f529c3ca130547560681ab57b44bf8 91SHA1 (patch-bm) = 40c83ad219f529c3ca130547560681ab57b44bf8
92SHA1 (patch-bn) = 5b34da35e39e08c935c805b5ef7b2c8cc8d285da 92SHA1 (patch-bn) = 5b34da35e39e08c935c805b5ef7b2c8cc8d285da
93SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = bc339888ede68ada2682b803420a7c9515e5578f 93SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = bc339888ede68ada2682b803420a7c9515e5578f
 94SHA1 (patch-hotspot_src_share_vm_oops_constantPoolOop.cpp) = 1eeca23f0baddf94c369ddd4d4dc91802d7c1e2a
 95SHA1 (patch-hotspot_src_share_vm_opto_loopnode.cpp) = 05a564d96659d2a2546029bdad49cd718f867a81

File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_oops_constantPoolOop.cpp
$NetBSD: patch-hotspot_src_share_vm_oops_constantPoolOop.cpp,v 1.1 2012/11/22 11:02:05 marino Exp $

Patch taken from upstream: 
SUBJ: Don't return booleans from methods returning pointers
http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/f457154eee8b

Fixes build on gcc 4.7

--- hotspot/src/share/vm/oops/constantPoolOop.cpp.orig	2011-06-27 16:14:04.000000000 +0000
+++ hotspot/src/share/vm/oops/constantPoolOop.cpp
@@ -269,7 +269,7 @@ klassOop constantPoolOopDesc::klass_ref_
 methodOop constantPoolOopDesc::method_at_if_loaded(constantPoolHandle cpool,
                                                    int which, Bytecodes::Code invoke_code) {
   assert(!constantPoolCacheOopDesc::is_secondary_index(which), "no indy instruction here");
-  if (cpool->cache() == NULL)  return false;  // nothing to load yet
+  if (cpool->cache() == NULL)  return NULL;  // nothing to load yet
   int cache_index = which - CPCACHE_INDEX_TAG;
   if (!(cache_index >= 0 && cache_index < cpool->cache()->length())) {
     if (PrintMiscellaneous && (Verbose||WizardMode)) {

File Added: pkgsrc/lang/openjdk7/patches/Attic/patch-hotspot_src_share_vm_opto_loopnode.cpp
$NetBSD: patch-hotspot_src_share_vm_opto_loopnode.cpp,v 1.1 2012/11/22 11:02:05 marino Exp $

Patch taken from upstream: 
SUBJ: Don't return booleans from methods returning pointers
http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/f457154eee8b

Fixes build on gcc 4.7

--- hotspot/src/share/vm/opto/loopnode.cpp.orig	2011-06-27 16:14:21.000000000 +0000
+++ hotspot/src/share/vm/opto/loopnode.cpp
@@ -893,7 +893,7 @@ Node *LoopLimitNode::Identity( PhaseTran
 Node* CountedLoopNode::match_incr_with_optional_truncation(
                       Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) {
   // Quick cutouts:
-  if (expr == NULL || expr->req() != 3)  return false;
+  if (expr == NULL || expr->req() != 3)  return NULL;
 
   Node *t1 = NULL;
   Node *t2 = NULL;