head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.1.0.4
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.2
	pkgsrc-2012Q4-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2013.06.02.06.12.28;	author ryoon;	state dead;
branches;
next	1.1;
commitid	j8SPqZax02Hdk0Sw;

1.1
date	2012.11.22.11.02.05;	author marino;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 1.7.21 (7u21)

* Update with FreeBSD ports' patch-set file.
* Add patches from icedtea's rhino.patch file.
* Tested on NetBSD/amd64 current, NetBSD/i386 6.1, NetBSD/amd64 6.0.1,
  and DragonFly/i386 3.2.2.

Changelog:
* Unknown because I do not know previous version, 1.7.0.147.20110811.
* Many bugs and security bugs should be fixed.
@
text
@$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)) {
@


1.1
log
@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
@
text
@d1 1
a1 1
$NetBSD$
@