aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2012-03-06 03:58:53 +0000
committerGreg Lewis <glewis@FreeBSD.org>2012-03-06 03:58:53 +0000
commite5d3c8854e5d816f657b652b6b0657156fdfc3de (patch)
treed471ed769c2532a2fd092a3c226b10f1e1fc68f4 /java
parent765948fc78793207cb018526ca46758349c40892 (diff)
downloadports-e5d3c8854e5d816f657b652b6b0657156fdfc3de.tar.gz
ports-e5d3c8854e5d816f657b652b6b0657156fdfc3de.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/openjdk7/Makefile17
-rw-r--r--java/openjdk7/distinfo8
-rw-r--r--java/openjdk7/files/patch-set4032
3 files changed, 1604 insertions, 2453 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 173b38eff893..348d9cff0423 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -7,9 +7,8 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER}
-PORTREVISION= 2
CATEGORIES= java devel
-MASTER_SITES= http://download.java.net/openjdk/jdk7/promoted/b${JDK_BUILD_NUMBER}/ \
+MASTER_SITES= http://download.java.net/openjdk/jdk7u2/promoted/b${JDK_BUILD_NUMBER}/ \
http://download.java.net/jaxp/1.4.5/:jaxp \
http://icedtea.classpath.org/download/drops/:jaxp \
http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/:jaxws \
@@ -36,10 +35,10 @@ USE_ZIP= YES
MAKE_JOBS_UNSAFE= YES
JDK_MAJOR_VERSION= 7
-JDK_MINOR_VERSION= 0
-JDK_BUILD_NUMBER= 147
-JDK_BUILD_DATE= 27_jun_2011
-JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
+JDK_MINOR_VERSION= 2
+JDK_BUILD_NUMBER= 13
+JDK_BUILD_DATE= 17_nov_2011
+JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
# Use our own version of ant to avoid circular dependencies
ANT_VERSION= 1.8.2
@@ -53,7 +52,7 @@ USE_XORG+= x11 xext xi xrender xt xtst
MAKE_JOBS_UNSAFE= yes
JAXPFILE= jaxp145_01.zip
-JAXWSFILE= jdk7-jaxws2_2_4-b03-2011_05_27.zip
+JAXWSFILE= jdk7-jaxws2_2_4-b04-2011_06_01.zip
JAFFILE= jdk7-jaf-2010_08_19.zip
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 \
@@ -93,7 +92,9 @@ MAKE_ENV+= LANG="C" \
SKIP_FASTDEBUG_BUILD="true" \
SKIP_DEBUG_BUILD="true" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
- MILESTONE="fcs"
+ MILESTONE="fcs" \
+ JDK_MICRO_VERSION="0_0${JDK_MINOR_VERSION}" \
+ BUILD_NUMBER="b${JDK_BUILD_NUMBER}"
.if !defined(DISABLE_MAKE_JOBS)
.if defined(MAKE_JOBS_NUMBER)
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index 8f6d76ba1575..8358b60d28e6 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,9 +1,9 @@
-SHA256 (openjdk-7-fcs-src-b147-27_jun_2011.zip) = 3a9331a167ca088a7820322d17420c4fbf3bac36af5b4c94acbce2e2d3a71ce2
-SIZE (openjdk-7-fcs-src-b147-27_jun_2011.zip) = 87218182
+SHA256 (openjdk-7u2-fcs-src-b13-17_nov_2011.zip) = 6b13dde9efb0a8d6cd4d909239d633657c2aeef8f6ba806465d0cc691d681841
+SIZE (openjdk-7u2-fcs-src-b13-17_nov_2011.zip) = 87754846
SHA256 (jaxp145_01.zip) = c5924c6188988e2e8397ee5143bd8eaa062569d052567afd2ac9326a54a848cb
SIZE (jaxp145_01.zip) = 6389175
-SHA256 (jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 05ae7259b75d0f2307276d61ece1887fcd437cb4ecda42fab8c22d4b537effd6
-SIZE (jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353
+SHA256 (jdk7-jaxws2_2_4-b04-2011_06_01.zip) = 6a8734d37553103da47715ebd74077d5397cae4730775b09fa2ab679650aa824
+SIZE (jdk7-jaxws2_2_4-b04-2011_06_01.zip) = 6046342
SHA256 (jdk7-jaf-2010_08_19.zip) = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
SIZE (jdk7-jaf-2010_08_19.zip) = 70613
SHA256 (apache-ant-1.8.2-bin.zip) = a07cd948f69bc0fee76e942ac24ae65ce2ca7e28c444b78eb95bcf8c638342e8
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
index f61f7b813efd..b2a7f0cf743c 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,26 +1,20 @@
---- ./.hgtags 2011-06-27 08:44:00.000000000 -0700
-+++ ./.hgtags 2011-06-27 22:07:57.000000000 -0700
-@@ -121,3 +121,4 @@
- 7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
- 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
- 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
-+d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
---- ./.jcheck/conf 2011-06-27 08:44:01.000000000 -0700
-+++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
-@@ -1 +0,0 @@
--project=jdk7
---- ./corba/.hgtags 2011-06-27 08:54:53.000000000 -0700
-+++ ./corba/.hgtags 2011-06-27 22:07:59.000000000 -0700
-@@ -121,3 +121,4 @@
- 7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
- 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
- 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
-+73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
---- ./corba/.jcheck/conf 2011-06-27 08:54:54.000000000 -0700
-+++ ./corba/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
-@@ -1 +0,0 @@
--project=jdk7
---- ./corba/make/common/Defs-bsd.gmk 2011-06-27 23:25:38.000000000 -0700
+--- ./.hgtags 2011-11-17 21:30:05.000000000 -0800
++++ ./.hgtags 2012-02-26 13:57:18.000000000 -0800
+@@ -139,3 +139,5 @@
+ bfc196b6a292af7d917fadc410fd703d11b71478 jdk7u1-b08
+ be12d8ef36d1d75fe6476d61f921036ba49186b4 jdk7u2-b11
+ b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12
++c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13
++e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21
+--- ./corba/.hgtags 2011-11-17 21:31:10.000000000 -0800
++++ ./corba/.hgtags 2012-02-26 13:57:58.000000000 -0800
+@@ -139,3 +139,5 @@
+ 49aecdae2fba1730b5eda4f249e194881f2ffa63 jdk7u1-b08
+ 82330ae1ba8b29384644db0e3385cab88aae59c2 jdk7u2-b11
+ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12
++456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
++62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
+--- ./corba/make/common/Defs-bsd.gmk 2012-03-04 16:33:49.000000000 -0800
+++ ./corba/make/common/Defs-bsd.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -25,9 +25,18 @@
@@ -42,7 +36,7 @@
# Get shared JDK settings
include $(BUILDDIR)/common/shared/Defs.gmk
---- ./corba/make/common/Defs.gmk 2011-06-27 08:55:10.000000000 -0700
+--- ./corba/make/common/Defs.gmk 2011-11-17 21:31:14.000000000 -0800
+++ ./corba/make/common/Defs.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -53,6 +53,28 @@
@@ -73,7 +67,7 @@
#
# Get platform definitions
#
---- ./corba/make/common/shared/Defs-bsd.gmk 2011-06-27 23:25:38.000000000 -0700
+--- ./corba/make/common/shared/Defs-bsd.gmk 2012-03-04 16:33:49.000000000 -0800
+++ ./corba/make/common/shared/Defs-bsd.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -93,7 +87,7 @@
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
---- ./corba/make/common/shared/Defs-utils.gmk 2011-06-27 08:55:12.000000000 -0700
+--- ./corba/make/common/shared/Defs-utils.gmk 2011-11-17 21:31:14.000000000 -0800
+++ ./corba/make/common/shared/Defs-utils.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -53,6 +53,13 @@
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
@@ -144,8 +138,8 @@
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif
---- ./corba/make/common/shared/Platform.gmk 2011-06-27 08:55:13.000000000 -0700
-+++ ./corba/make/common/shared/Platform.gmk 2011-04-22 22:20:45.000000000 -0700
+--- ./corba/make/common/shared/Platform.gmk 2011-11-17 21:31:15.000000000 -0800
++++ ./corba/make/common/shared/Platform.gmk 2012-02-12 13:05:33.000000000 -0800
@@ -231,6 +231,101 @@
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
endif
@@ -175,7 +169,7 @@
+ PLATFORM = bsd
+ OS_NAME = openbsd
+ OS_VENDOR = OpenBSD
-+ REQUIRED_OS_VERSION = 4.2
++ REQUIRED_OS_VERSION = 4.9
+endif
+
+# Platform settings specific to BSD
@@ -248,39 +242,17 @@
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
-@@ -381,6 +476,18 @@
- export MAX_VM_MEMORY
- endif
-
-+# for OpenBSD/i386 limit to 736 max
-+ifeq ($(OS_VENDOR), OpenBSD)
-+ ifeq ($(ARCH_DATA_MODEL), 32)
-+ MAX_VM_MEMORY := $(shell \
-+ if [ $(MAX_VM_MEMORY) -gt 736 ] ; then \
-+ echo "736"; \
-+ else \
-+ echo "$(MAX_VM_MEMORY)" ; \
-+ fi)
-+ endif
-+endif
-+
- REQUIRED_ZIP_VER = 2.2
- REQUIRED_UNZIP_VER = 5.12
- REQUIRED_MAKE_VER = 3.81
---- ./hotspot/.hgtags 2011-06-27 09:06:42.000000000 -0700
-+++ ./hotspot/.hgtags 2011-06-27 22:08:04.000000000 -0700
-@@ -180,3 +180,4 @@
- 82a81d5c5700a69333e12532bf0c4d33e885c7fc hs21-b15
- 38fa55e5e79232d48f1bb8cf27d88bc094c9375a jdk7-b146
- 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16
-+81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147
---- ./hotspot/.jcheck/conf 2011-06-27 09:06:43.000000000 -0700
-+++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
-@@ -1 +0,0 @@
--project=jdk7
---- ./hotspot/agent/make/Makefile 2011-06-27 09:06:44.000000000 -0700
-+++ ./hotspot/agent/make/Makefile 2011-05-12 20:54:44.000000000 -0700
-@@ -52,6 +52,9 @@
+--- ./hotspot/.hgtags 2011-11-17 21:35:50.000000000 -0800
++++ ./hotspot/.hgtags 2012-02-26 13:59:18.000000000 -0800
+@@ -206,3 +206,5 @@
+ c8abdaa56b471195aefbac6ee385d7d35b8aec74 hs22-b09
+ 4061b13e3e6be63b6f157ef773f374f2355fdb48 jdk7u2-b12
+ 3ba0bb2e7c8ddac172f5b995aae57329cdd2dafa hs22-b10
++f17fe2f4b6aacc19cbb8ee39476f2f13a1c4d3cd jdk7u2-b13
++0744602f85c6fe62255326df595785eb2b32166d jdk7u2-b21
+--- ./hotspot/agent/make/Makefile 2011-11-17 21:35:51.000000000 -0800
++++ ./hotspot/agent/make/Makefile 2012-02-26 13:59:18.000000000 -0800
+@@ -53,6 +53,9 @@
sun.jvm.hotspot.compiler \
sun.jvm.hotspot.debugger \
sun.jvm.hotspot.debugger.amd64 \
@@ -291,7 +263,7 @@
sun.jvm.hotspot.debugger.cdbg.basic \
sun.jvm.hotspot.debugger.cdbg.basic.amd64 \
@@ -94,6 +97,9 @@
- sun.jvm.hotspot.oops \
+ sun.jvm.hotspot.prims \
sun.jvm.hotspot.runtime \
sun.jvm.hotspot.runtime.amd64 \
+sun.jvm.hotspot.runtime.bsd \
@@ -300,7 +272,7 @@
sun.jvm.hotspot.runtime.ia64 \
sun.jvm.hotspot.runtime.linux \
sun.jvm.hotspot.runtime.linux_amd64 \
-@@ -143,6 +149,8 @@
+@@ -144,6 +150,8 @@
sun/jvm/hotspot/compiler/*.java \
sun/jvm/hotspot/debugger/*.java \
sun/jvm/hotspot/debugger/amd64/*.java \
@@ -309,7 +281,7 @@
sun/jvm/hotspot/debugger/cdbg/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-04-22 22:28:31.000000000 -0700
@@ -22,6 +22,7 @@
*
@@ -450,8 +422,8 @@
#endif /* amd64 */
---- ./hotspot/agent/src/os/bsd/Makefile 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/Makefile 2011-04-22 22:28:31.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/Makefile 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/Makefile 2012-02-12 13:05:32.000000000 -0800
@@ -22,7 +22,7 @@
#
#
@@ -461,12 +433,11 @@
GCC = gcc
JAVAH = ${JAVA_HOME}/bin/javah
-@@ -32,25 +32,25 @@
+@@ -32,25 +32,24 @@
libproc_impl.c \
ps_proc.c \
ps_core.c \
- BsdDebuggerLocal.c
-+ hsearch_r.c \
+ BsdDebuggerLocal.c
-INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/bsd
@@ -494,7 +465,7 @@
$(GCC) $(CFLAGS) $<
.c.obj:
-@@ -60,26 +60,19 @@
+@@ -60,26 +59,19 @@
LFLAGS_LIBSA = -Xlinker --version-script=mapfile
endif
@@ -649,7 +620,7 @@
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+ return 0;
+}
---- ./hotspot/agent/src/os/bsd/elfmacros.h 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/elfmacros.h 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2011-04-22 22:28:31.000000000 -0700
@@ -25,16 +25,19 @@
#ifndef _ELFMACROS_H_
@@ -686,272 +657,7 @@
#endif
---- ./hotspot/agent/src/os/bsd/hsearch_r.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2011-04-22 22:28:31.000000000 -0700
-@@ -0,0 +1,217 @@
-+/* Copyright (C) 1993,1995-1997,2002,2005,2007,2008
-+ Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1993.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <search.h>
-+
-+#include "hsearch_r.h"
-+
-+#define __set_errno(ERRNO) errno = ERRNO
-+
-+/* [Aho,Sethi,Ullman] Compilers: Principles, Techniques and Tools, 1986
-+ [Knuth] The Art of Computer Programming, part 3 (6.4) */
-+
-+
-+/* The reentrant version has no static variables to maintain the state.
-+ Instead the interface of all functions is extended to take an argument
-+ which describes the current status. */
-+typedef struct _ENTRY
-+{
-+ unsigned int used;
-+ ENTRY entry;
-+}
-+_ENTRY;
-+
-+
-+/* For the used double hash method the table size has to be a prime. To
-+ correct the user given table size we need a prime test. This trivial
-+ algorithm is adequate because
-+ a) the code is (most probably) called a few times per program run and
-+ b) the number is small because the table must fit in the core */
-+static int
-+isprime (unsigned int number)
-+{
-+ /* no even number will be passed */
-+ unsigned int div = 3;
-+
-+ while (div * div < number && number % div != 0)
-+ div += 2;
-+
-+ return number % div != 0;
-+}
-+
-+
-+/* Before using the hash table we must allocate memory for it.
-+ Test for an existing table are done. We allocate one element
-+ more as the found prime number says. This is done for more effective
-+ indexing as explained in the comment for the hsearch function.
-+ The contents of the table is zeroed, especially the field used
-+ becomes zero. */
-+int
-+hcreate_r (size_t nel, struct hsearch_data *htab)
-+{
-+ /* Test for correct arguments. */
-+ if (htab == NULL)
-+ {
-+ __set_errno (EINVAL);
-+ return 0;
-+ }
-+
-+ /* There is still another table active. Return with error. */
-+ if (htab->table != NULL)
-+ return 0;
-+
-+ /* Change nel to the first prime number not smaller as nel. */
-+ nel |= 1; /* make odd */
-+ while (!isprime (nel))
-+ nel += 2;
-+
-+ htab->size = nel;
-+ htab->filled = 0;
-+
-+ /* allocate memory and zero out */
-+ htab->table = (_ENTRY *) calloc (htab->size + 1, sizeof (_ENTRY));
-+ if (htab->table == NULL)
-+ return 0;
-+
-+ /* everything went alright */
-+ return 1;
-+}
-+
-+
-+/* After using the hash table it has to be destroyed. The used memory can
-+ be freed and the local static variable can be marked as not used. */
-+void
-+hdestroy_r (struct hsearch_data *htab)
-+{
-+ /* Test for correct arguments. */
-+ if (htab == NULL)
-+ {
-+ __set_errno (EINVAL);
-+ return;
-+ }
-+
-+ /* Free used memory. */
-+ free (htab->table);
-+
-+ /* the sign for an existing table is an value != NULL in htable */
-+ htab->table = NULL;
-+}
-+
-+
-+/* This is the search function. It uses double hashing with open addressing.
-+ The argument item.key has to be a pointer to an zero terminated, most
-+ probably strings of chars. The function for generating a number of the
-+ strings is simple but fast. It can be replaced by a more complex function
-+ like ajw (see [Aho,Sethi,Ullman]) if the needs are shown.
-+
-+ We use an trick to speed up the lookup. The table is created by hcreate
-+ with one more element available. This enables us to use the index zero
-+ special. This index will never be used because we store the first hash
-+ index in the field used where zero means not used. Every other value
-+ means used. The used field can be used as a first fast comparison for
-+ equality of the stored and the parameter value. This helps to prevent
-+ unnecessary expensive calls of strcmp. */
-+int
-+hsearch_r (ENTRY item, ACTION action, ENTRY **retval, struct hsearch_data *htab)
-+{
-+ unsigned int hval;
-+ unsigned int count;
-+ unsigned int len = strlen (item.key);
-+ unsigned int idx;
-+
-+ /* Compute an value for the given string. Perhaps use a better method. */
-+ hval = len;
-+ count = len;
-+ while (count-- > 0)
-+ {
-+ hval <<= 4;
-+ hval += item.key[count];
-+ }
-+
-+ /* First hash function: simply take the modul but prevent zero. */
-+ idx = hval % htab->size + 1;
-+
-+ if (htab->table[idx].used)
-+ {
-+ /* Further action might be required according to the action value. */
-+ if (htab->table[idx].used == hval
-+ && strcmp (item.key, htab->table[idx].entry.key) == 0)
-+ {
-+ *retval = &htab->table[idx].entry;
-+ return 1;
-+ }
-+
-+ /* Second hash function, as suggested in [Knuth] */
-+ unsigned int hval2 = 1 + hval % (htab->size - 2);
-+ unsigned int first_idx = idx;
-+
-+ do
-+ {
-+ /* Because SIZE is prime this guarantees to step through all
-+ available indeces. */
-+ if (idx <= hval2)
-+ idx = htab->size + idx - hval2;
-+ else
-+ idx -= hval2;
-+
-+ /* If we visited all entries leave the loop unsuccessfully. */
-+ if (idx == first_idx)
-+ break;
-+
-+ /* If entry is found use it. */
-+ if (htab->table[idx].used == hval
-+ && strcmp (item.key, htab->table[idx].entry.key) == 0)
-+ {
-+ *retval = &htab->table[idx].entry;
-+ return 1;
-+ }
-+ }
-+ while (htab->table[idx].used);
-+ }
-+
-+ /* An empty bucket has been found. */
-+ if (action == ENTER)
-+ {
-+ /* If table is full and another entry should be entered return
-+ with error. */
-+ if (htab->filled == htab->size)
-+ {
-+ __set_errno (ENOMEM);
-+ *retval = NULL;
-+ return 0;
-+ }
-+
-+ htab->table[idx].used = hval;
-+ htab->table[idx].entry = item;
-+
-+ ++htab->filled;
-+
-+ *retval = &htab->table[idx].entry;
-+ return 1;
-+ }
-+
-+ __set_errno (ESRCH);
-+ *retval = NULL;
-+ return 0;
-+}
---- ./hotspot/agent/src/os/bsd/hsearch_r.h 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2011-04-22 22:28:31.000000000 -0700
-@@ -0,0 +1,42 @@
-+/* Declarations for System V style searching functions.
-+ Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#ifndef _HSEARCH_R_H_
-+#define _HSEARCH_R_H_
-+
-+#include <search.h>
-+
-+struct _ENTRY;
-+
-+/* Data type for reentrant functions. */
-+struct hsearch_data
-+ {
-+ struct _ENTRY *table;
-+ unsigned int size;
-+ unsigned int filled;
-+ };
-+
-+/* Reentrant versions which can handle multiple hashing tables at the
-+ same time. */
-+extern int hsearch_r (ENTRY __item, ACTION __action, ENTRY **__retval,
-+ struct hsearch_data *__htab);
-+extern int hcreate_r (size_t __nel, struct hsearch_data *__htab);
-+extern void hdestroy_r (struct hsearch_data *__htab);
-+
-+#endif /* _HSEARCH_R_H_ */
---- ./hotspot/agent/src/os/bsd/libproc.h 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc.h 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/libproc.h 2011-04-22 22:28:31.000000000 -0700
@@ -27,7 +27,8 @@
@@ -1013,7 +719,7 @@
// get number of shared objects
int get_num_libs(struct ps_prochandle* ph);
---- ./hotspot/agent/src/os/bsd/libproc_impl.c 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc_impl.c 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2011-04-22 22:28:31.000000000 -0700
@@ -174,10 +174,13 @@
return NULL;
@@ -1114,7 +820,7 @@
+ print_debug("ps_pcontinue not implemented\n");
return PS_OK;
}
---- ./hotspot/agent/src/os/bsd/libproc_impl.h 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc_impl.h 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2011-04-22 22:28:31.000000000 -0700
@@ -47,7 +47,7 @@
typedef struct thread_info {
@@ -1145,7 +851,7 @@
// part of the class sharing workaround
int classes_jsa_fd; // file descriptor of class share archive
uintptr_t dynamic_addr; // address of dynamic section of a.out
---- ./hotspot/agent/src/os/bsd/mapfile 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/mapfile 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/mapfile 2011-04-22 22:28:31.000000000 -0700
@@ -43,13 +43,17 @@
# proc_service.h functions - to be used by libthread_db
@@ -1168,7 +874,7 @@
# used by attach test program
init_libproc;
---- ./hotspot/agent/src/os/bsd/proc_service.h 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/proc_service.h 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,76 +0,0 @@
-/*
@@ -1247,7 +953,7 @@
-ps_err_e ps_get_thread_area();
-
-#endif /* _PROC_SERVICE_H_ */
---- ./hotspot/agent/src/os/bsd/ps_core.c 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/ps_core.c 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/ps_core.c 2011-04-22 22:28:31.000000000 -0700
@@ -142,6 +142,7 @@
@@ -1560,7 +1266,7 @@
struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
if (ph == NULL) {
---- ./hotspot/agent/src/os/bsd/ps_proc.c 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/ps_proc.c 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2011-04-22 22:28:31.000000000 -0700
@@ -22,20 +22,22 @@
*
@@ -2127,7 +1833,7 @@
- }
return ph;
}
---- ./hotspot/agent/src/os/bsd/salibelf.c 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/salibelf.c 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/salibelf.c 2011-04-22 22:28:31.000000000 -0700
@@ -25,6 +25,7 @@
#include "salibelf.h"
@@ -2137,9 +1843,9 @@
extern void print_debug(const char*,...);
---- ./hotspot/agent/src/os/bsd/symtab.c 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/symtab.c 2011-04-22 22:28:31.000000000 -0700
-@@ -23,10 +23,10 @@
+--- ./hotspot/agent/src/os/bsd/symtab.c 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/symtab.c 2012-02-12 13:05:32.000000000 -0800
+@@ -23,10 +23,11 @@
*/
#include <unistd.h>
@@ -2147,12 +1853,17 @@
#include <search.h>
#include <stdlib.h>
#include <string.h>
-+#include "hsearch_r.h"
++#include <db.h>
++#include <fcntl.h>
#include "symtab.h"
#include "salibelf.h"
-@@ -53,276 +53,9 @@
- struct hsearch_data *hash_table;
+@@ -50,279 +51,12 @@
+ char *strs;
+ size_t num_symbols;
+ struct elf_symbol *symbols;
+- struct hsearch_data *hash_table;
++ DB* hash_table;
} symtab_t;
-
@@ -2430,7 +2141,7 @@
struct symtab* symtab = NULL;
// Reading of elf header
-@@ -331,8 +64,9 @@
+@@ -331,8 +65,9 @@
ELF_SHDR* shbuf = NULL;
ELF_SHDR* cursct = NULL;
ELF_PHDR* phbuf = NULL;
@@ -2442,16 +2153,26 @@
uintptr_t baseaddr = (uintptr_t)-1;
-@@ -357,23 +91,30 @@
+@@ -349,33 +84,39 @@
+
+ baseaddr = find_base_address(fd, &ehdr);
+
+- scn_cache = (struct elf_section *)
+- calloc(ehdr.e_shnum * sizeof(struct elf_section), 1);
++ scn_cache = calloc(ehdr.e_shnum, sizeof(*scn_cache));
+ if (scn_cache == NULL) {
+ goto quit;
+ }
for (cursct = shbuf, cnt = 0; cnt < ehdr.e_shnum; cnt++) {
scn_cache[cnt].c_shdr = cursct;
- if (cursct->sh_type == SHT_SYMTAB || cursct->sh_type == SHT_STRTAB
- || cursct->sh_type == SHT_NOTE || cursct->sh_type == SHT_DYNSYM) {
+- if ( (scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) {
+ if (cursct->sh_type == SHT_SYMTAB ||
+ cursct->sh_type == SHT_STRTAB ||
+ cursct->sh_type == SHT_DYNSYM) {
- if ( (scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) {
++ if ((scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) {
goto quit;
}
}
@@ -2478,11 +2199,77 @@
- if (shdr->sh_type == sym_section) {
+ if (shdr->sh_type == symsection) {
ELF_SYM *syms;
- int j, n, rslt;
+- int j, n, rslt;
++ int j, n;
size_t size;
-@@ -435,45 +176,6 @@
+
+ // FIXME: there could be multiple data buffers associated with the
+@@ -383,7 +124,7 @@
+ // for elf_getdata on Solaris.
+
+ // guarantee(symtab == NULL, "multiple symtab");
+- symtab = (struct symtab*)calloc(1, sizeof(struct symtab));
++ symtab = calloc(1, sizeof(*symtab));
+ if (symtab == NULL) {
+ goto quit;
+ }
+@@ -393,27 +134,32 @@
+ // number of symbols
+ n = shdr->sh_size / shdr->sh_entsize;
+
+- // create hash table, we use hcreate_r, hsearch_r and hdestroy_r to
++ // create hash table, we use berkeley db to
+ // manipulate the hash table.
+- symtab->hash_table = (struct hsearch_data*) calloc(1, sizeof(struct hsearch_data));
+- rslt = hcreate_r(n, symtab->hash_table);
+- // guarantee(rslt, "unexpected failure: hcreate_r");
++ symtab->hash_table = dbopen(NULL, O_CREAT | O_RDWR, 0600, DB_HASH, NULL);
++ // guarantee(symtab->hash_table, "unexpected failure: dbopen");
++ if (symtab->hash_table == NULL)
++ goto bad;
+
+ // shdr->sh_link points to the section that contains the actual strings
+ // for symbol names. the st_name field in ELF_SYM is just the
+ // string table index. we make a copy of the string table so the
+ // strings will not be destroyed by elf_end.
+ size = scn_cache[shdr->sh_link].c_shdr->sh_size;
+- symtab->strs = (char *)malloc(size);
++ symtab->strs = malloc(size);
++ if (symtab->strs == NULL)
++ goto bad;
+ memcpy(symtab->strs, scn_cache[shdr->sh_link].c_data, size);
+
+ // allocate memory for storing symbol offset and size;
+ symtab->num_symbols = n;
+- symtab->symbols = (struct elf_symbol *)calloc(n , sizeof(struct elf_symbol));
++ symtab->symbols = calloc(n , sizeof(*symtab->symbols));
++ if (symtab->symbols == NULL)
++ goto bad;
+
+ // copy symbols info our symtab and enter them info the hash table
+ for (j = 0; j < n; j++, syms++) {
+- ENTRY item, *ret;
++ DBT key, value;
+ char *sym_name = symtab->strs + syms->st_name;
+
+ // skip non-object and non-function symbols
+@@ -427,52 +173,19 @@
+ symtab->symbols[j].offset = syms->st_value - baseaddr;
+ symtab->symbols[j].size = syms->st_size;
+
+- item.key = sym_name;
+- item.data = (void *)&(symtab->symbols[j]);
+-
+- hsearch_r(item, ENTER, &ret, symtab->hash_table);
++ key.data = sym_name;
++ key.size = strlen(sym_name) + 1;
++ value.data = &(symtab->symbols[j]);
++ value.size = sizeof(void *);
++ (*symtab->hash_table->put)(symtab->hash_table, &key, &value, 0);
+ }
}
}
++ goto quit;
- // Look for a separate debuginfo file.
- if (try_debuginfo) {
@@ -2522,11 +2309,13 @@
- symtab = prev_symtab;
- }
- }
--
++bad:
++ destroy_symtab(symtab);
++ symtab = NULL;
+
quit:
if (shbuf) free(shbuf);
- if (phbuf) free(phbuf);
-@@ -488,11 +190,6 @@
+@@ -488,44 +201,36 @@
return symtab;
}
@@ -2538,7 +2327,69 @@
void destroy_symtab(struct symtab* symtab) {
if (!symtab) return;
if (symtab->strs) free(symtab->strs);
---- ./hotspot/agent/src/os/bsd/symtab.h 2011-06-27 23:25:37.000000000 -0700
+ if (symtab->symbols) free(symtab->symbols);
+ if (symtab->hash_table) {
+- hdestroy_r(symtab->hash_table);
+- free(symtab->hash_table);
++ (*symtab->hash_table->close)(symtab->hash_table);
+ }
+ free(symtab);
+ }
+
+ uintptr_t search_symbol(struct symtab* symtab, uintptr_t base,
+ const char *sym_name, int *sym_size) {
+- ENTRY item;
+- ENTRY* ret = NULL;
++ DBT key, value;
++ int ret;
+
+ // library does not have symbol table
+ if (!symtab || !symtab->hash_table)
+- return (uintptr_t)NULL;
++ return 0;
+
+- item.key = (char*) strdup(sym_name);
+- hsearch_r(item, FIND, &ret, symtab->hash_table);
+- if (ret) {
+- struct elf_symbol * sym = (struct elf_symbol *)(ret->data);
++ key.data = (char*)(uintptr_t)sym_name;
++ key.size = strlen(sym_name) + 1;
++ ret = (*symtab->hash_table->get)(symtab->hash_table, &key, &value, 0);
++ if (ret == 0) {
++ struct elf_symbol *sym = value.data;
+ uintptr_t rslt = (uintptr_t) ((char*)base + sym->offset);
+ if (sym_size) *sym_size = sym->size;
+- free(item.key);
+ return rslt;
+ }
+
+-quit:
+- free(item.key);
+- return (uintptr_t) NULL;
++ return 0;
+ }
+
+ const char* nearest_symbol(struct symtab* symtab, uintptr_t offset,
+@@ -533,12 +238,12 @@
+ int n = 0;
+ if (!symtab) return NULL;
+ for (; n < symtab->num_symbols; n++) {
+- struct elf_symbol* sym = &(symtab->symbols[n]);
+- if (sym->name != NULL &&
+- offset >= sym->offset && offset < sym->offset + sym->size) {
+- if (poffset) *poffset = (offset - sym->offset);
+- return sym->name;
+- }
++ struct elf_symbol* sym = &symtab->symbols[n];
++ if (sym->name != NULL &&
++ offset >= sym->offset && offset < sym->offset + sym->size) {
++ if (poffset) *poffset = (offset - sym->offset);
++ return sym->name;
++ }
+ }
+ return NULL;
+ }
+--- ./hotspot/agent/src/os/bsd/symtab.h 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/symtab.h 2011-04-22 22:28:31.000000000 -0700
@@ -32,7 +32,7 @@
struct symtab;
@@ -2549,7 +2400,7 @@
// destroy the symbol table
void destroy_symtab(struct symtab* symtab);
---- ./hotspot/agent/src/os/bsd/test.c 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/test.c 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/test.c 2011-04-22 22:28:31.000000000 -0700
@@ -44,7 +44,7 @@
}
@@ -2560,17 +2411,17 @@
return 1;
}
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-06-27 09:07:18.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-04-22 22:28:31.000000000 -0700
-@@ -28,6 +28,7 @@
- import java.net.*;
- import java.rmi.*;
- import sun.jvm.hotspot.debugger.*;
-+import sun.jvm.hotspot.debugger.bsd.*;
- import sun.jvm.hotspot.debugger.dbx.*;
- import sun.jvm.hotspot.debugger.proc.*;
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-11-17 21:35:59.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-02-26 15:32:26.000000000 -0800
+@@ -32,6 +32,7 @@
import sun.jvm.hotspot.debugger.remote.*;
-@@ -337,6 +338,8 @@
+ import sun.jvm.hotspot.debugger.windbg.*;
+ import sun.jvm.hotspot.debugger.linux.*;
++import sun.jvm.hotspot.debugger.bsd.*;
+ import sun.jvm.hotspot.memory.*;
+ import sun.jvm.hotspot.oops.*;
+ import sun.jvm.hotspot.runtime.*;
+@@ -335,6 +336,8 @@
setupDebuggerWin32();
} else if (os.equals("linux")) {
setupDebuggerLinux();
@@ -2579,7 +2430,7 @@
} else {
// Add support for more operating systems here
throw new DebuggerException("Operating system " + os + " not yet supported");
-@@ -392,6 +395,10 @@
+@@ -390,6 +393,10 @@
db = new HotSpotTypeDataBase(machDesc,
new LinuxVtblAccess(debugger, jvmLibNames),
debugger, jvmLibNames);
@@ -2590,7 +2441,7 @@
} else {
throw new DebuggerException("OS \"" + os + "\" not yet supported (no VtblAccess yet)");
}
-@@ -557,6 +564,8 @@
+@@ -477,6 +484,8 @@
setupJVMLibNamesWin32();
} else if (os.equals("linux")) {
setupJVMLibNamesLinux();
@@ -2599,7 +2450,7 @@
} else {
throw new RuntimeException("Unknown OS type");
}
-@@ -638,6 +647,31 @@
+@@ -554,6 +563,31 @@
jvmLibNames = new String[] { "libjvm.so", "libjvm_g.so" };
}
@@ -2631,17 +2482,17 @@
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-06-27 09:07:53.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-04-22 22:28:31.000000000 -0700
-@@ -29,6 +29,7 @@
- import java.rmi.*;
- import sun.jvm.hotspot.*;
- import sun.jvm.hotspot.debugger.*;
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-11-17 21:36:06.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-02-26 15:33:13.000000000 -0800
+@@ -34,6 +34,7 @@
+ import sun.jvm.hotspot.debugger.windbg.*;
+ import sun.jvm.hotspot.debugger.linux.*;
+ import sun.jvm.hotspot.debugger.sparc.*;
+import sun.jvm.hotspot.debugger.bsd.*;
- import sun.jvm.hotspot.debugger.dbx.*;
- import sun.jvm.hotspot.debugger.proc.*;
- import sun.jvm.hotspot.debugger.cdbg.*;
-@@ -516,6 +517,8 @@
+ import sun.jvm.hotspot.debugger.remote.*;
+ import sun.jvm.hotspot.livejvm.*;
+ import sun.jvm.hotspot.memory.*;
+@@ -514,6 +515,8 @@
setupDebuggerWin32();
} else if (os.equals("linux")) {
setupDebuggerLinux();
@@ -2650,7 +2501,7 @@
} else {
// Add support for more operating systems here
throw new DebuggerException("Operating system " + os + " not yet supported");
-@@ -567,6 +570,9 @@
+@@ -565,6 +568,9 @@
} else if (os.equals("linux")) {
db = new HotSpotTypeDataBase(machDesc, new LinuxVtblAccess(debugger, jvmLibNames),
debugger, jvmLibNames);
@@ -2660,7 +2511,7 @@
} else {
throw new DebuggerException("OS \"" + os + "\" not yet supported (no VtblAccess implemented yet)");
}
-@@ -739,6 +745,8 @@
+@@ -666,6 +672,8 @@
setupJVMLibNamesWin32();
} else if (os.equals("linux")) {
setupJVMLibNamesLinux();
@@ -2669,7 +2520,7 @@
} else {
throw new RuntimeException("Unknown OS type");
}
-@@ -822,6 +830,34 @@
+@@ -745,6 +753,34 @@
setupJVMLibNamesSolaris();
}
@@ -2704,7 +2555,7 @@
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-04-22 22:28:32.000000000 -0700
@@ -30,10 +30,8 @@
import sun.jvm.hotspot.debugger.cdbg.*;
@@ -2731,7 +2582,7 @@
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-04-22 22:28:32.000000000 -0700
@@ -26,9 +26,7 @@
@@ -2754,7 +2605,7 @@
} else {
throw new RuntimeException("cpu " + cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -2803,7 +2654,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,81 +0,0 @@
-/*
@@ -2887,7 +2738,7 @@
- private Address sp;
- private BsdDebugger dbg;
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -2936,7 +2787,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-06-27 09:09:18.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-11-17 21:36:30.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-04-22 22:28:32.000000000 -0700
@@ -37,6 +37,8 @@
import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
@@ -2961,7 +2812,7 @@
}
if (access == null) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-04-22 22:28:32.000000000 -0700
@@ -28,37 +28,36 @@
private static String[] signalNames = {
@@ -3023,7 +2874,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,137 +0,0 @@
-/*
@@ -3163,7 +3014,7 @@
- return debugger.getThreadForIdentifierAddress(pthreadIdAddr);
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,165 +0,0 @@
-/*
@@ -3331,7 +3182,7 @@
-
-
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-04-22 22:28:32.000000000 -0700
@@ -28,37 +28,36 @@
private static String[] signalNames = {
@@ -3393,7 +3244,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-06-27 09:09:52.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-11-17 21:36:36.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-04-22 22:28:33.000000000 -0700
@@ -37,6 +37,14 @@
return "solaris";
@@ -3410,8 +3261,8 @@
} else if (os.startsWith("Windows")) {
return "win32";
} else {
---- ./hotspot/make/Makefile 2011-06-27 09:10:06.000000000 -0700
-+++ ./hotspot/make/Makefile 2011-04-22 22:28:33.000000000 -0700
+--- ./hotspot/make/Makefile 2011-11-17 21:36:44.000000000 -0800
++++ ./hotspot/make/Makefile 2012-02-26 13:59:18.000000000 -0800
@@ -323,28 +323,28 @@
ifneq ($(OSNAME),windows)
ifeq ($(ZERO_BUILD), true)
@@ -3449,10 +3300,10 @@
-$(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so
+$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
- endif
- endif
---- ./hotspot/make/bsd/Makefile 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/make/bsd/Makefile 2011-05-07 21:53:43.000000000 -0700
+
+ # Debug info for shared library
+--- ./hotspot/make/bsd/Makefile 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/make/bsd/Makefile 2012-03-03 21:34:36.000000000 -0800
@@ -39,11 +39,11 @@
# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
# an architecture that differs from the target architecture, as long
@@ -3476,7 +3327,7 @@
# changing GAMMADIR in a way that exercises the automounter could
# prove to be a source of unreliability in the build process.
# Obviously, this Makefile is only relevant on SunOS boxes to begin
-@@ -226,11 +226,12 @@
+@@ -227,11 +227,12 @@
checks: check_os_version check_j2se_version
@@ -3485,15 +3336,15 @@
# Solaris 2.5.1, 2.6).
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
--SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
-+#SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
++#SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
+DISABLE_HOTSPOT_OS_VERSION_CHECK = ok
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
---- ./hotspot/make/bsd/makefiles/buildtree.make 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/buildtree.make 2011-04-22 22:28:33.000000000 -0700
-@@ -321,10 +321,11 @@
+--- ./hotspot/make/bsd/makefiles/buildtree.make 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/buildtree.make 2012-03-03 19:50:46.000000000 -0800
+@@ -325,10 +325,11 @@
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
{ \
echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
@@ -3506,7 +3357,7 @@
) > $@
env.csh: env.sh
-@@ -389,6 +390,7 @@
+@@ -393,6 +394,7 @@
echo '#!/bin/sh'; \
$(BUILDTREE_COMMENT); \
echo '. ./env.sh'; \
@@ -3677,8 +3528,8 @@
+FORCE:
+
+.PHONY: cscope cscope.clean TAGS.clean nametable.clean FORCE
---- ./hotspot/make/bsd/makefiles/defs.make 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/defs.make 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/defs.make 2012-03-03 21:33:09.000000000 -0800
@@ -72,8 +72,8 @@
HS_ARCH = sparc
endif
@@ -3726,7 +3577,7 @@
endif
# ARM
-@@ -116,39 +126,45 @@
+@@ -177,13 +187,21 @@
JDK_INCLUDE_SUBDIR=bsd
@@ -3746,22 +3597,28 @@
# client and server subdirectories have symbolic links to ../libjsig.so
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
- EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+ endif
+@@ -193,7 +211,7 @@
ifndef BUILD_CLIENT_ONLY
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
- endif
-
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ endif
+@@ -202,7 +220,7 @@
ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
- endif
- endif
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ endif
+@@ -211,19 +229,17 @@
# Serviceability Binaries
# No SA Support for PPC, IA64, ARM or zero
@@ -3769,14 +3626,18 @@
- $(EXPORT_LIB_DIR)/sa-jdi.jar
-ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
- $(EXPORT_LIB_DIR)/sa-jdi.jar
--ADD_SA_BINARIES/ppc =
--ADD_SA_BINARIES/ia64 =
--ADD_SA_BINARIES/arm =
--ADD_SA_BINARIES/zero =
+ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ ifneq ($(OBJCOPY),)
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ endif
+-ADD_SA_BINARIES/ppc =
+-ADD_SA_BINARIES/ia64 =
+-ADD_SA_BINARIES/arm =
+-ADD_SA_BINARIES/zero =
+ADD_SA_BINARIES/ppc =
+ADD_SA_BINARIES/ia64 =
+ADD_SA_BINARIES/arm =
@@ -3785,8 +3646,8 @@
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
-
-
---- ./hotspot/make/bsd/makefiles/gcc.make 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/gcc.make 2011-05-12 21:07:19.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/gcc.make 2012-03-03 19:50:46.000000000 -0800
@@ -22,24 +22,28 @@
#
#
@@ -3915,8 +3776,8 @@
#------------------------------------------------------------------------
# Debug flags
---- ./hotspot/make/bsd/makefiles/jsig.make 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/jsig.make 2011-04-22 22:28:33.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/jsig.make 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/jsig.make 2012-03-03 19:50:46.000000000 -0800
@@ -25,11 +25,16 @@
# Rules to build signal interposition library, used by vm.make
@@ -3936,9 +3797,9 @@
+ LIBJSIG_G = lib$(JSIG_G).so
+endif
- JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
-
-@@ -42,7 +47,7 @@
+ LIBJSIG_DEBUGINFO = lib$(JSIG).debuginfo
+ LIBJSIG_G_DEBUGINFO = lib$(JSIG_G).debuginfo
+@@ -46,7 +51,7 @@
# cause problems with interposing. See CR: 6466665
# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
@@ -3947,16 +3808,16 @@
# DEBUG_BINARIES overrides everything, use full -g debug information
ifeq ($(DEBUG_BINARIES), true)
-@@ -52,7 +57,7 @@
+@@ -56,7 +61,7 @@
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
@echo Making signal interposition lib...
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
-
- install_jsig: $(LIBJSIG)
---- ./hotspot/make/bsd/makefiles/launcher.make 2011-06-27 23:25:37.000000000 -0700
+ ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
+--- ./hotspot/make/bsd/makefiles/launcher.make 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/launcher.make 2011-04-22 22:28:33.000000000 -0700
@@ -50,7 +50,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
@@ -3967,7 +3828,7 @@
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
---- ./hotspot/make/bsd/makefiles/sa.make 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/sa.make 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/sa.make 2011-04-23 12:15:44.000000000 -0700
@@ -45,8 +45,8 @@
@@ -3980,9 +3841,9 @@
AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
---- ./hotspot/make/bsd/makefiles/saproc.make 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/saproc.make 2011-04-22 22:28:33.000000000 -0700
-@@ -25,23 +25,34 @@
+--- ./hotspot/make/bsd/makefiles/saproc.make 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/saproc.make 2012-03-03 19:50:46.000000000 -0800
+@@ -25,12 +25,16 @@
# Rules to build serviceability agent library, used by vm.make
# libsaproc[_g].so: serviceability agent
@@ -4002,7 +3863,9 @@
+ LIBSAPROC_G = lib$(SAPROC_G).so
+endif
- AGENT_DIR = $(GAMMADIR)/agent
+ LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo
+ LIBSAPROC_G_DEBUGINFO = lib$(SAPROC_G).debuginfo
+@@ -39,12 +43,18 @@
SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
@@ -4012,7 +3875,6 @@
$(SASRCDIR)/libproc_impl.c \
$(SASRCDIR)/ps_proc.c \
$(SASRCDIR)/ps_core.c \
-+ $(SASRCDIR)/hsearch_r.c \
$(SASRCDIR)/BsdDebuggerLocal.c
+SALIBS = -lutil -lthread_db
+else
@@ -4022,7 +3884,7 @@
SAMAPFILE = $(SASRCDIR)/mapfile
-@@ -62,7 +73,10 @@
+@@ -66,7 +76,10 @@
endif
@@ -4034,7 +3896,7 @@
$(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-@@ -75,12 +89,12 @@
+@@ -79,12 +92,12 @@
-I$(SASRCDIR) \
-I$(GENERATED) \
-I$(BOOT_JAVA_HOME)/include \
@@ -4047,11 +3909,11 @@
- -lthread_db
+ $(SALIBS)
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
-
- install_saproc: $(BUILDLIBSAPROC)
---- ./hotspot/make/bsd/makefiles/vm.make 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/vm.make 2011-05-14 23:15:36.000000000 -0700
-@@ -92,6 +92,10 @@
+ ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
+--- ./hotspot/make/bsd/makefiles/vm.make 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/vm.make 2012-03-03 19:50:46.000000000 -0800
+@@ -98,6 +98,10 @@
${JRE_VERSION} \
${VM_DISTRO}
@@ -4062,7 +3924,7 @@
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
CFLAGS += $(CFLAGS_WARN/BYFILE)
-@@ -104,9 +108,11 @@
+@@ -110,9 +114,11 @@
# Don't set excutable bit on stack segment
# the same could be done by separate execstack command
@@ -4075,7 +3937,7 @@
# By default, link the *.o into the library, not the executable.
LINK_INTO$(LINK_INTO) = LIBJVM
-@@ -120,9 +126,15 @@
+@@ -126,9 +132,15 @@
#----------------------------------------------------------------------
# JVM
@@ -4092,9 +3954,9 @@
+ LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
+endif
- SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
-
-@@ -213,15 +225,7 @@
+ LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
+ LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
+@@ -222,15 +234,7 @@
vm.def: $(Res_Files) $(Obj_Files)
sh $(GAMMADIR)/make/bsd/makefiles/build_vm_def.sh *.o > $@
@@ -4111,7 +3973,7 @@
ifeq ($(LINK_INTO),AOUT)
LIBJVM.o =
-@@ -233,14 +237,21 @@
+@@ -242,14 +246,21 @@
LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM))
@@ -4134,7 +3996,7 @@
endif
LIBS_VM += $(LIBS)
-@@ -253,7 +264,6 @@
+@@ -262,7 +273,6 @@
LIBS_VM += $(LLVM_LIBS)
endif
@@ -4142,7 +4004,7 @@
# rule for building precompiled header
$(PRECOMPILED_HEADER):
-@@ -281,11 +291,6 @@
+@@ -290,11 +300,6 @@
LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT)
endif
@@ -4154,7 +4016,7 @@
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
$(QUIETLY) { \
echo Linking vm...; \
-@@ -295,17 +300,6 @@
+@@ -304,17 +309,6 @@
$(LINK_LIB.CC/POST_HOOK) \
rm -f $@.1; ln -s $@ $@.1; \
[ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
@@ -4170,9 +4032,9 @@
- fi \
- fi \
}
-
- DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
---- ./hotspot/make/bsd/makefiles/zeroshark.make 2011-06-27 23:25:37.000000000 -0700
+ ifeq ($(CROSS_COMPILE_ARCH),)
+ ifneq ($(OBJCOPY),)
+--- ./hotspot/make/bsd/makefiles/zeroshark.make 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/zeroshark.make 2011-04-22 22:28:33.000000000 -0700
@@ -40,4 +40,23 @@
CFLAGS += -D_LP64=1
@@ -4198,7 +4060,7 @@
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
OPT_CFLAGS/compactingPermGenGen.o = -O1
---- ./hotspot/make/bsd/platform_amd64 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_amd64 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_amd64 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4206,7 +4068,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_amd64.suncc 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_amd64.suncc 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_amd64.suncc 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
@@ -4214,7 +4076,7 @@
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_arm 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_arm 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_arm 1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-os_family = bsd
@@ -4234,7 +4096,7 @@
-gnu_dis_arch = arm
-
-sysdefs = -DBSD -D_GNU_SOURCE -DARM
---- ./hotspot/make/bsd/platform_i486 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_i486 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_i486 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4242,7 +4104,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_i486.suncc 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_i486.suncc 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_i486.suncc 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
@@ -4250,7 +4112,7 @@
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_ia64 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_ia64 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_ia64 2011-04-22 22:28:33.000000000 -0700
@@ -10,6 +10,6 @@
@@ -4260,7 +4122,7 @@
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP
mark_style = alignment
---- ./hotspot/make/bsd/platform_ppc 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_ppc 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_ppc 1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-os_family = bsd
@@ -4280,7 +4142,7 @@
-gnu_dis_arch = ppc
-
-sysdefs = -DBSD -D_GNU_SOURCE -DPPC
---- ./hotspot/make/bsd/platform_sparc 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_sparc 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_sparc 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4288,7 +4150,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_sparcv9 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_sparcv9 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_sparcv9 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4296,7 +4158,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_zero.in 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/make/bsd/platform_zero.in 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/make/bsd/platform_zero.in 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
@@ -4304,7 +4166,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
---- ./hotspot/make/cscope.make 2011-06-27 09:10:06.000000000 -0700
+--- ./hotspot/make/cscope.make 2011-11-17 21:36:44.000000000 -0800
+++ ./hotspot/make/cscope.make 2011-05-07 23:28:29.000000000 -0700
@@ -63,7 +63,7 @@
# space-separated list of identifiers to include only those systems.
@@ -4315,7 +4177,7 @@
endif
# CPU-specific files for all processors are included by default. Set CS_CPU
---- ./hotspot/make/defs.make 2011-06-27 09:10:06.000000000 -0700
+--- ./hotspot/make/defs.make 2011-11-17 21:36:44.000000000 -0800
+++ ./hotspot/make/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -118,13 +118,23 @@
# Windows should have OS predefined
@@ -4343,9 +4205,9 @@
else
OSNAME=solaris
endif
---- ./hotspot/make/linux/makefiles/defs.make 2011-06-27 09:10:09.000000000 -0700
-+++ ./hotspot/make/linux/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
-@@ -116,33 +116,36 @@
+--- ./hotspot/make/linux/makefiles/defs.make 2011-11-17 21:36:44.000000000 -0800
++++ ./hotspot/make/linux/makefiles/defs.make 2012-02-26 15:34:17.000000000 -0800
+@@ -177,13 +177,16 @@
JDK_INCLUDE_SUBDIR=linux
@@ -4360,22 +4222,28 @@
# client and server subdirectories have symbolic links to ../libjsig.so
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
- EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+ endif
+@@ -193,7 +196,7 @@
ifndef BUILD_CLIENT_ONLY
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
- endif
-
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ endif
+@@ -202,7 +205,7 @@
ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
- endif
- endif
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ endif
+@@ -211,9 +214,9 @@
# Serviceability Binaries
# No SA Support for PPC, IA64, ARM or zero
@@ -4385,11 +4253,11 @@
-ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
+ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
- ADD_SA_BINARIES/ppc =
- ADD_SA_BINARIES/ia64 =
---- ./hotspot/make/sa.files 2011-06-27 09:10:15.000000000 -0700
-+++ ./hotspot/make/sa.files 2011-04-22 22:28:33.000000000 -0700
-@@ -50,6 +50,9 @@
+ ifneq ($(OBJCOPY),)
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+--- ./hotspot/make/sa.files 2011-11-17 21:36:45.000000000 -0800
++++ ./hotspot/make/sa.files 2012-02-26 13:59:18.000000000 -0800
+@@ -51,6 +51,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \
@@ -4409,9 +4277,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \
---- ./hotspot/make/solaris/makefiles/defs.make 2011-06-27 09:10:17.000000000 -0700
-+++ ./hotspot/make/solaris/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
-@@ -61,34 +61,37 @@
+--- ./hotspot/make/solaris/makefiles/defs.make 2011-11-17 21:36:47.000000000 -0800
++++ ./hotspot/make/solaris/makefiles/defs.make 2012-02-26 15:35:23.000000000 -0800
+@@ -134,13 +134,16 @@
JDK_INCLUDE_SUBDIR=solaris
@@ -4427,8 +4295,11 @@
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
+# client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+ endif
+@@ -150,9 +153,9 @@
- EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
ifneq ($(BUILD_CLIENT_ONLY),true)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
@@ -4437,9 +4308,12 @@
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo
+@@ -161,11 +164,11 @@
endif
ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so
@@ -4451,18 +4325,30 @@
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo
+@@ -174,8 +177,8 @@
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo
+ endif
ifneq ($(BUILD_CLIENT_ONLY), true)
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo
+@@ -183,7 +186,7 @@
endif
endif
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/make/templates/bsd-header 2011-06-27 09:10:26.000000000 -0700
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ endif
+--- ./hotspot/make/templates/bsd-header 2011-11-17 21:36:51.000000000 -0800
+++ ./hotspot/make/templates/bsd-header 1969-12-31 16:00:00.000000000 -0800
@@ -1,28 +0,0 @@
-Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
@@ -4493,8 +4379,8 @@
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---- ./hotspot/make/windows/makefiles/defs.make 2011-06-27 09:10:28.000000000 -0700
-+++ ./hotspot/make/windows/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
+--- ./hotspot/make/windows/makefiles/defs.make 2011-11-17 21:36:52.000000000 -0800
++++ ./hotspot/make/windows/makefiles/defs.make 2012-02-26 13:59:19.000000000 -0800
@@ -109,6 +109,9 @@
JDK_INCLUDE_SUBDIR=win32
@@ -4505,9 +4391,9 @@
# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
# and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
-@@ -172,26 +175,26 @@
+@@ -175,24 +178,24 @@
+ EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
- EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
@@ -4515,14 +4401,12 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
# kernel vm
- EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll
+ EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
@@ -4536,7 +4420,7 @@
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2011-06-27 09:10:41.000000000 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2011-11-17 21:36:57.000000000 -0800
+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2011-04-22 22:28:33.000000000 -0700
@@ -70,7 +70,11 @@
define_pd_global(bool, RewriteBytecodes, true);
@@ -4550,7 +4434,7 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
---- ./hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-06-27 09:10:49.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-11-17 21:37:00.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -81,6 +81,9 @@
#ifdef TARGET_OS_ARCH_windows_x86
@@ -4562,9 +4446,9 @@
#endif // CPU_X86_VM_BYTES_X86_HPP
---- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-06-27 09:10:50.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-06-07 20:02:44.000000000 -0700
-@@ -480,8 +480,8 @@
+--- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-11-17 21:37:00.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2012-02-26 13:59:19.000000000 -0800
+@@ -427,8 +427,8 @@
// Fetch the exception from TLS and clear out exception related thread state
__ get_thread(rsi);
__ movptr(rax, Address(rsi, JavaThread::exception_oop_offset()));
@@ -4575,7 +4459,7 @@
__ bind(_unwind_handler_entry);
__ verify_not_null_oop(rax);
---- ./hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-06-27 09:10:52.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-11-17 21:37:01.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_ARCH_windows_x86
@@ -4587,7 +4471,7 @@
static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
---- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2011-06-27 09:10:54.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2011-11-17 21:37:01.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -70,7 +70,11 @@
define_pd_global(bool, RewriteBytecodes, true);
@@ -4601,8 +4485,8 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-06-27 09:10:55.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-05-12 20:54:44.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-11-17 21:37:01.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2012-02-26 13:59:19.000000000 -0800
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -4613,7 +4497,7 @@
// Implementation of InterpreterMacroAssembler
-@@ -1144,7 +1147,7 @@
+@@ -1158,7 +1161,7 @@
int recvr_offset = in_bytes(VirtualCallData::receiver_offset(start_row));
set_mdp_data_at(mdp, recvr_offset, receiver);
int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row));
@@ -4622,7 +4506,7 @@
set_mdp_data_at(mdp, count_offset, reg2);
if (start_row > 0) {
jmp(done);
-@@ -1287,7 +1290,7 @@
+@@ -1301,7 +1304,7 @@
test_method_data_pointer(mdp, profile_continue);
// Build the base (index * per_case_size_in_bytes()) + case_array_offset_in_bytes()
@@ -4631,8 +4515,8 @@
// index is positive and so should have correct value if this code were
// used on 64bits
imulptr(index, reg2);
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-06-27 09:10:55.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-05-12 20:54:44.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-11-17 21:37:01.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2012-02-26 13:59:19.000000000 -0800
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -4643,7 +4527,7 @@
// Implementation of InterpreterMacroAssembler
---- ./hotspot/src/cpu/x86/vm/jni_x86.h 2011-06-27 09:10:57.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2011-11-17 21:37:02.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2011-04-22 22:28:34.000000000 -0700
@@ -26,7 +26,7 @@
#ifndef _JAVASOFT_JNI_MD_H_
@@ -4654,8 +4538,8 @@
#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)
#define JNIEXPORT __attribute__((visibility("default")))
---- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-06-27 09:10:59.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-06-21 05:38:36.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-11-17 21:37:03.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2012-02-26 13:59:19.000000000 -0800
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -4666,8 +4550,8 @@
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
---- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-06-27 09:10:59.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-06-21 05:38:36.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-11-17 21:37:03.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2012-02-26 13:59:19.000000000 -0800
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -4678,7 +4562,7 @@
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
---- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-06-27 09:10:59.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-11-17 21:37:03.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -4690,7 +4574,7 @@
// Implementation of the platform-specific part of StubRoutines - for
// a description of how to extend it, see the stubRoutines.hpp file.
---- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-06-27 09:10:59.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-11-17 21:37:03.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -4702,8 +4586,8 @@
// Implementation of the platform-specific part of StubRoutines - for
// a description of how to extend it, see the stubRoutines.hpp file.
---- ./hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-06-27 09:11:01.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-05-27 00:00:43.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-11-17 21:37:05.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2012-02-26 13:59:19.000000000 -0800
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
@@ -4714,7 +4598,7 @@
int VM_Version::_cpu;
---- ./hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-06-27 09:11:03.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-11-17 21:37:07.000000000 -0800
+++ ./hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -168,6 +168,9 @@
#ifdef TARGET_OS_ARCH_linux_zero
@@ -4726,7 +4610,7 @@
#endif // VM_LITTLE_ENDIAN
---- ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2011-06-27 09:11:06.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2011-11-17 21:37:08.000000000 -0800
+++ ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2011-04-23 12:09:38.000000000 -0700
@@ -52,7 +52,11 @@
define_pd_global(bool, RewriteBytecodes, true);
@@ -4740,7 +4624,7 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
---- ./hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-06-27 09:11:06.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-11-17 21:37:09.000000000 -0800
+++ ./hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -40,5 +40,8 @@
#ifdef TARGET_OS_FAMILY_linux
@@ -4751,8 +4635,8 @@
+#endif
// This file is intentionally empty
---- ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-06-27 09:11:10.000000000 -0700
-+++ ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-04-22 22:28:34.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-11-17 21:37:10.000000000 -0800
++++ ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2012-02-26 13:59:19.000000000 -0800
@@ -43,6 +43,9 @@
#ifdef TARGET_OS_FAMILY_linux
# include "thread_linux.inline.hpp"
@@ -4763,7 +4647,7 @@
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
---- ./hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-06-27 09:11:11.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-11-17 21:37:10.000000000 -0800
+++ ./hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -30,3 +30,6 @@
#ifdef TARGET_OS_FAMILY_linux
@@ -4772,7 +4656,7 @@
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
---- ./hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-06-27 09:11:12.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-11-17 21:37:10.000000000 -0800
+++ ./hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -32,5 +32,8 @@
#ifdef TARGET_OS_FAMILY_linux
@@ -4783,7 +4667,7 @@
+#endif
// This file is intentionally empty
---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -337,6 +337,15 @@
@@ -4839,7 +4723,7 @@
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
---- ./hotspot/src/os/bsd/vm/globals_bsd.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/globals_bsd.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/globals_bsd.hpp 2011-05-13 21:09:51.000000000 -0700
@@ -47,7 +47,7 @@
// Defines Bsd-specific default values. The flags are available on all
@@ -4850,7 +4734,7 @@
define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;
---- ./hotspot/src/os/bsd/vm/jsig.c 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/jsig.c 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/jsig.c 2011-04-22 22:28:34.000000000 -0700
@@ -35,10 +35,7 @@
#include <pthread.h>
@@ -4874,7 +4758,7 @@
}
static int call_os_sigaction(int sig, const struct sigaction *act,
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -141,38 +141,31 @@
"ILL", SIGILL, /* Illegal instruction (ANSI). */
@@ -4925,9 +4809,31 @@
};
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2011-04-22 22:28:34.000000000 -0700
-@@ -54,7 +54,11 @@
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2012-02-12 13:05:32.000000000 -0800
+@@ -41,6 +41,21 @@
+ * This file is currently collecting system-specific dregs for the
+ * JNI conversion, which should be sorted out later.
+ */
++#ifdef __NetBSD__
++/*
++ * Since we are compiling with c++, we need the following to make c macros
++ * visible.
++ */
++# if !defined(__STDC_LIMIT_MACROS)
++# define __STDC_LIMIT_MACROS 1
++# endif
++# if !defined(__STDC_CONSTANT_MACROS)
++# define __STDC_CONSTANT_MACROS 1
++# endif
++# if !defined(__STDC_FORMAT_MACROS)
++# define __STDC_FORMAT_MACROS 1
++# endif
++#endif
+
+ #include <dirent.h> /* For DIR */
+ #include <sys/param.h> /* For MAXPATHLEN */
+@@ -54,7 +69,11 @@
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
#define JNI_LIB_PREFIX "lib"
@@ -4939,7 +4845,7 @@
// Hack: MAXPATHLEN is 4095 on some Bsd and 4096 on others. This may
// cause problems if JVM and the rest of JDK are built on different
-@@ -93,6 +97,20 @@
+@@ -93,6 +112,20 @@
#define SHUTDOWN2_SIGNAL SIGINT
#define SHUTDOWN3_SIGNAL SIGTERM
@@ -4960,7 +4866,7 @@
#endif /* JVM_MD_H */
// Reconciliation History
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -49,8 +49,8 @@
@@ -4973,7 +4879,7 @@
_siginfo = NULL;
_ucontext = NULL;
_expanding_stack = 0;
---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -39,6 +39,12 @@
@@ -5032,8 +4938,8 @@
pthread_t pthread_id() const {
return _pthread_id;
}
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2011-05-20 20:04:01.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2012-03-03 21:57:22.000000000 -0800
@@ -22,8 +22,6 @@
*
*/
@@ -5119,9 +5025,9 @@
-/* Used to protect dlsym() calls */
-static pthread_mutex_t dl_mutex;
- ////////////////////////////////////////////////////////////////////////////////
- // utility functions
-@@ -180,11 +203,16 @@
+ #ifdef JAVASE_EMBEDDED
+ class MemNotifyThread: public Thread {
+@@ -208,11 +231,16 @@
}
julong os::Bsd::available_memory() {
@@ -5138,7 +5044,7 @@
}
julong os::physical_memory() {
-@@ -232,6 +260,7 @@
+@@ -260,6 +288,7 @@
}
@@ -5146,7 +5052,7 @@
#ifndef SYS_gettid
// i386: 224, ia64: 1105, amd64: 186, sparc 143
#ifdef __ia64__
-@@ -246,6 +275,7 @@
+@@ -274,6 +303,7 @@
#error define gettid for the arch
#endif
#endif
@@ -5154,7 +5060,7 @@
// Cpu architecture string
#if defined(ZERO)
-@@ -271,6 +301,7 @@
+@@ -299,6 +329,7 @@
#endif
@@ -5162,7 +5068,7 @@
// pid_t gettid()
//
// Returns the kernel thread id of the currently running thread. Kernel
-@@ -297,7 +328,48 @@
+@@ -325,7 +356,48 @@
static const char *unstable_chroot_error = "/proc file system not found.\n"
"Java may be unstable running multithreaded in a chroot "
"environment on Bsd when /proc filesystem is not mounted.";
@@ -5211,7 +5117,7 @@
void os::Bsd::initialize_system_info() {
set_processor_count(sysconf(_SC_NPROCESSORS_CONF));
if (processor_count() == 1) {
-@@ -314,6 +386,7 @@
+@@ -342,6 +414,7 @@
_physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
assert(processor_count() > 0, "bsd error");
}
@@ -5219,7 +5125,7 @@
void os::init_system_properties_values() {
// char arch[12];
-@@ -357,9 +430,7 @@
+@@ -385,9 +458,7 @@
* ...
* 7: The default directories, normally /lib and /usr/lib.
*/
@@ -5230,7 +5136,7 @@
#define DEFAULT_LIBPATH "/lib:/usr/lib"
#endif
-@@ -438,7 +509,11 @@
+@@ -466,7 +537,11 @@
* should always exist (until the legacy problem cited above is
* addressed).
*/
@@ -5242,7 +5148,7 @@
if (v != NULL) {
char *t = ld_library_path;
/* That's +1 for the colon and +1 for the trailing '\0' */
-@@ -597,6 +672,7 @@
+@@ -625,6 +700,7 @@
}
}
@@ -5250,7 +5156,7 @@
//////////////////////////////////////////////////////////////////////////////
// detecting pthread library
-@@ -760,6 +836,7 @@
+@@ -788,6 +864,7 @@
}
return false;
}
@@ -5258,7 +5164,7 @@
//////////////////////////////////////////////////////////////////////////////
// create new thread
-@@ -768,6 +845,9 @@
+@@ -796,6 +873,9 @@
// check if it's safe to start a new thread
static bool _thread_safety_check(Thread* thread) {
@@ -5268,7 +5174,7 @@
if (os::Bsd::is_BsdThreads() && !os::Bsd::is_floating_stack()) {
// Fixed stack BsdThreads (SuSE Bsd/x86, and some versions of Redhat)
// Heap is mmap'ed at lower end of memory space. Thread stacks are
-@@ -801,6 +881,7 @@
+@@ -829,6 +909,7 @@
// here, that means enough space has been reserved for stack.
return true;
}
@@ -5276,7 +5182,7 @@
}
// Thread start routine for all newly created threads
-@@ -828,6 +909,10 @@
+@@ -856,6 +937,10 @@
return NULL;
}
@@ -5287,7 +5193,7 @@
// thread_id is kernel thread id (similar to Solaris LWP id)
osthread->set_thread_id(os::Bsd::gettid());
-@@ -837,6 +922,7 @@
+@@ -865,6 +950,7 @@
thread->set_lgrp_id(lgrp_id);
}
}
@@ -5295,7 +5201,7 @@
// initialize signal mask for this thread
os::Bsd::hotspot_sigmask(thread);
-@@ -919,17 +1005,22 @@
+@@ -947,17 +1033,22 @@
// let pthread_create() pick the default value.
}
@@ -5318,7 +5224,7 @@
pthread_t tid;
int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
-@@ -943,7 +1034,9 @@
+@@ -971,7 +1062,9 @@
// Need to clean up stuff we've allocated so far
thread->set_osthread(NULL);
delete osthread;
@@ -5328,7 +5234,7 @@
return false;
}
-@@ -959,9 +1052,11 @@
+@@ -987,9 +1080,11 @@
}
}
@@ -5340,7 +5246,7 @@
}
// Aborted due to thread limit being reached
-@@ -999,7 +1094,11 @@
+@@ -1027,7 +1122,11 @@
}
// Store pthread info into the OSThread
@@ -5352,7 +5258,7 @@
osthread->set_pthread_id(::pthread_self());
// initialize floating point control register
-@@ -1010,6 +1109,7 @@
+@@ -1038,6 +1137,7 @@
thread->set_osthread(osthread);
@@ -5360,7 +5266,7 @@
if (UseNUMA) {
int lgrp_id = os::numa_get_group_id();
if (lgrp_id != -1) {
-@@ -1036,6 +1136,7 @@
+@@ -1064,6 +1164,7 @@
os::Bsd::manually_expand_stack(jt, addr);
osthread->clear_expanding_stack();
}
@@ -5368,7 +5274,7 @@
// initialize signal mask for this thread
// and save the caller's signal mask
-@@ -1094,6 +1195,7 @@
+@@ -1122,6 +1223,7 @@
//////////////////////////////////////////////////////////////////////////////
// initial thread
@@ -5376,7 +5282,7 @@
// Check if current thread is the initial thread, similar to Solaris thr_main.
bool os::Bsd::is_initial_thread(void) {
char dummy;
-@@ -1330,6 +1432,7 @@
+@@ -1358,6 +1460,7 @@
_initial_thread_stack_size = align_size_down(_initial_thread_stack_size, page_size());
_initial_thread_stack_bottom = (address)stack_top - _initial_thread_stack_size;
}
@@ -5384,7 +5290,7 @@
////////////////////////////////////////////////////////////////////////////////
// time support
-@@ -1351,9 +1454,7 @@
+@@ -1379,9 +1482,7 @@
return (1000 * 1000);
}
@@ -5395,7 +5301,7 @@
bool os::supports_vtime() { return false; }
bool os::enable_vtime() { return false; }
bool os::vtime_enabled() { return false; }
-@@ -1373,6 +1474,21 @@
+@@ -1401,6 +1502,21 @@
#define CLOCK_MONOTONIC (1)
#endif
@@ -5417,7 +5323,7 @@
void os::Bsd::clock_init() {
// we do dlopen's in this particular order due to bug in bsd
// dynamical loader (see 6348968) leading to crash on exit
-@@ -1408,7 +1524,9 @@
+@@ -1436,7 +1552,9 @@
}
}
}
@@ -5427,7 +5333,7 @@
#ifndef SYS_clock_getres
#if defined(IA32) || defined(AMD64)
-@@ -1449,6 +1567,7 @@
+@@ -1477,6 +1595,7 @@
_pthread_getcpuclockid = pthread_getcpuclockid_func;
}
}
@@ -5435,7 +5341,7 @@
jlong os::javaTimeNanos() {
if (Bsd::supports_monotonic_clock()) {
-@@ -1617,7 +1736,14 @@
+@@ -1645,7 +1764,14 @@
// DLL functions
@@ -5451,7 +5357,7 @@
// This must be hard coded because it's the system's temporary
// directory not the java application's temp directory, ala java.io.tmpdir.
-@@ -1637,13 +1763,13 @@
+@@ -1665,13 +1791,13 @@
const size_t pnamelen = pname ? strlen(pname) : 0;
// Quietly truncate on buffer overflow. Should be an error.
@@ -5467,7 +5373,7 @@
} else if (strchr(pname, *os::path_separator()) != NULL) {
int n;
char** pelements = split_path(pname, &n);
-@@ -1652,7 +1778,8 @@
+@@ -1680,7 +1806,8 @@
if (pelements[i] == NULL || strlen(pelements[i]) == 0) {
continue; // skip the empty path values
}
@@ -5477,7 +5383,7 @@
if (file_exists(buffer)) {
break;
}
-@@ -1667,7 +1794,7 @@
+@@ -1695,7 +1822,7 @@
FREE_C_HEAP_ARRAY(char*, pelements);
}
} else {
@@ -5486,7 +5392,7 @@
}
}
-@@ -1717,6 +1844,23 @@
+@@ -1745,6 +1872,23 @@
return false;
}
@@ -5510,7 +5416,7 @@
struct _address_to_library_name {
address addr; // input : memory address
size_t buflen; // size of fname
-@@ -1791,11 +1935,27 @@
+@@ -1819,11 +1963,27 @@
return false;
}
}
@@ -5527,18 +5433,18 @@
+ // Successful loading
+ return result;
+ }
-
++
+ // Read system error message into ebuf
+ ::strncpy(ebuf, ::dlerror(), ebuflen-1);
+ ebuf[ebuflen-1]='\0';
-+
+
+ return NULL;
+}
+#else
void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
{
void * result= ::dlopen(filename, RTLD_LAZY);
-@@ -1848,6 +2008,26 @@
+@@ -1876,6 +2036,26 @@
#define EM_486 6 /* Intel 80486 */
#endif
@@ -5565,7 +5471,7 @@
static const arch_t arch_array[]={
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
{EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
-@@ -1951,17 +2131,11 @@
+@@ -1979,17 +2159,11 @@
return NULL;
}
@@ -5586,7 +5492,7 @@
}
-@@ -1984,7 +2158,51 @@
+@@ -2012,7 +2186,51 @@
void os::print_dll_info(outputStream *st) {
st->print_cr("Dynamic libraries:");
@@ -5639,7 +5545,7 @@
char fname[32];
pid_t pid = os::Bsd::gettid();
-@@ -1993,6 +2211,7 @@
+@@ -2021,6 +2239,7 @@
if (!_print_ascii_file(fname, st)) {
st->print("Can not get library information for pid = %d\n", pid);
}
@@ -5647,7 +5553,7 @@
}
-@@ -2027,6 +2246,7 @@
+@@ -2055,6 +2274,7 @@
st->print(name.machine);
st->cr();
@@ -5655,7 +5561,7 @@
// Print warning if unsafe chroot environment detected
if (unsafe_chroot_detected) {
st->print("WARNING!! ");
-@@ -2041,6 +2261,7 @@
+@@ -2069,6 +2289,7 @@
st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed");
}
st->cr();
@@ -5663,7 +5569,7 @@
// rlimit
st->print("rlimit:");
-@@ -2066,6 +2287,7 @@
+@@ -2094,6 +2315,7 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -5671,7 +5577,7 @@
st->print(", AS ");
getrlimit(RLIMIT_AS, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
-@@ -2078,11 +2300,7 @@
+@@ -2106,11 +2328,7 @@
os::loadavg(loadavg, 3);
st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]);
st->cr();
@@ -5683,8 +5589,8 @@
+#endif
}
- void os::print_memory_info(outputStream* st) {
-@@ -2090,18 +2308,27 @@
+ void os::pd_print_cpu_info(outputStream* st) {
+@@ -2126,18 +2344,27 @@
st->print("Memory:");
st->print(" %dk page", os::vm_page_size()>>10);
@@ -5712,7 +5618,7 @@
st->cr();
}
-@@ -2342,19 +2569,29 @@
+@@ -2378,19 +2605,29 @@
static volatile jint pending_signals[NSIG+1] = { 0 };
// Bsd(POSIX) specific hand shaking semaphore.
@@ -5744,7 +5650,7 @@
}
static int check_pending_signals(bool wait) {
-@@ -2376,7 +2613,7 @@
+@@ -2412,7 +2649,7 @@
do {
thread->set_suspend_equivalent();
// cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
@@ -5753,7 +5659,7 @@
// were we externally suspended while we were waiting?
threadIsSuspended = thread->handle_special_suspend_equivalent_condition();
-@@ -2387,7 +2624,7 @@
+@@ -2423,7 +2660,7 @@
// while suspended because that would surprise the thread that
// suspended us.
//
@@ -5762,7 +5668,7 @@
thread->java_suspend_self();
}
-@@ -2431,10 +2668,10 @@
+@@ -2467,10 +2704,10 @@
return;
}
@@ -5775,7 +5681,7 @@
os::get_temp_directory(), os::current_process_id(), num);
unlink(buf);
-@@ -2460,11 +2697,17 @@
+@@ -2496,6 +2733,10 @@
// problem.
bool os::commit_memory(char* addr, size_t size, bool exec) {
int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
@@ -5785,7 +5691,11 @@
+#else
uintptr_t res = (uintptr_t) ::mmap(addr, size, prot,
MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
- return res != (uintptr_t) MAP_FAILED;
+ if (res != (uintptr_t) MAP_FAILED) {
+@@ -2505,8 +2746,10 @@
+ return true;
+ }
+ return false;
+#endif
}
@@ -5793,7 +5703,7 @@
// Define MAP_HUGETLB here so we can build HotSpot on old systems.
#ifndef MAP_HUGETLB
#define MAP_HUGETLB 0x40000
-@@ -2474,9 +2717,11 @@
+@@ -2516,9 +2759,11 @@
#ifndef MADV_HUGEPAGE
#define MADV_HUGEPAGE 14
#endif
@@ -5805,13 +5715,15 @@
if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
uintptr_t res =
-@@ -2485,16 +2730,19 @@
- -1, 0);
- return res != (uintptr_t) MAP_FAILED;
+@@ -2533,6 +2778,7 @@
+ }
+ // Fall through and try to use small pages
}
+#endif
- return commit_memory(addr, size, exec);
+ if (commit_memory(addr, size, exec)) {
+ realign_memory(addr, size, alignment_hint);
+@@ -2542,11 +2788,13 @@
}
void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -5825,7 +5737,7 @@
}
void os::free_memory(char *addr, size_t bytes) {
-@@ -2502,36 +2750,27 @@
+@@ -2554,36 +2802,27 @@
}
void os::numa_make_global(char *addr, size_t bytes) {
@@ -5867,15 +5779,26 @@
}
bool os::get_page_info(char *start, page_info* info) {
-@@ -2542,6 +2781,7 @@
+@@ -2594,7 +2833,7 @@
return end;
}
+-
+#ifndef _ALLBSD_SOURCE
- // Something to do with the numa-aware allocator needs these symbols
- extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { }
- extern "C" JNIEXPORT void numa_error(char *where) { }
-@@ -2645,98 +2885,26 @@
+ int os::Bsd::sched_getcpu_syscall(void) {
+ unsigned int cpu;
+ int retval = -1;
+@@ -2610,7 +2849,8 @@
+ # define __NR_vgetcpu 2
+ # define VSYSCALL_START (-10UL << 20)
+ # define VSYSCALL_SIZE 1024
+-# define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr))
++# define VSYSCALL_ADDR(vsyscall_nr)
++(VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr))
+ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache);
+ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu);
+ retval = vgetcpu(&cpu, NULL, NULL);
+@@ -2726,98 +2966,26 @@
os::Bsd::numa_tonode_memory_func_t os::Bsd::_numa_tonode_memory;
os::Bsd::numa_interleave_memory_func_t os::Bsd::_numa_interleave_memory;
unsigned long* os::Bsd::_numa_all_nodes;
@@ -5981,7 +5904,7 @@
return os::uncommit_memory(addr, size);
}
-@@ -2838,6 +3006,7 @@
+@@ -2919,6 +3087,7 @@
bool os::Bsd::hugetlbfs_sanity_check(bool warn, size_t page_size) {
bool result = false;
@@ -5989,7 +5912,7 @@
void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE,
MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
-1, 0);
-@@ -2869,6 +3038,7 @@
+@@ -2950,6 +3119,7 @@
if (warn) {
warning("HugeTLBFS is not supported by the operating system.");
}
@@ -5997,7 +5920,7 @@
return result;
}
-@@ -2915,6 +3085,7 @@
+@@ -2996,6 +3166,7 @@
static size_t _large_page_size = 0;
void os::large_page_init() {
@@ -6005,7 +5928,7 @@
if (!UseLargePages) {
UseHugeTLBFS = false;
UseSHM = false;
-@@ -2992,11 +3163,14 @@
+@@ -3073,11 +3244,14 @@
UseLargePages = UseHugeTLBFS || UseSHM;
set_coredump_filter();
@@ -6020,7 +5943,7 @@
char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
// "exec" is passed in but not used. Creating the shared image for
-@@ -3014,7 +3188,11 @@
+@@ -3095,7 +3269,11 @@
// Create a large shared memory region to attach to based on size.
// Currently, size is the total size of the heap
@@ -6032,7 +5955,7 @@
if (shmid == -1) {
// Possible reasons for shmget failure:
// 1. shmmax is too small for Java heap.
-@@ -3167,7 +3345,7 @@
+@@ -3252,7 +3430,7 @@
}
size_t os::read(int fd, void *buf, unsigned int nBytes) {
@@ -6041,7 +5964,7 @@
}
// TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation.
-@@ -3303,6 +3481,44 @@
+@@ -3388,6 +3566,44 @@
// this reason, the code should not be used as default (ThreadPriorityPolicy=0).
// It is only used when ThreadPriorityPolicy=1 and requires root privilege.
@@ -6086,7 +6009,7 @@
int os::java_to_os_priority[MaxPriority + 1] = {
19, // 0 Entry should never be used
-@@ -3320,6 +3536,7 @@
+@@ -3405,6 +3621,7 @@
-5 // 10 MaxPriority
};
@@ -6094,7 +6017,7 @@
static int prio_init() {
if (ThreadPriorityPolicy == 1) {
-@@ -3339,8 +3556,28 @@
+@@ -3424,8 +3641,28 @@
OSReturn os::set_native_priority(Thread* thread, int newpri) {
if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK;
@@ -6123,7 +6046,7 @@
}
OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
-@@ -3350,7 +3587,17 @@
+@@ -3435,7 +3672,17 @@
}
errno = 0;
@@ -6141,7 +6064,7 @@
return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
}
-@@ -3460,7 +3707,7 @@
+@@ -3545,7 +3792,7 @@
/* Get signal number to use for suspend/resume */
if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
int sig = ::strtol(s, 0, 10);
@@ -6150,7 +6073,7 @@
SR_signum = sig;
}
}
-@@ -3804,6 +4051,28 @@
+@@ -3889,6 +4136,28 @@
set_signal_handler(SIGFPE, true);
set_signal_handler(SIGXFSZ, true);
@@ -6179,7 +6102,7 @@
if (libjsig_is_loaded) {
// Tell libjsig jvm finishes setting signal handlers
(*end_signal_setting)();
-@@ -3824,6 +4093,7 @@
+@@ -3909,6 +4178,7 @@
}
}
@@ -6187,7 +6110,7 @@
// This is the fastest way to get thread cpu time on Bsd.
// Returns cpu time (user+sys) for any thread, not only for current.
// POSIX compliant clocks are implemented in the kernels 2.6.16+.
-@@ -3838,6 +4108,7 @@
+@@ -3923,6 +4193,7 @@
return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
}
@@ -6195,7 +6118,7 @@
/////
// glibc on Bsd platform uses non-documented flag
-@@ -4059,13 +4330,13 @@
+@@ -4144,13 +4415,13 @@
_initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid();
@@ -6211,7 +6134,7 @@
if (Bsd::page_size() == -1) {
fatal(err_msg("os_bsd.cpp: os::init: sysconf failed (%s)",
strerror(errno)));
-@@ -4079,7 +4350,16 @@
+@@ -4164,7 +4435,16 @@
Bsd::clock_init();
initial_time_count = os::elapsed_counter();
@@ -6229,7 +6152,7 @@
}
// To install functions for atexit system call
-@@ -4092,7 +4372,9 @@
+@@ -4177,7 +4457,9 @@
// this is called _after_ the global arguments have been parsed
jint os::init_2(void)
{
@@ -6239,7 +6162,7 @@
// Allocate a single page and mark it as readable for safepoint polling
address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-@@ -4150,6 +4432,7 @@
+@@ -4235,6 +4517,7 @@
JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes,
vm_page_size()));
@@ -6247,7 +6170,7 @@
Bsd::capture_initial_stack(JavaThread::stack_size_at_create());
Bsd::libpthread_init();
-@@ -4189,6 +4472,7 @@
+@@ -4274,6 +4557,7 @@
UseNUMA = true;
}
}
@@ -6255,7 +6178,7 @@
if (MaxFDLimit) {
// set the number of file descriptors to max. print out error
-@@ -4200,6 +4484,14 @@
+@@ -4285,6 +4569,14 @@
perror("os::init_2 getrlimit failed");
} else {
nbr_files.rlim_cur = nbr_files.rlim_max;
@@ -6270,7 +6193,7 @@
status = setrlimit(RLIMIT_NOFILE, &nbr_files);
if (status != 0) {
if (PrintMiscellaneous && (Verbose || WizardMode))
-@@ -4208,8 +4500,10 @@
+@@ -4293,8 +4585,10 @@
}
}
@@ -6281,7 +6204,7 @@
// at-exit methods are called in the reverse order of their registration.
// atexit functions are called on return from main or as a result of a
-@@ -4253,11 +4547,15 @@
+@@ -4347,11 +4641,15 @@
};
int os::active_processor_count() {
@@ -6297,7 +6220,7 @@
}
bool os::distribute_processes(uint length, uint* distribution) {
-@@ -4299,6 +4597,9 @@
+@@ -4393,6 +4691,9 @@
int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
{
@@ -6307,7 +6230,7 @@
if (is_NPTL()) {
return pthread_cond_timedwait(_cond, _mutex, _abstime);
} else {
-@@ -4314,6 +4615,7 @@
+@@ -4408,6 +4709,7 @@
#endif // IA64
return status;
}
@@ -6315,7 +6238,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-@@ -4461,14 +4763,14 @@
+@@ -4555,14 +4857,14 @@
int o_delete = (oflag & O_DELETE);
oflag = oflag & ~O_DELETE;
@@ -6334,7 +6257,7 @@
if (ret != -1) {
if ((st_mode & S_IFMT) == S_IFDIR) {
-@@ -4525,17 +4827,17 @@
+@@ -4619,17 +4921,17 @@
if (!rewrite_existing) {
oflags |= O_EXCL;
}
@@ -6355,7 +6278,7 @@
}
// This code originates from JDK's sysAvailable
-@@ -4544,10 +4846,10 @@
+@@ -4638,10 +4940,10 @@
int os::available(int fd, jlong *bytes) {
jlong cur, end;
int mode;
@@ -6369,7 +6292,7 @@
if (S_ISCHR(mode) || S_ISFIFO(mode) || S_ISSOCK(mode)) {
/*
* XXX: is the following call interruptible? If so, this might
-@@ -4561,11 +4863,11 @@
+@@ -4655,11 +4957,11 @@
}
}
}
@@ -6384,7 +6307,7 @@
return 0;
}
*bytes = end - cur;
-@@ -4573,12 +4875,17 @@
+@@ -4667,12 +4969,17 @@
}
int os::socket_available(int fd, jint *pbytes) {
@@ -6407,7 +6330,7 @@
}
// Map a block of memory.
-@@ -4628,6 +4935,7 @@
+@@ -4722,6 +5029,7 @@
return munmap(addr, bytes) == 0;
}
@@ -6415,7 +6338,7 @@
static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
static clockid_t thread_cpu_clockid(Thread* thread) {
-@@ -4639,6 +4947,7 @@
+@@ -4733,6 +5041,7 @@
assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
return clockid;
}
@@ -6423,7 +6346,7 @@
// current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
// are used by JVM M&M and JVMTI to get user+sys or user CPU time
-@@ -4648,39 +4957,71 @@
+@@ -4742,39 +5051,71 @@
// the fast estimate available on the platform.
jlong os::current_thread_cpu_time() {
@@ -6495,7 +6418,7 @@
//
// -1 on error.
//
-@@ -4770,6 +5111,7 @@
+@@ -4864,6 +5205,7 @@
return (jlong)user_time * (1000000000 / clock_tics_per_sec);
}
}
@@ -6503,7 +6426,7 @@
void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits
-@@ -4786,7 +5128,13 @@
+@@ -4880,7 +5222,13 @@
}
bool os::is_thread_cpu_time_supported() {
@@ -6517,7 +6440,7 @@
}
// System loadavg support. Returns -1 if load average cannot be obtained.
-@@ -4881,7 +5229,7 @@
+@@ -4975,7 +5323,7 @@
// abstime will be the absolute timeout time
// TODO: replace compute_abstime() with unpackTime()
@@ -6526,7 +6449,7 @@
if (millis < 0) millis = 0;
struct timeval now;
int status = gettimeofday(&now, NULL);
-@@ -4933,7 +5281,7 @@
+@@ -5027,7 +5375,7 @@
status = pthread_cond_wait(_cond, _mutex);
// for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
// Treat this the same as if the wait was interrupted
@@ -6535,7 +6458,7 @@
assert_status(status == 0 || status == EINTR, status, "cond_wait");
}
-- _nParked ;
-@@ -4991,10 +5339,10 @@
+@@ -5085,10 +5433,10 @@
pthread_cond_init (_cond, NULL) ;
}
assert_status(status == 0 || status == EINTR ||
@@ -6548,7 +6471,7 @@
// We consume and ignore EINTR and spurious wakeups.
}
--_nParked ;
-@@ -5086,7 +5434,7 @@
+@@ -5180,7 +5528,7 @@
* years from "now".
*/
@@ -6557,7 +6480,7 @@
assert (time > 0, "convertTime");
struct timeval now;
-@@ -5146,7 +5494,7 @@
+@@ -5240,7 +5588,7 @@
}
// Next, demultiplex/decode time arguments
@@ -6566,7 +6489,7 @@
if (time < 0 || (isAbsolute && time == 0) ) { // don't wait at all
return;
}
-@@ -5200,7 +5548,7 @@
+@@ -5294,7 +5642,7 @@
}
}
assert_status(status == 0 || status == EINTR ||
@@ -6575,7 +6498,7 @@
status, "cond_timedwait");
#ifdef ASSERT
-@@ -5243,14 +5591,12 @@
+@@ -5337,14 +5685,12 @@
}
@@ -6595,7 +6518,7 @@
#endif
// Run the specified command in a separate process. Return its exit value,
-@@ -5265,8 +5611,7 @@
+@@ -5359,8 +5705,7 @@
// separate process to execve. Make a direct syscall to fork process.
// On IA64 there's no fork syscall, we have to use fork() and hope for
// the best...
@@ -6605,7 +6528,7 @@
if (pid < 0) {
// fork failed
-@@ -5282,8 +5627,7 @@
+@@ -5376,8 +5721,7 @@
// in the new process, so make a system call directly.
// IA64 should use normal execve() from glibc to match the glibc fork()
// above.
@@ -6615,8 +6538,8 @@
// execve failed
_exit(-1);
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2011-05-07 21:53:43.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2012-03-03 19:50:46.000000000 -0800
@@ -30,6 +30,12 @@
/* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
@@ -6756,7 +6679,7 @@
// Stack repair handling
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -94,7 +94,15 @@
@@ -6818,7 +6741,7 @@
}
inline int os::recvfrom(int fd, char *buf, int nBytes, int flags,
---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -248,7 +248,7 @@
@@ -6829,8 +6752,8 @@
struct passwd* p;
int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p);
---- ./hotspot/src/os/linux/vm/os_linux.cpp 2011-06-27 09:11:14.000000000 -0700
-+++ ./hotspot/src/os/linux/vm/os_linux.cpp 2011-05-20 20:03:59.000000000 -0700
+--- ./hotspot/src/os/linux/vm/os_linux.cpp 2011-11-17 21:37:12.000000000 -0800
++++ ./hotspot/src/os/linux/vm/os_linux.cpp 2012-02-26 13:59:19.000000000 -0800
@@ -22,8 +22,6 @@
*
*/
@@ -6840,8 +6763,8 @@
// no precompiled headers
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
---- ./hotspot/src/os/posix/launcher/java_md.c 2011-06-27 09:11:16.000000000 -0700
-+++ ./hotspot/src/os/posix/launcher/java_md.c 2011-04-22 22:28:34.000000000 -0700
+--- ./hotspot/src/os/posix/launcher/java_md.c 2011-11-17 21:37:12.000000000 -0800
++++ ./hotspot/src/os/posix/launcher/java_md.c 2011-07-07 19:49:18.000000000 -0700
@@ -41,14 +41,21 @@
#include "version_comp.h"
#endif
@@ -6882,7 +6805,7 @@
if((getgid() != getegid()) || (getuid() != geteuid()) ) {
return;
}
-+#elif _ALLBSD_SOURCE
++#elif defined(_ALLBSD_SOURCE)
+ /*
+ * On BSD, if a binary is running as sgid or suid, libc sets
+ * LD_LIBRARY_PATH to the empty string for security purposes. (In
@@ -6995,7 +6918,7 @@
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./hotspot/src/os/posix/launcher/launcher.script 2011-06-27 09:11:16.000000000 -0700
+--- ./hotspot/src/os/posix/launcher/launcher.script 2011-11-17 21:37:12.000000000 -0800
+++ ./hotspot/src/os/posix/launcher/launcher.script 2011-04-22 22:28:34.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/bash
@@ -7003,7 +6926,7 @@
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
---- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,48 +0,0 @@
-/*
@@ -7054,7 +6977,7 @@
-// Use software breakpoint trap until we figure out how to do this on Bsd
-void MacroAssembler::get_psr_trap() { trap(SP_TRAP_SBPT); }
-void MacroAssembler::set_psr_trap() { trap(SP_TRAP_SBPT); }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,218 +0,0 @@
-/*
@@ -7275,7 +7198,7 @@
-}
-
-#endif // OS_CPU_BSD_SPARC_VM_ATOMIC_BSD_SPARC_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-//
@@ -7305,7 +7228,7 @@
-//
-
-// SPARC Bsd Architecture Description File
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800
@@ -1,105 +0,0 @@
-#
@@ -7413,7 +7336,7 @@
- ta 0x03
- retl
- mov %fp, %o0
---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,41 +0,0 @@
-/*
@@ -7457,7 +7380,7 @@
-define_pd_global(bool, UseVectoredExceptions, false);
-
-#endif // OS_CPU_BSD_SPARC_VM_GLOBALS_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,110 +0,0 @@
-/*
@@ -7570,7 +7493,7 @@
-inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); }
-
-#endif // OS_CPU_BSD_SPARC_VM_ORDERACCESS_BSD_SPARC_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,758 +0,0 @@
-/*
@@ -8331,7 +8254,7 @@
- // guard page, only enable glibc guard page for non-Java threads.
- return (thr_type == java_thread ? 0 : page_size());
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,49 +0,0 @@
-/*
@@ -8383,7 +8306,7 @@
- static bool register_code_area(char *low, char *high) { return true; }
-
-#endif // OS_CPU_BSD_SPARC_VM_OS_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,47 +0,0 @@
-/*
@@ -8433,7 +8356,7 @@
-#endif
-
-#endif // OS_CPU_BSD_SPARC_VM_PREFETCH_BSD_SPARC_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,38 +0,0 @@
-/*
@@ -8474,7 +8397,7 @@
-void ThreadLocalStorage::pd_set_thread(Thread* thread) {
- os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,33 +0,0 @@
-/*
@@ -8510,7 +8433,7 @@
- }
-
-#endif // OS_CPU_BSD_SPARC_VM_THREADLS_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,111 +0,0 @@
-/*
@@ -8624,7 +8547,7 @@
-
-void JavaThread::cache_global_variables() { }
-
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,103 +0,0 @@
-/*
@@ -8730,7 +8653,7 @@
- static void disable_register_stack_guard() {}
-
-#endif // OS_CPU_BSD_SPARC_VM_THREAD_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,74 +0,0 @@
-/*
@@ -8807,7 +8730,7 @@
- last_entry()
-
-#endif // OS_CPU_BSD_SPARC_VM_VMSTRUCTS_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,62 +0,0 @@
-/*
@@ -8872,7 +8795,7 @@
-
- return features;
-}
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2011-04-22 22:28:34.000000000 -0700
@@ -21,6 +21,17 @@
# questions.
@@ -9076,7 +8999,7 @@
# 8(%esp) : return PC
pushl %ebx # 4(%esp) : old %ebx
pushl %edi # 0(%esp) : old %edi
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-04-22 22:28:34.000000000 -0700
@@ -21,6 +21,14 @@
# questions.
@@ -9225,7 +9148,7 @@
cmpq %rdi,%rsi
leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8
jbe acl_CopyRight
---- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -25,7 +25,33 @@
#ifndef OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
@@ -9261,7 +9184,7 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
---- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -25,9 +25,10 @@
#ifndef OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
@@ -9290,7 +9213,7 @@
// Only used on 64 bit Windows platforms
define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2011-06-27 23:25:37.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -78,23 +78,202 @@
# include <sys/wait.h>
@@ -9891,10 +9814,10 @@
#endif // AMD64
st->cr();
---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
-@@ -30,8 +30,10 @@
- #ifndef AMD64
+--- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2012-03-03 21:41:06.000000000 -0800
+@@ -31,8 +31,10 @@
+
// map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp
#define SP_BITLENGTH 32
+#ifndef PAGE_SHIFT
@@ -9902,9 +9825,9 @@
#define PAGE_SIZE (1UL << PAGE_SHIFT)
+#endif
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
- #endif // !AMD64
---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2011-06-27 23:25:37.000000000 -0700
+ public:
+--- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2012-03-04 16:33:48.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -34,7 +34,7 @@
/******************************/ \
@@ -9915,765 +9838,97 @@
nonstatic_field(OSThread, _pthread_id, pthread_t) \
/* This must be the last entry, and must be present */ \
last_entry()
---- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
-@@ -31,136 +31,455 @@
- #include "runtime/os.hpp"
- #include "vm_version_zero.hpp"
-
--// Implementation of class atomic
--
--#ifdef M68K
-+#include <sys/types.h>
-+#ifdef __NetBSD__
-+#include <sys/atomic.h>
-+#elif __FreeBSD__
-+
-+#include <sys/types.h>
-+#ifndef SPARC
-+#include <machine/atomic.h>
-+#else
-
- /*
-- * __m68k_cmpxchg
-+ * On FreeBSD/sparc64, <machine/atomic.h> pulls in <machine/cpufunc.h>
-+ * which includes definitions which cause conflicts with various
-+ * definitions within HotSpot source. To avoid that, pull in those
-+ * definitions verbatim instead of including the header. Yuck.
-+ */
-+
-+/*-
-+ * Copyright (c) 1998 Doug Rabson.
-+ * Copyright (c) 2001 Jake Burkholder.
-+ * All rights reserved.
- *
-- * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
-- * Returns newval on success and oldval if no exchange happened.
-- * This implementation is processor specific and works on
-- * 68020 68030 68040 and 68060.
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
- *
-- * It will not work on ColdFire, 68000 and 68010 since they lack the CAS
-- * instruction.
-- * Using a kernelhelper would be better for arch complete implementation.
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
- *
- */
-
--static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr) {
-- int ret;
-- __asm __volatile ("cas%.l %0,%2,%1"
-- : "=d" (ret), "+m" (*(ptr))
-- : "d" (newval), "0" (oldval));
-- return ret;
--}
--
--/* Perform an atomic compare and swap: if the current value of `*PTR'
-- is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
-- `*PTR' before the operation.*/
--static inline int m68k_compare_and_swap(volatile int *ptr,
-- int oldval,
-- int newval) {
-- for (;;) {
-- int prev = *ptr;
-- if (prev != oldval)
-- return prev;
--
-- if (__m68k_cmpxchg (prev, newval, ptr) == newval)
-- // Success.
-- return prev;
--
-- // We failed even though prev == oldval. Try again.
-- }
--}
--
--/* Atomically add an int to memory. */
--static inline int m68k_add_and_fetch(volatile int *ptr, int add_value) {
-- for (;;) {
-- // Loop until success.
--
-- int prev = *ptr;
--
-- if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value)
-- return prev + add_value;
-- }
--}
--
--/* Atomically write VALUE into `*PTR' and returns the previous
-- contents of `*PTR'. */
--static inline int m68k_lock_test_and_set(volatile int *ptr, int newval) {
-- for (;;) {
-- // Loop until success.
-- int prev = *ptr;
--
-- if (__m68k_cmpxchg (prev, newval, ptr) == prev)
-- return prev;
-- }
--}
--#endif // M68K
-+#include <machine/asi.h>
+--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2012-02-12 13:05:32.000000000 -0800
+@@ -163,10 +163,16 @@
+ #endif // ARM
--#ifdef ARM
-+/*
-+ * Membar operand macros for use in other macros when # is a special
-+ * character. Keep these in sync with what the hardware expects.
-+ */
-+#define M_LoadLoad (0)
-+#define M_StoreLoad (1)
-+#define M_LoadStore (2)
-+#define M_StoreStore (3)
-+
-+#define CMASK_SHIFT (4)
-+#define MMASK_SHIFT (0)
-+
-+#define CMASK_GEN(bit) ((1 << (bit)) << CMASK_SHIFT)
-+#define MMASK_GEN(bit) ((1 << (bit)) << MMASK_SHIFT)
-+
-+#define LoadLoad MMASK_GEN(M_LoadLoad)
-+#define StoreLoad MMASK_GEN(M_StoreLoad)
-+#define LoadStore MMASK_GEN(M_LoadStore)
-+#define StoreStore MMASK_GEN(M_StoreStore)
-+
-+#define casa(rs1, rs2, rd, asi) ({ \
-+ u_int __rd = (uint32_t)(rd); \
-+ __asm __volatile("casa [%2] %3, %4, %0" \
-+ : "+r" (__rd), "=m" (*rs1) \
-+ : "r" (rs1), "n" (asi), "r" (rs2), "m" (*rs1)); \
-+ __rd; \
-+})
-+
-+#define casxa(rs1, rs2, rd, asi) ({ \
-+ u_long __rd = (uint64_t)(rd); \
-+ __asm __volatile("casxa [%2] %3, %4, %0" \
-+ : "+r" (__rd), "=m" (*rs1) \
-+ : "r" (rs1), "n" (asi), "r" (rs2), "m" (*rs1)); \
-+ __rd; \
-+})
-+
-+#define membar(mask) do { \
-+ __asm __volatile("membar %0" : : "n" (mask) : "memory"); \
-+} while (0)
-+
-+#ifdef _KERNEL
-+#define __ASI_ATOMIC ASI_N
-+#else
-+#define __ASI_ATOMIC ASI_P
+ inline void Atomic::store(jint store_value, volatile jint* dest) {
++#if !defined(ARM) && !defined(M68K)
++ __sync_synchronize();
+#endif
-+
-+#define mb() __asm__ __volatile__ ("membar #MemIssue": : :"memory")
-+#define wmb() mb()
-+#define rmb() mb()
-
- /*
-- * __kernel_cmpxchg
-+ * Various simple arithmetic on memory which is atomic in the presence
-+ * of interrupts and multiple processors. See atomic(9) for details.
-+ * Note that efficient hardware support exists only for the 32 and 64
-+ * bit variants; the 8 and 16 bit versions are not provided and should
-+ * not be used in MI code.
- *
-- * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
-- * Return zero if *ptr was changed or non-zero if no exchange happened.
-- * The C flag is also set if *ptr was changed to allow for assembly
-- * optimization in the calling code.
-+ * This implementation takes advantage of the fact that the sparc64
-+ * cas instruction is both a load and a store. The loop is often coded
-+ * as follows:
- *
-+ * do {
-+ * expect = *p;
-+ * new = expect + 1;
-+ * } while (cas(p, expect, new) != expect);
-+ *
-+ * which performs an unnnecessary load on each iteration that the cas
-+ * operation fails. Modified as follows:
-+ *
-+ * expect = *p;
-+ * for (;;) {
-+ * new = expect + 1;
-+ * result = cas(p, expect, new);
-+ * if (result == expect)
-+ * break;
-+ * expect = result;
-+ * }
-+ *
-+ * the return value of cas is used to avoid the extra reload.
-+ *
-+ * The memory barriers provided by the acq and rel variants are intended
-+ * to be sufficient for use of relaxed memory ordering. Due to the
-+ * suggested assembly syntax of the membar operands containing a #
-+ * character, they cannot be used in macros. The cmask and mmask bits
-+ * are hard coded in machine/cpufunc.h and used here through macros.
-+ * Hopefully sun will choose not to change the bit numbers.
- */
-
--typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
--#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
-+#define itype(sz) uint ## sz ## _t
-
-+#define atomic_cas_32(p, e, s) casa(p, e, s, __ASI_ATOMIC)
-+#define atomic_cas_64(p, e, s) casxa(p, e, s, __ASI_ATOMIC)
-
-+#define atomic_cas(p, e, s, sz) \
-+ atomic_cas_ ## sz(p, e, s)
-
--/* Perform an atomic compare and swap: if the current value of `*PTR'
-- is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
-- `*PTR' before the operation.*/
--static inline int arm_compare_and_swap(volatile int *ptr,
-- int oldval,
-- int newval) {
-- for (;;) {
-- int prev = *ptr;
-- if (prev != oldval)
-- return prev;
-+#define atomic_cas_acq(p, e, s, sz) ({ \
-+ itype(sz) v; \
-+ v = atomic_cas(p, e, s, sz); \
-+ membar(LoadLoad | LoadStore); \
-+ v; \
-+})
-+
-+#define atomic_cas_rel(p, e, s, sz) ({ \
-+ itype(sz) v; \
-+ membar(LoadStore | StoreStore); \
-+ v = atomic_cas(p, e, s, sz); \
-+ v; \
-+})
-+
-+#define atomic_op(p, op, v, sz) ({ \
-+ itype(sz) e, r, s; \
-+ for (e = *(volatile itype(sz) *)p;; e = r) { \
-+ s = e op v; \
-+ r = atomic_cas_ ## sz(p, e, s); \
-+ if (r == e) \
-+ break; \
-+ } \
-+ e; \
-+})
-+
-+#define atomic_op_acq(p, op, v, sz) ({ \
-+ itype(sz) t; \
-+ t = atomic_op(p, op, v, sz); \
-+ membar(LoadLoad | LoadStore); \
-+ t; \
-+})
-+
-+#define atomic_op_rel(p, op, v, sz) ({ \
-+ itype(sz) t; \
-+ membar(LoadStore | StoreStore); \
-+ t = atomic_op(p, op, v, sz); \
-+ t; \
-+})
-+
-+#define atomic_load(p, sz) \
-+ atomic_cas(p, 0, 0, sz)
-+
-+#define atomic_load_acq(p, sz) ({ \
-+ itype(sz) v; \
-+ v = atomic_load(p, sz); \
-+ membar(LoadLoad | LoadStore); \
-+ v; \
-+})
-+
-+#define atomic_load_clear(p, sz) ({ \
-+ itype(sz) e, r; \
-+ for (e = *(volatile itype(sz) *)p;; e = r) { \
-+ r = atomic_cas(p, e, 0, sz); \
-+ if (r == e) \
-+ break; \
-+ } \
-+ e; \
-+})
-+
-+#define atomic_store(p, v, sz) do { \
-+ itype(sz) e, r; \
-+ for (e = *(volatile itype(sz) *)p;; e = r) { \
-+ r = atomic_cas(p, e, v, sz); \
-+ if (r == e) \
-+ break; \
-+ } \
-+} while (0)
-+
-+#define atomic_store_rel(p, v, sz) do { \
-+ membar(LoadStore | StoreStore); \
-+ atomic_store(p, v, sz); \
-+} while (0)
-+
-+#define ATOMIC_GEN(name, ptype, vtype, atype, sz) \
-+ \
-+static __inline vtype \
-+atomic_add_ ## name(volatile ptype p, atype v) \
-+{ \
-+ return ((vtype)atomic_op(p, +, v, sz)); \
-+} \
-+static __inline vtype \
-+atomic_add_acq_ ## name(volatile ptype p, atype v) \
-+{ \
-+ return ((vtype)atomic_op_acq(p, +, v, sz)); \
-+} \
-+static __inline vtype \
-+atomic_add_rel_ ## name(volatile ptype p, atype v) \
-+{ \
-+ return ((vtype)atomic_op_rel(p, +, v, sz)); \
-+} \
-+ \
-+static __inline int \
-+atomic_cmpset_ ## name(volatile ptype p, vtype e, vtype s) \
-+{ \
-+ return (((vtype)atomic_cas(p, e, s, sz)) == e); \
-+} \
-+static __inline int \
-+atomic_cmpset_acq_ ## name(volatile ptype p, vtype e, vtype s) \
-+{ \
-+ return (((vtype)atomic_cas_acq(p, e, s, sz)) == e); \
-+} \
-+static __inline int \
-+atomic_cmpset_rel_ ## name(volatile ptype p, vtype e, vtype s) \
-+{ \
-+ return (((vtype)atomic_cas_rel(p, e, s, sz)) == e); \
-+} \
-+ \
-+static __inline vtype \
-+atomic_load_ ## name(volatile ptype p) \
-+{ \
-+ return ((vtype)atomic_cas(p, 0, 0, sz)); \
-+} \
-+static __inline vtype \
-+atomic_load_acq_ ## name(volatile ptype p) \
-+{ \
-+ return ((vtype)atomic_cas_acq(p, 0, 0, sz)); \
-+} \
-+ \
-+static __inline void \
-+atomic_store_ ## name(volatile ptype p, vtype v) \
-+{ \
-+ atomic_store(p, v, sz); \
-+} \
-+static __inline void \
-+atomic_store_rel_ ## name(volatile ptype p, vtype v) \
-+{ \
-+ atomic_store_rel(p, v, sz); \
-+}
-
-- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
-- // Success.
-- return prev;
-+inline jlong Atomic::load(volatile jlong* src) {
-+ volatile jlong dest;
-+ os::atomic_copy64(src, &dest);
-+ return dest;
-+}
-
-- // We failed even though prev == oldval. Try again.
-- }
-+inline void Atomic::store(jlong store_value, jlong* dest) {
-+ os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
+ *dest = store_value;
}
--/* Atomically add an int to memory. */
--static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
-- for (;;) {
-- // Loop until a __kernel_cmpxchg succeeds.
-+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
-+ os::atomic_copy64((volatile jlong*)&store_value, dest);
-+}
-
-- int prev = *ptr;
-+ATOMIC_GEN(int, u_int *, u_int, u_int, 32);
-+ATOMIC_GEN(32, uint32_t *, uint32_t, uint32_t, 32);
-
-- if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
-- return prev + add_value;
-- }
--}
-+ATOMIC_GEN(long, u_long *, u_long, u_long, 64);
-+ATOMIC_GEN(64, uint64_t *, uint64_t, uint64_t, 64);
-
--/* Atomically write VALUE into `*PTR' and returns the previous
-- contents of `*PTR'. */
--static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
-- for (;;) {
-- // Loop until a __kernel_cmpxchg succeeds.
-- int prev = *ptr;
-+ATOMIC_GEN(ptr, uintptr_t *, uintptr_t, uintptr_t, 64);
-
-- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
-- return prev;
-- }
-+#define atomic_fetchadd_int atomic_add_int
-+#define atomic_fetchadd_32 atomic_add_32
-+#define atomic_fetchadd_long atomic_add_long
-+
-+#undef ATOMIC_GEN
-+#undef atomic_cas
-+#undef atomic_cas_acq
-+#undef atomic_cas_rel
-+#undef atomic_op
-+#undef atomic_op_acq
-+#undef atomic_op_rel
-+#undef atomic_load_acq
-+#undef atomic_store_rel
-+#undef atomic_load_clear
-+#endif
-+
-+static __inline __attribute__((__always_inline__))
-+unsigned int atomic_add_int_nv(volatile unsigned int* dest, unsigned int add_value)
-+{
-+ atomic_add_acq_int(dest, add_value);
-+ return *dest;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+uintptr_t atomic_add_ptr_nv(volatile intptr_t* dest, intptr_t add_value)
-+{
-+ atomic_add_acq_ptr((volatile uintptr_t*) dest, (uintptr_t) add_value);
-+ return *((volatile uintptr_t*) dest);
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+unsigned int
-+atomic_swap_uint(volatile unsigned int *dest, unsigned int exchange_value)
-+{
-+ jint prev = *dest;
-+ atomic_store_rel_int(dest, exchange_value);
-+ return prev;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+void *
-+atomic_swap_ptr(volatile void *dest, void *exchange_value)
-+{
-+ void *prev = *(void **)dest;
-+ atomic_store_rel_ptr((volatile uintptr_t*) dest, (uintptr_t) exchange_value);
-+ return prev;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+unsigned int
-+atomic_cas_uint(volatile unsigned int *dest, unsigned int compare_value,
-+ unsigned int exchange_value)
-+{
-+ unsigned int prev = *dest;
-+ atomic_cmpset_acq_int(dest, compare_value, exchange_value);
-+ return prev;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+unsigned long
-+atomic_cas_ulong(volatile unsigned long *dest, unsigned long compare_value,
-+ unsigned long exchange_value)
-+{
-+ unsigned long prev = *dest;
-+ atomic_cmpset_acq_long(dest, compare_value, exchange_value);
-+ return prev;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+void *
-+atomic_cas_ptr(volatile void *dest, void *compare_value, void *exchange_value)
-+{
-+ void *prev = *(void **)dest;
-+ atomic_cmpset_acq_ptr((volatile uintptr_t*) dest, (uintptr_t) compare_value, (uintptr_t) exchange_value);
-+ return prev;
-+}
-+
-+#elif defined(__APPLE__)
-+
-+#include <libkern/OSAtomic.h>
-+
-+static __inline __attribute__((__always_inline__))
-+unsigned int
-+atomic_add_int_nv(volatile unsigned int *target, int delta) {
-+ return (unsigned int) OSAtomicAdd32Barrier(delta, (volatile int32_t *) target);
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+void *
-+atomic_add_ptr_nv(volatile void *target, ssize_t delta) {
-+#ifdef __LP64__
-+ return (void *) OSAtomicAdd64Barrier(delta, (volatile int64_t *) target);
-+#else
-+ return (void *) OSAtomicAdd32Barrier(delta, (volatile int32_t *) target);
-+#endif
-+}
-+
-+
-+static __inline __attribute__((__always_inline__))
-+unsigned int
-+atomic_swap_uint(volatile unsigned int *dest, unsigned int exchange_value)
-+{
-+ /* No xchg support in OSAtomic */
-+ unsigned int prev;
-+ do {
-+ prev = *dest;
-+ } while (!OSAtomicCompareAndSwapIntBarrier((int) prev, (int) exchange_value, (volatile int *) dest));
-+
-+ return prev;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+void *
-+atomic_swap_ptr(volatile void *dest, void *exchange_value)
-+{
-+ /* No xchg support in OSAtomic */
-+ void *prev;
-+ do {
-+ prev = *((void * volatile *) dest);
-+ } while (!OSAtomicCompareAndSwapPtrBarrier(prev, exchange_value, (void * volatile *) dest));
-+
-+ return prev;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+unsigned int
-+atomic_cas_uint(volatile unsigned int *dest, unsigned int compare_value,
-+ unsigned int exchange_value)
-+{
-+ unsigned int prev = *dest;
-+ OSAtomicCompareAndSwapIntBarrier(compare_value, exchange_value, (volatile int *) dest);
-+ return prev;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+unsigned long
-+atomic_cas_ulong(volatile unsigned long *dest, unsigned long compare_value,
-+ unsigned long exchange_value)
-+{
-+ unsigned long prev = *dest;
-+ OSAtomicCompareAndSwapLongBarrier(compare_value, exchange_value, (volatile long *) dest);
-+ return prev;
-+}
-+
-+static __inline __attribute__((__always_inline__))
-+void *
-+atomic_cas_ptr(volatile void *dest, void *compare_value, void *exchange_value)
-+{
-+ void *prev = *(void **)dest;
-+ OSAtomicCompareAndSwapPtrBarrier(compare_value, exchange_value, (void * volatile *) dest);
-+ return prev;
- }
--#endif // ARM
-+
-+
+ inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) {
++#if !defined(ARM) && !defined(M68K)
++ __sync_synchronize();
+#endif
-
- inline void Atomic::store(jint store_value, volatile jint* dest) {
*dest = store_value;
-@@ -171,27 +490,11 @@
}
- inline jint Atomic::add(jint add_value, volatile jint* dest) {
--#ifdef ARM
-- return arm_add_and_fetch(dest, add_value);
--#else
--#ifdef M68K
-- return m68k_add_and_fetch(dest, add_value);
--#else
-- return __sync_add_and_fetch(dest, add_value);
--#endif // M68K
--#endif // ARM
-+ return (jint)atomic_add_int_nv((volatile unsigned int*) dest, add_value);
- }
-
- inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
--#ifdef ARM
-- return arm_add_and_fetch(dest, add_value);
--#else
--#ifdef M68K
-- return m68k_add_and_fetch(dest, add_value);
--#else
-- return __sync_add_and_fetch(dest, add_value);
--#endif // M68K
--#endif // ARM
-+ return (intptr_t)atomic_add_ptr_nv(dest, add_value);
- }
-
- inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
-@@ -223,95 +526,43 @@
- }
-
- inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
--#ifdef ARM
-- return arm_lock_test_and_set(dest, exchange_value);
--#else
--#ifdef M68K
-- return m68k_lock_test_and_set(dest, exchange_value);
--#else
-- // __sync_lock_test_and_set is a bizarrely named atomic exchange
-- // operation. Note that some platforms only support this with the
-- // limitation that the only valid value to store is the immediate
-- // constant 1. There is a test for this in JNI_CreateJavaVM().
-- return __sync_lock_test_and_set (dest, exchange_value);
--#endif // M68K
--#endif // ARM
-+ return (jint)atomic_swap_uint((volatile u_int *)dest, (u_int)exchange_value);
- }
-
- inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
- volatile intptr_t* dest) {
--#ifdef ARM
-- return arm_lock_test_and_set(dest, exchange_value);
--#else
--#ifdef M68K
-- return m68k_lock_test_and_set(dest, exchange_value);
--#else
-- return __sync_lock_test_and_set (dest, exchange_value);
--#endif // M68K
--#endif // ARM
-+ return (intptr_t)atomic_swap_ptr((volatile void *)dest,
-+ (void *)exchange_value);
- }
-
- inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
-- return (void *) xchg_ptr((intptr_t) exchange_value,
-- (volatile intptr_t*) dest);
-+ return atomic_swap_ptr(dest, exchange_value);
- }
-
- inline jint Atomic::cmpxchg(jint exchange_value,
- volatile jint* dest,
- jint compare_value) {
--#ifdef ARM
-- return arm_compare_and_swap(dest, compare_value, exchange_value);
--#else
--#ifdef M68K
-- return m68k_compare_and_swap(dest, compare_value, exchange_value);
--#else
-- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
--#endif // M68K
--#endif // ARM
-+ return atomic_cas_uint((volatile u_int *)dest, compare_value, exchange_value);
- }
-
- inline jlong Atomic::cmpxchg(jlong exchange_value,
- volatile jlong* dest,
- jlong compare_value) {
--
-- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
-+ return atomic_cas_ulong((volatile u_long *)dest, compare_value,
-+ exchange_value);
- }
-
- inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
- volatile intptr_t* dest,
- intptr_t compare_value) {
--#ifdef ARM
-- return arm_compare_and_swap(dest, compare_value, exchange_value);
--#else
--#ifdef M68K
-- return m68k_compare_and_swap(dest, compare_value, exchange_value);
--#else
-- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
--#endif // M68K
--#endif // ARM
-+ return (intptr_t)atomic_cas_ptr((volatile void *)dest, (void *)compare_value,
-+ (void *)exchange_value);
- }
-
- inline void* Atomic::cmpxchg_ptr(void* exchange_value,
- volatile void* dest,
- void* compare_value) {
--
-- return (void *) cmpxchg_ptr((intptr_t) exchange_value,
-- (volatile intptr_t*) dest,
-- (intptr_t) compare_value);
--}
--
--inline jlong Atomic::load(volatile jlong* src) {
-- volatile jlong dest;
-- os::atomic_copy64(src, &dest);
-- return dest;
--}
--
--inline void Atomic::store(jlong store_value, jlong* dest) {
-- os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
--}
--
--inline void Atomic::store(jlong store_value, volatile jlong* dest) {
-- os::atomic_copy64((volatile jlong*)&store_value, dest);
-+ return atomic_cas_ptr((volatile void *)dest, compare_value, exchange_value);
- }
-
- #endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
-@@ -28,18 +28,25 @@
+--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2012-02-12 13:05:32.000000000 -0800
+@@ -28,7 +28,29 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
-#include <byteswap.h>
+#ifdef __APPLE__
-+#include <libkern/OSByteOrder.h>
-+#define bswap16(x) OSSwapInt16(x)
-+#define bswap32(x) OSSwapInt32(x)
-+#define bswap64(x) OSSwapInt64(x)
++# include <libkern/OSByteOrder.h>
+#else
+# include <sys/endian.h>
+#endif
++
++#if defined(__APPLE__)
++# define bswap_16(x) OSSwapInt16(x)
++# define bswap_32(x) OSSwapInt32(x)
++# define bswap_64(x) OSSwapInt64(x)
++#elif defined(__OpenBSD__)
++# define bswap_16(x) swap16(x)
++# define bswap_32(x) swap32(x)
++# define bswap_64(x) swap64(x)
++#elif defined(__NetBSD__)
++# define bswap_16(x) bswap16(x)
++# define bswap_32(x) bswap32(x)
++# define bswap_64(x) bswap64(x)
++#else
++# define bswap_16(x) __bswap16(x)
++# define bswap_32(x) __bswap32(x)
++# define bswap_64(x) __bswap64(x)
++#endif
inline u2 Bytes::swap_u2(u2 x) {
-- return bswap_16(x);
-+ return bswap16(x);
- }
-
- inline u4 Bytes::swap_u4(u4 x) {
-- return bswap_32(x);
-+ return bswap32(x);
- }
-
- inline u8 Bytes::swap_u8(u8 x) {
-- return bswap_64(x);
-+ return bswap64(x);
- }
-
- #endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
-@@ -46,7 +46,12 @@
-
- #else // ARM
-
-+#ifdef __APPLE__
-+#include <libkern/OSAtomic.h>
-+#define FULL_MEM_BARRIER OSMemoryBarrier()
-+#else
- #define FULL_MEM_BARRIER __sync_synchronize()
-+#endif // __APPLE__
+ return bswap_16(x);
+--- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2012-02-12 13:05:32.000000000 -0800
+@@ -50,10 +50,11 @@
#ifdef PPC
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2011-06-27 23:25:37.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2011-04-22 22:28:34.000000000 -0700
-@@ -23,6 +23,10 @@
+-#define READ_MEM_BARRIER __asm __volatile ("isync":::"memory")
+ #ifdef __NO_LWSYNC__
++#define READ_MEM_BARRIER __asm __volatile ("sync":::"memory")
+ #define WRITE_MEM_BARRIER __asm __volatile ("sync":::"memory")
+ #else
++#define READ_MEM_BARRIER __asm __volatile ("lwsync":::"memory")
+ #define WRITE_MEM_BARRIER __asm __volatile ("lwsync":::"memory")
+ #endif
+
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-03-04 16:33:48.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-02-12 13:05:32.000000000 -0800
+@@ -23,6 +23,11 @@
*
*/
+#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__) && !defined(__NetBSD__)
++# include <pthread.h>
+# include <pthread_np.h> /* For pthread_attr_get_np */
+#endif
+
// no precompiled headers
#include "assembler_zero.inline.hpp"
#include "classfile/classLoader.hpp"
-@@ -179,6 +183,7 @@
+@@ -164,7 +169,7 @@
+
+ if (info != NULL && thread != NULL) {
+ // Handle ALL stack overflow variations here
+- if (sig == SIGSEGV) {
++ if (sig == SIGSEGV || sig == SIGBUS) {
+ address addr = (address) info->si_addr;
+
+ // check if fault address is within thread stack
+@@ -179,6 +184,7 @@
thread->disable_stack_red_zone();
ShouldNotCallThis();
}
@@ -10681,7 +9936,7 @@
else {
// Accessing stack address below sp may cause SEGV if
// current thread has MAP_GROWSDOWN stack. This should
-@@ -197,6 +202,7 @@
+@@ -197,6 +203,7 @@
fatal("recursive segv. expanding stack.");
}
}
@@ -10689,7 +9944,30 @@
}
}
-@@ -264,6 +270,7 @@
+@@ -221,7 +228,7 @@
+ // of write protecting the memory serialization page. It write
+ // enables the page immediately after protecting it so we can
+ // just return to retry the write.
+- if (sig == SIGSEGV &&
++ if ((sig == SIGSEGV || sig == SIGBUS) &&
+ os::is_memory_serialize_page(thread, (address) info->si_addr)) {
+ // Block current thread until permission is restored.
+ os::block_on_serialize_page_trap();
+@@ -253,10 +260,10 @@
+ }
+ #endif // !PRODUCT
+
+- const char *fmt = "caught unhandled signal %d";
+- char buf[64];
++ const char *fmt = "caught unhandled signal %d at address %p";
++ char buf[128];
+
+- sprintf(buf, fmt, sig);
++ sprintf(buf, fmt, sig, info->si_addr);
+ fatal(buf);
+ }
+
+@@ -264,6 +271,7 @@
// Nothing to do
}
@@ -10697,7 +9975,7 @@
int os::Bsd::get_fpu_control_word() {
ShouldNotCallThis();
}
-@@ -271,6 +278,7 @@
+@@ -271,6 +279,7 @@
void os::Bsd::set_fpu_control_word(int fpu) {
ShouldNotCallThis();
}
@@ -10705,7 +9983,7 @@
bool os::is_allocatable(size_t bytes) {
#ifdef _LP64
-@@ -315,6 +323,48 @@
+@@ -315,6 +324,48 @@
}
static void current_stack_region(address *bottom, size_t *size) {
@@ -10727,7 +10005,7 @@
+
+ stack_top = (address) ss.ss_sp;
+ stack_bytes = ss.ss_size;
-+ stack_bottom = stacktop - stack_bytes;
++ stack_bottom = stack_top - stack_bytes;
+#elif defined(_ALLBSD_SOURCE)
+ pthread_attr_t attr;
+
@@ -10754,7 +10032,7 @@
pthread_attr_t attr;
int res = pthread_getattr_np(pthread_self(), &attr);
if (res != 0) {
-@@ -326,13 +376,11 @@
+@@ -326,13 +377,11 @@
}
}
@@ -10769,7 +10047,7 @@
// The block of memory returned by pthread_attr_getstack() includes
// guard pages where present. We need to trim these off.
-@@ -374,6 +422,7 @@
+@@ -374,6 +423,7 @@
stack_bottom = stack_top - stack_bytes;
}
@@ -10777,7 +10055,7 @@
assert(os::current_stack_pointer() >= stack_bottom, "should do");
assert(os::current_stack_pointer() < stack_top, "should do");
---- ./hotspot/src/share/vm/adlc/adlc.hpp 2011-06-27 09:12:43.000000000 -0700
+--- ./hotspot/src/share/vm/adlc/adlc.hpp 2011-11-17 21:37:58.000000000 -0800
+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2011-04-22 22:28:35.000000000 -0700
@@ -67,9 +67,9 @@
#endif
@@ -10791,8 +10069,8 @@
// Macros
#define uint32 unsigned int
---- ./hotspot/src/share/vm/c1/c1_globals.hpp 2011-06-27 09:12:53.000000000 -0700
-+++ ./hotspot/src/share/vm/c1/c1_globals.hpp 2011-04-22 22:28:35.000000000 -0700
+--- ./hotspot/src/share/vm/c1/c1_globals.hpp 2011-11-17 21:38:04.000000000 -0800
++++ ./hotspot/src/share/vm/c1/c1_globals.hpp 2012-02-26 13:59:20.000000000 -0800
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "c1_globals_windows.hpp"
@@ -10803,8 +10081,8 @@
//
// Defines all global flags used by the client compiler.
---- ./hotspot/src/share/vm/classfile/classLoader.cpp 2011-06-27 09:13:04.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/classLoader.cpp 2011-04-22 22:28:36.000000000 -0700
+--- ./hotspot/src/share/vm/classfile/classLoader.cpp 2011-11-17 21:38:07.000000000 -0800
++++ ./hotspot/src/share/vm/classfile/classLoader.cpp 2012-02-26 13:59:20.000000000 -0800
@@ -68,6 +68,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
@@ -10815,9 +10093,9 @@
// Entry points in zip.dll for loading zip/jar file entries
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2011-06-27 09:13:05.000000000 -0700
-+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2011-06-27 22:08:04.000000000 -0700
-@@ -56,6 +56,9 @@
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2011-11-17 21:38:07.000000000 -0800
++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2012-02-26 13:59:20.000000000 -0800
+@@ -58,6 +58,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
@@ -10825,9 +10103,9 @@
+# include "thread_bsd.inline.hpp"
+#endif
- static bool find_field(instanceKlass* ik,
- Symbol* name_symbol, Symbol* signature_symbol,
-@@ -1110,7 +1113,7 @@
+ #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \
+ klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum);
+@@ -1145,7 +1148,7 @@
}
nmethod* nm = method->code();
if (WizardMode && nm != NULL) {
@@ -10836,7 +10114,7 @@
}
}
---- ./hotspot/src/share/vm/code/stubs.hpp 2011-06-27 09:13:12.000000000 -0700
+--- ./hotspot/src/share/vm/code/stubs.hpp 2011-11-17 21:38:09.000000000 -0800
+++ ./hotspot/src/share/vm/code/stubs.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10848,7 +10126,7 @@
// The classes in this file provide a simple framework for the
// management of little pieces of machine code - or stubs -
---- ./hotspot/src/share/vm/compiler/disassembler.hpp 2011-06-27 09:13:14.000000000 -0700
+--- ./hotspot/src/share/vm/compiler/disassembler.hpp 2011-11-17 21:38:09.000000000 -0800
+++ ./hotspot/src/share/vm/compiler/disassembler.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10860,7 +10138,7 @@
class decode_env;
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2011-06-27 09:13:15.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2011-11-17 21:38:10.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10872,7 +10150,7 @@
elapsedTimer CMSAdaptiveSizePolicy::_concurrent_timer;
elapsedTimer CMSAdaptiveSizePolicy::_STW_timer;
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2011-06-27 09:13:15.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2011-11-17 21:38:10.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -50,6 +50,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10884,7 +10162,7 @@
//
// ConcurrentMarkSweepPolicy methods
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2011-06-27 09:13:17.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2011-11-17 21:38:10.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10896,7 +10174,7 @@
class ConcurrentMarkSweepGeneration;
class CMSCollector;
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2011-06-27 09:13:18.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2011-11-17 21:38:10.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10908,7 +10186,7 @@
#ifndef PRODUCT
Mutex* FreeBlockDictionary::par_lock() const {
---- ./hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2011-06-27 09:13:21.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2011-11-17 21:38:11.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10920,7 +10198,7 @@
bool DirtyCardQueue::apply_closure(CardTableEntryClosure* cl,
bool consume,
---- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2011-06-27 09:13:24.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2011-11-17 21:38:12.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2011-05-07 21:53:41.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10932,7 +10210,7 @@
G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(MemRegion whole_heap,
int max_covered_regions) :
---- ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2011-06-27 09:13:26.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2011-11-17 21:38:12.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10944,7 +10222,7 @@
PtrQueue::PtrQueue(PtrQueueSet* qset, bool perm, bool active) :
_qset(qset), _buf(NULL), _index(0), _active(active),
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2011-06-27 09:13:31.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2011-11-17 21:38:14.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10956,7 +10234,7 @@
bool
ParMarkBitMap::initialize(MemRegion covered_region)
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2011-06-27 09:13:35.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2011-11-17 21:38:15.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10968,7 +10246,7 @@
// PSVirtualSpace
---- ./hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2011-06-27 09:13:41.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2011-11-17 21:38:16.000000000 -0800
+++ ./hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10980,8 +10258,8 @@
MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) {
---- ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2011-06-27 09:13:42.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2011-04-22 22:28:36.000000000 -0700
+--- ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2011-11-17 21:38:16.000000000 -0800
++++ ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2012-02-26 13:59:20.000000000 -0800
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -10992,8 +10270,8 @@
#ifdef ASSERT
---- ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2011-06-27 09:13:42.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2011-04-22 22:28:36.000000000 -0700
+--- ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2011-11-17 21:38:16.000000000 -0800
++++ ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2012-02-26 13:59:20.000000000 -0800
@@ -43,6 +43,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11004,7 +10282,7 @@
// Inline allocation implementations.
---- ./hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2011-06-27 09:13:42.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2011-11-17 21:38:16.000000000 -0800
+++ ./hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2011-05-20 20:03:59.000000000 -0700
@@ -56,6 +56,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11016,7 +10294,7 @@
// This file contains the platform-independent parts
// of the abstract interpreter and the abstract interpreter generator.
---- ./hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2011-06-27 09:13:43.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2011-11-17 21:38:17.000000000 -0800
+++ ./hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2011-04-23 12:09:38.000000000 -0700
@@ -65,6 +65,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -11031,7 +10309,7 @@
// no precompiled headers
---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2011-06-27 09:13:44.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2011-11-17 21:38:17.000000000 -0800
+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2011-05-27 00:00:43.000000000 -0700
@@ -92,7 +92,7 @@
// the incoming method. We could lose a line of trace output.
@@ -11051,8 +10329,8 @@
if (Verbose) {
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
---- ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-06-27 09:13:46.000000000 -0700
-+++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-06-21 05:38:36.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-11-17 21:38:17.000000000 -0800
++++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2012-02-26 13:59:20.000000000 -0800
@@ -41,6 +41,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11063,8 +10341,8 @@
// The InterpreterRuntime is called by the interpreter for everything
// that cannot/should not be dealt with in assembly and needs C support.
---- ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-06-27 09:13:46.000000000 -0700
-+++ ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-06-27 22:08:04.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-11-17 21:38:17.000000000 -0800
++++ ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2012-02-26 13:59:20.000000000 -0800
@@ -52,6 +52,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11075,7 +10353,7 @@
//------------------------------------------------------------------------------------------------------------------------
// Implementation of FieldAccessInfo
---- ./hotspot/src/share/vm/memory/allocation.cpp 2011-06-27 09:13:49.000000000 -0700
+--- ./hotspot/src/share/vm/memory/allocation.cpp 2011-11-17 21:38:18.000000000 -0800
+++ ./hotspot/src/share/vm/memory/allocation.cpp 2011-05-12 20:54:44.000000000 -0700
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11087,8 +10365,8 @@
void* CHeapObj::operator new(size_t size){
return (void *) AllocateHeap(size, "CHeapObj-new");
---- ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2011-06-27 09:13:51.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2011-05-12 20:54:44.000000000 -0700
+--- ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2011-11-17 21:38:18.000000000 -0800
++++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2012-02-26 13:59:20.000000000 -0800
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11099,8 +10377,8 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
#include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp"
---- ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2011-06-27 09:13:52.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2011-04-22 22:28:36.000000000 -0700
+--- ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2011-11-17 21:38:18.000000000 -0800
++++ ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2012-02-26 13:59:20.000000000 -0800
@@ -48,6 +48,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11111,7 +10389,7 @@
//
// DefNewGeneration functions.
---- ./hotspot/src/share/vm/memory/gcLocker.hpp 2011-06-27 09:13:53.000000000 -0700
+--- ./hotspot/src/share/vm/memory/gcLocker.hpp 2011-11-17 21:38:19.000000000 -0800
+++ ./hotspot/src/share/vm/memory/gcLocker.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -41,6 +41,10 @@
# include "os_windows.inline.hpp"
@@ -11124,7 +10402,7 @@
// The direct lock/unlock calls do not force a collection if an unlock
// decrements the count to zero. Avoid calling these if at all possible.
---- ./hotspot/src/share/vm/memory/genMarkSweep.cpp 2011-06-27 09:13:54.000000000 -0700
+--- ./hotspot/src/share/vm/memory/genMarkSweep.cpp 2011-11-17 21:38:19.000000000 -0800
+++ ./hotspot/src/share/vm/memory/genMarkSweep.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -55,6 +55,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11136,7 +10414,7 @@
void GenMarkSweep::invoke_at_safepoint(int level, ReferenceProcessor* rp,
bool clear_all_softrefs) {
---- ./hotspot/src/share/vm/memory/resourceArea.cpp 2011-06-27 09:13:59.000000000 -0700
+--- ./hotspot/src/share/vm/memory/resourceArea.cpp 2011-11-17 21:38:19.000000000 -0800
+++ ./hotspot/src/share/vm/memory/resourceArea.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11148,8 +10426,8 @@
//------------------------------ResourceMark-----------------------------------
debug_only(int ResourceArea::_warned;) // to suppress multiple warnings
---- ./hotspot/src/share/vm/memory/resourceArea.hpp 2011-06-27 09:13:59.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/resourceArea.hpp 2011-04-22 22:28:36.000000000 -0700
+--- ./hotspot/src/share/vm/memory/resourceArea.hpp 2011-11-17 21:38:19.000000000 -0800
++++ ./hotspot/src/share/vm/memory/resourceArea.hpp 2012-02-26 13:59:20.000000000 -0800
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11160,7 +10438,7 @@
// The resource area holds temporary data structures in the VM.
// The actual allocation areas are thread local. Typical usage:
---- ./hotspot/src/share/vm/memory/space.hpp 2011-06-27 09:14:00.000000000 -0700
+--- ./hotspot/src/share/vm/memory/space.hpp 2011-11-17 21:38:19.000000000 -0800
+++ ./hotspot/src/share/vm/memory/space.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11172,7 +10450,7 @@
// A space is an abstraction for the "storage units" backing
// up the generation abstraction. It includes specific
---- ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2011-06-27 09:14:01.000000000 -0700
+--- ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2011-11-17 21:38:20.000000000 -0800
+++ ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11184,8 +10462,32 @@
// Thread-Local Edens support
---- ./hotspot/src/share/vm/memory/universe.cpp 2011-06-27 09:14:01.000000000 -0700
-+++ ./hotspot/src/share/vm/memory/universe.cpp 2011-04-22 22:28:36.000000000 -0700
+--- ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp 2011-11-17 21:38:20.000000000 -0800
++++ ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp 2012-03-04 14:12:44.000000000 -0800
+@@ -28,6 +28,21 @@
+ #include "gc_implementation/shared/gcUtil.hpp"
+ #include "oops/typeArrayOop.hpp"
+ #include "runtime/perfData.hpp"
++#ifdef TARGET_ARCH_x86
++# include "vm_version_x86.hpp"
++#endif
++#ifdef TARGET_ARCH_sparc
++# include "vm_version_sparc.hpp"
++#endif
++#ifdef TARGET_ARCH_zero
++# include "vm_version_zero.hpp"
++#endif
++#ifdef TARGET_ARCH_arm
++# include "vm_version_arm.hpp"
++#endif
++#ifdef TARGET_ARCH_ppc
++# include "vm_version_ppc.hpp"
++#endif
+
+ class GlobalTLABStats;
+
+--- ./hotspot/src/share/vm/memory/universe.cpp 2011-11-17 21:38:20.000000000 -0800
++++ ./hotspot/src/share/vm/memory/universe.cpp 2012-02-26 13:59:20.000000000 -0800
@@ -89,6 +89,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11196,7 +10498,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
---- ./hotspot/src/share/vm/oops/constantPoolKlass.cpp 2011-06-27 09:14:04.000000000 -0700
+--- ./hotspot/src/share/vm/oops/constantPoolKlass.cpp 2011-11-17 21:38:20.000000000 -0800
+++ ./hotspot/src/share/vm/oops/constantPoolKlass.cpp 2011-06-27 22:08:04.000000000 -0700
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11208,7 +10510,7 @@
#ifndef SERIALGC
#include "gc_implementation/parNew/parOopClosures.inline.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
---- ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2011-06-27 09:14:04.000000000 -0700
+--- ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2011-11-17 21:38:20.000000000 -0800
+++ ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2011-06-27 22:08:04.000000000 -0700
@@ -1355,7 +1355,7 @@
}
@@ -11219,9 +10521,9 @@
ent_size = 8;
idx++; // Long takes two cpool slots
break;
---- ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-06-27 09:14:05.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-06-07 20:02:44.000000000 -0700
-@@ -60,6 +60,9 @@
+--- ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-11-17 21:38:21.000000000 -0800
++++ ./hotspot/src/share/vm/oops/instanceKlass.cpp 2012-02-26 13:59:20.000000000 -0800
+@@ -61,6 +61,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
@@ -11231,7 +10533,7 @@
#ifndef SERIALGC
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
---- ./hotspot/src/share/vm/oops/markOop.cpp 2011-06-27 09:14:08.000000000 -0700
+--- ./hotspot/src/share/vm/oops/markOop.cpp 2011-11-17 21:38:21.000000000 -0800
+++ ./hotspot/src/share/vm/oops/markOop.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11243,7 +10545,7 @@
void markOopDesc::print_on(outputStream* st) const {
---- ./hotspot/src/share/vm/oops/oop.cpp 2011-06-27 09:14:11.000000000 -0700
+--- ./hotspot/src/share/vm/oops/oop.cpp 2011-11-17 21:38:22.000000000 -0800
+++ ./hotspot/src/share/vm/oops/oop.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11255,7 +10557,7 @@
bool always_do_update_barrier = false;
---- ./hotspot/src/share/vm/oops/oopsHierarchy.cpp 2011-06-27 09:14:12.000000000 -0700
+--- ./hotspot/src/share/vm/oops/oopsHierarchy.cpp 2011-11-17 21:38:22.000000000 -0800
+++ ./hotspot/src/share/vm/oops/oopsHierarchy.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11267,7 +10569,7 @@
#ifdef CHECK_UNHANDLED_OOPS
---- ./hotspot/src/share/vm/opto/c2_globals.hpp 2011-06-27 09:14:14.000000000 -0700
+--- ./hotspot/src/share/vm/opto/c2_globals.hpp 2011-11-17 21:38:22.000000000 -0800
+++ ./hotspot/src/share/vm/opto/c2_globals.hpp 2011-05-12 20:54:44.000000000 -0700
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11279,9 +10581,21 @@
//
// Defines all globals flags used by the server compiler.
---- ./hotspot/src/share/vm/prims/forte.cpp 2011-06-27 09:14:30.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/forte.cpp 2011-04-22 22:28:37.000000000 -0700
-@@ -640,6 +640,11 @@
+--- ./hotspot/src/share/vm/opto/connode.cpp 2011-11-17 21:38:23.000000000 -0800
++++ ./hotspot/src/share/vm/opto/connode.cpp 2012-02-12 13:05:33.000000000 -0800
+@@ -716,6 +716,9 @@
+
+ //=============================================================================
+ //------------------------------Value------------------------------------------
++#ifdef IA64
++static double ia64_double_zero = 0.0;
++#endif
+ const Type *ConvF2DNode::Value( PhaseTransform *phase ) const {
+ const Type *t = phase->type( in(1) );
+ if( t == Type::TOP ) return Type::TOP;
+--- ./hotspot/src/share/vm/prims/forte.cpp 2011-11-17 21:38:29.000000000 -0800
++++ ./hotspot/src/share/vm/prims/forte.cpp 2012-02-26 13:59:20.000000000 -0800
+@@ -621,6 +621,11 @@
// Method to let libcollector know about a dynamically loaded function.
// Because it is weakly bound, the calls become NOP's when the library
// isn't present.
@@ -11293,7 +10607,7 @@
void collector_func_load(char* name,
void* null_argument_1,
void* null_argument_2,
-@@ -650,6 +655,7 @@
+@@ -631,6 +636,7 @@
#pragma weak collector_func_load
#define collector_func_load(x0,x1,x2,x3,x4,x5,x6) \
( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),0 : 0 )
@@ -11301,9 +10615,9 @@
#endif // !_WINDOWS
} // end extern "C"
---- ./hotspot/src/share/vm/prims/jni.cpp 2011-06-27 09:14:30.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jni.cpp 2011-05-07 21:53:42.000000000 -0700
-@@ -91,6 +91,10 @@
+--- ./hotspot/src/share/vm/prims/jni.cpp 2011-11-17 21:38:29.000000000 -0800
++++ ./hotspot/src/share/vm/prims/jni.cpp 2012-02-26 13:59:20.000000000 -0800
+@@ -82,6 +82,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
@@ -11314,9 +10628,9 @@
static jint CurrentVersion = JNI_VERSION_1_6;
---- ./hotspot/src/share/vm/prims/jvm.cpp 2011-06-27 09:14:31.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jvm.cpp 2011-04-22 22:28:37.000000000 -0700
-@@ -72,6 +72,9 @@
+--- ./hotspot/src/share/vm/prims/jvm.cpp 2011-11-17 21:38:30.000000000 -0800
++++ ./hotspot/src/share/vm/prims/jvm.cpp 2012-02-26 13:59:20.000000000 -0800
+@@ -73,6 +73,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "jvm_windows.h"
#endif
@@ -11326,9 +10640,9 @@
#include <errno.h>
---- ./hotspot/src/share/vm/prims/jvm.h 2011-06-27 09:14:31.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jvm.h 2011-04-23 12:09:39.000000000 -0700
-@@ -36,6 +36,9 @@
+--- ./hotspot/src/share/vm/prims/jvm.h 2011-11-17 21:38:30.000000000 -0800
++++ ./hotspot/src/share/vm/prims/jvm.h 2012-02-26 13:59:20.000000000 -0800
+@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "jvm_windows.h"
#endif
@@ -11338,8 +10652,8 @@
#ifndef _JAVASOFT_JVM_H_
#define _JAVASOFT_JVM_H_
---- ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2011-06-27 09:14:34.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2011-05-07 21:53:42.000000000 -0700
+--- ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2011-11-17 21:38:31.000000000 -0800
++++ ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2012-02-26 13:59:20.000000000 -0800
@@ -68,6 +68,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11350,7 +10664,7 @@
---- ./hotspot/src/share/vm/prims/jvmtiImpl.cpp 2011-06-27 09:14:37.000000000 -0700
+--- ./hotspot/src/share/vm/prims/jvmtiImpl.cpp 2011-11-17 21:38:33.000000000 -0800
+++ ./hotspot/src/share/vm/prims/jvmtiImpl.cpp 2011-05-12 20:54:44.000000000 -0700
@@ -54,6 +54,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11362,7 +10676,7 @@
//
// class JvmtiAgentThread
---- ./hotspot/src/share/vm/prims/nativeLookup.cpp 2011-06-27 09:14:41.000000000 -0700
+--- ./hotspot/src/share/vm/prims/nativeLookup.cpp 2011-11-17 21:38:35.000000000 -0800
+++ ./hotspot/src/share/vm/prims/nativeLookup.cpp 2011-04-23 12:09:39.000000000 -0700
@@ -49,6 +49,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11374,9 +10688,9 @@
static void mangle_name_on(outputStream* st, Symbol* name, int begin, int end) {
---- ./hotspot/src/share/vm/runtime/arguments.cpp 2011-06-27 09:14:43.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/arguments.cpp 2011-05-12 20:54:44.000000000 -0700
-@@ -55,6 +55,9 @@
+--- ./hotspot/src/share/vm/runtime/arguments.cpp 2011-11-17 21:38:36.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/arguments.cpp 2012-02-26 13:59:21.000000000 -0800
+@@ -46,6 +46,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
@@ -11386,8 +10700,8 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/atomic.cpp 2011-06-27 09:14:43.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/atomic.cpp 2011-04-22 22:28:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/atomic.cpp 2011-11-17 21:38:36.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/atomic.cpp 2012-03-03 22:22:18.000000000 -0800
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
@@ -11408,10 +10722,10 @@
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "atomic_bsd_zero.inline.hpp"
+#endif
-
- jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) {
- assert(sizeof(jbyte) == 1, "assumption.");
---- ./hotspot/src/share/vm/runtime/fprofiler.hpp 2011-06-27 09:14:45.000000000 -0700
+ #ifdef TARGET_OS_ARCH_linux_arm
+ # include "atomic_linux_arm.inline.hpp"
+ #endif
+--- ./hotspot/src/share/vm/runtime/fprofiler.hpp 2011-11-17 21:38:38.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/fprofiler.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11423,8 +10737,8 @@
// a simple flat profiler for Java
---- ./hotspot/src/share/vm/runtime/globals.hpp 2011-06-27 09:14:45.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/globals.hpp 2011-06-21 05:38:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/globals.hpp 2011-11-17 21:38:38.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/globals.hpp 2012-02-26 13:59:21.000000000 -0800
@@ -50,6 +50,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "globals_windows.hpp"
@@ -11468,7 +10782,7 @@
#endif
#ifdef SHARK
#ifdef TARGET_ARCH_zero
---- ./hotspot/src/share/vm/runtime/handles.cpp 2011-06-27 09:14:46.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/handles.cpp 2011-11-17 21:38:38.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/handles.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -38,6 +38,10 @@
# include "os_windows.inline.hpp"
@@ -11481,7 +10795,7 @@
#ifdef ASSERT
oop* HandleArea::allocate_handle(oop obj) {
---- ./hotspot/src/share/vm/runtime/handles.inline.hpp 2011-06-27 09:14:46.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/handles.inline.hpp 2011-11-17 21:38:38.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/handles.inline.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11493,7 +10807,7 @@
// these inline functions are in a separate file to break an include cycle
// between Thread and Handle
---- ./hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-06-27 09:14:46.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-11-17 21:38:38.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11515,8 +10829,8 @@
};
---- ./hotspot/src/share/vm/runtime/java.cpp 2011-06-27 09:14:46.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/java.cpp 2011-04-22 22:28:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/java.cpp 2011-11-17 21:38:38.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/java.cpp 2012-02-26 13:59:21.000000000 -0800
@@ -85,6 +85,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11527,8 +10841,8 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
---- ./hotspot/src/share/vm/runtime/javaCalls.cpp 2011-06-27 09:14:47.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/javaCalls.cpp 2011-05-07 21:53:42.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/javaCalls.cpp 2011-11-17 21:38:38.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/javaCalls.cpp 2012-02-26 13:59:22.000000000 -0800
@@ -48,6 +48,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11539,7 +10853,7 @@
// -----------------------------------------------------
// Implementation of JavaCallWrapper
---- ./hotspot/src/share/vm/runtime/javaCalls.hpp 2011-06-27 09:14:47.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/javaCalls.hpp 2011-11-17 21:38:38.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/javaCalls.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -54,6 +54,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11551,7 +10865,7 @@
// A JavaCallWrapper is constructed before each JavaCall and destructed after the call.
// Its purpose is to allocate/deallocate a new handle block and to save/restore the last
---- ./hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2011-06-27 09:14:47.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2011-11-17 21:38:38.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -50,6 +50,13 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -11567,7 +10881,7 @@
//
// An object for encapsulating the machine/os dependent part of a JavaThread frame state
//
---- ./hotspot/src/share/vm/runtime/jniHandles.cpp 2011-06-27 09:14:47.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/jniHandles.cpp 2011-11-17 21:38:39.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/jniHandles.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11579,7 +10893,7 @@
JNIHandleBlock* JNIHandles::_global_handles = NULL;
---- ./hotspot/src/share/vm/runtime/memprofiler.cpp 2011-06-27 09:14:47.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/memprofiler.cpp 2011-11-17 21:38:39.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/memprofiler.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -46,6 +46,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11591,7 +10905,7 @@
#ifndef PRODUCT
---- ./hotspot/src/share/vm/runtime/mutex.cpp 2011-06-27 09:14:48.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/mutex.cpp 2011-11-17 21:38:39.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/mutex.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -39,6 +39,10 @@
# include "mutex_windows.inline.hpp"
@@ -11604,7 +10918,7 @@
// o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o
//
---- ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2011-06-27 09:14:48.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2011-11-17 21:38:39.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11616,7 +10930,7 @@
// Mutexes used in the VM (see comment in mutexLocker.hpp):
//
---- ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2011-06-27 09:14:48.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2011-11-17 21:38:39.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11628,7 +10942,7 @@
// Mutexes used in the VM.
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2011-06-27 09:14:48.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2011-11-17 21:38:39.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -50,6 +50,10 @@
# include "os_windows.inline.hpp"
@@ -11641,8 +10955,8 @@
#if defined(__GNUC__) && !defined(IA64)
// Need to inhibit inlining for older versions of GCC to avoid build-time failures
---- ./hotspot/src/share/vm/runtime/os.cpp 2011-06-27 09:14:49.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/os.cpp 2011-04-23 12:09:39.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/os.cpp 2011-11-17 21:38:40.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/os.cpp 2012-02-26 13:59:22.000000000 -0800
@@ -60,6 +60,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
@@ -11680,8 +10994,8 @@
}
static jboolean onLoaded = JNI_FALSE;
if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp 2011-06-27 09:14:49.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/os.hpp 2011-05-12 20:54:45.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/os.hpp 2011-11-17 21:38:40.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/os.hpp 2012-02-26 13:59:22.000000000 -0800
@@ -30,6 +30,9 @@
#include "runtime/extendedPC.hpp"
#include "runtime/handles.hpp"
@@ -11702,7 +11016,7 @@
// os defines the interface to operating system; this includes traditional
// OS services (time, I/O) as well as other functionality with system-
-@@ -672,6 +678,9 @@
+@@ -675,6 +681,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.hpp"
#endif
@@ -11712,7 +11026,7 @@
#ifdef TARGET_OS_ARCH_linux_x86
# include "os_linux_x86.hpp"
#endif
-@@ -696,6 +705,12 @@
+@@ -699,6 +708,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "os_linux_ppc.hpp"
#endif
@@ -11725,7 +11039,7 @@
// debugging support (mostly used by debug.cpp but also fatal error handler)
---- ./hotspot/src/share/vm/runtime/osThread.hpp 2011-06-27 09:14:50.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/osThread.hpp 2011-11-17 21:38:40.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/osThread.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -109,6 +109,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11737,8 +11051,8 @@
};
---- ./hotspot/src/share/vm/runtime/safepoint.cpp 2011-06-27 09:14:52.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/safepoint.cpp 2011-04-22 22:28:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/safepoint.cpp 2011-11-17 21:38:40.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/safepoint.cpp 2012-02-26 13:59:22.000000000 -0800
@@ -78,6 +78,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11749,7 +11063,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/shared/concurrentGCThread.hpp"
---- ./hotspot/src/share/vm/runtime/synchronizer.cpp 2011-06-27 09:14:55.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/synchronizer.cpp 2011-11-17 21:38:42.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/synchronizer.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -51,6 +51,10 @@
# include "os_windows.inline.hpp"
@@ -11762,7 +11076,7 @@
#if defined(__GNUC__) && !defined(IA64)
// Need to inhibit inlining for older versions of GCC to avoid build-time failures
---- ./hotspot/src/share/vm/runtime/task.cpp 2011-06-27 09:14:56.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/task.cpp 2011-11-17 21:38:42.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/task.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -39,6 +39,10 @@
# include "os_windows.inline.hpp"
@@ -11775,8 +11089,8 @@
int PeriodicTask::_num_tasks = 0;
PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks];
---- ./hotspot/src/share/vm/runtime/thread.cpp 2011-06-27 09:14:56.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/thread.cpp 2011-05-27 00:00:44.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/thread.cpp 2011-11-17 21:38:42.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/thread.cpp 2012-02-26 13:59:22.000000000 -0800
@@ -89,6 +89,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
@@ -11788,9 +11102,9 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
---- ./hotspot/src/share/vm/runtime/thread.hpp 2011-06-27 09:14:56.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/thread.hpp 2011-05-27 00:00:44.000000000 -0700
-@@ -1610,6 +1610,12 @@
+--- ./hotspot/src/share/vm/runtime/thread.hpp 2011-11-17 21:38:42.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/thread.hpp 2012-02-26 13:59:22.000000000 -0800
+@@ -1607,6 +1607,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "thread_linux_ppc.hpp"
#endif
@@ -11803,7 +11117,7 @@
public:
---- ./hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2011-06-27 09:14:56.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2011-11-17 21:38:42.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -36,6 +36,10 @@
# include "os_windows.inline.hpp"
@@ -11816,7 +11130,7 @@
// static member initialization
int ThreadLocalStorage::_thread_index = -1;
---- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2011-06-27 09:14:56.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2011-11-17 21:38:42.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -68,6 +68,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -11831,7 +11145,7 @@
public:
---- ./hotspot/src/share/vm/runtime/timer.cpp 2011-06-27 09:14:57.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/timer.cpp 2011-11-17 21:38:42.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/timer.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11843,8 +11157,8 @@
void elapsedTimer::add(elapsedTimer t) {
---- ./hotspot/src/share/vm/runtime/virtualspace.cpp 2011-06-27 09:14:58.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp 2011-04-22 22:28:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/virtualspace.cpp 2011-11-17 21:38:43.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/virtualspace.cpp 2012-02-26 13:59:22.000000000 -0800
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
@@ -11855,9 +11169,9 @@
// ReservedSpace
---- ./hotspot/src/share/vm/runtime/vmStructs.cpp 2011-06-27 09:14:58.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp 2011-05-27 00:00:44.000000000 -0700
-@@ -125,6 +125,9 @@
+--- ./hotspot/src/share/vm/runtime/vmStructs.cpp 2011-11-17 21:38:43.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/vmStructs.cpp 2012-02-26 13:59:22.000000000 -0800
+@@ -133,6 +133,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
@@ -11867,7 +11181,7 @@
#ifdef TARGET_OS_ARCH_linux_x86
# include "vmStructs_linux_x86.hpp"
#endif
-@@ -149,6 +152,12 @@
+@@ -157,6 +160,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "vmStructs_linux_ppc.hpp"
#endif
@@ -11880,7 +11194,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsPermGen.hpp"
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
---- ./hotspot/src/share/vm/runtime/vmThread.cpp 2011-06-27 09:14:58.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp 2011-11-17 21:38:44.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/vmThread.cpp 2011-05-07 21:53:42.000000000 -0700
@@ -46,6 +46,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11892,7 +11206,7 @@
HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int);
HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int);
---- ./hotspot/src/share/vm/runtime/vmThread.hpp 2011-06-27 09:14:58.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.hpp 2011-11-17 21:38:44.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/vmThread.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11904,7 +11218,7 @@
//
// Prioritized queue of VM operations.
---- ./hotspot/src/share/vm/runtime/vm_operations.cpp 2011-06-27 09:14:58.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vm_operations.cpp 2011-11-17 21:38:44.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/vm_operations.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11916,9 +11230,9 @@
#define VM_OP_NAME_INITIALIZE(name) #name,
---- ./hotspot/src/share/vm/runtime/vm_version.cpp 2011-06-27 09:14:59.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2011-04-22 22:28:37.000000000 -0700
-@@ -166,7 +166,8 @@
+--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2011-11-17 21:38:44.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2012-02-26 13:59:22.000000000 -0800
+@@ -167,7 +167,8 @@
#define OS LINUX_ONLY("linux") \
WINDOWS_ONLY("windows") \
@@ -11928,7 +11242,7 @@
#ifdef ZERO
#define CPU ZERO_LIBARCH
---- ./hotspot/src/share/vm/utilities/accessFlags.cpp 2011-06-27 09:15:08.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/accessFlags.cpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/accessFlags.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11940,7 +11254,7 @@
void AccessFlags::atomic_set_bits(jint bits) {
---- ./hotspot/src/share/vm/utilities/array.cpp 2011-06-27 09:15:08.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/array.cpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/array.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11952,7 +11266,7 @@
#ifdef ASSERT
---- ./hotspot/src/share/vm/utilities/bitMap.cpp 2011-06-27 09:15:08.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/bitMap.cpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/bitMap.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11964,7 +11278,7 @@
BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) :
---- ./hotspot/src/share/vm/utilities/debug.cpp 2011-06-27 09:15:11.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/debug.cpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/debug.cpp 2011-05-12 20:54:45.000000000 -0700
@@ -62,6 +62,10 @@
# include "os_windows.inline.hpp"
@@ -14585,7 +13899,7 @@
+__END_DECLS
+
+#endif /* elf.h */
---- ./hotspot/src/share/vm/utilities/elfFile.hpp 2011-06-27 09:15:12.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/elfFile.hpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/elfFile.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -27,7 +27,13 @@
@@ -14622,7 +13936,7 @@
#include "globalDefinitions.hpp"
#include "memory/allocation.hpp"
---- ./hotspot/src/share/vm/utilities/events.cpp 2011-06-27 09:15:13.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/events.cpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/events.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14634,7 +13948,7 @@
#ifndef PRODUCT
---- ./hotspot/src/share/vm/utilities/exceptions.cpp 2011-06-27 09:15:13.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/exceptions.cpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/exceptions.cpp 2011-05-07 21:53:42.000000000 -0700
@@ -42,6 +42,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14646,18 +13960,20 @@
// Implementation of ThreadShadow
---- ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-06-27 09:15:13.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-04-23 12:09:39.000000000 -0700
-@@ -25,6 +25,8 @@
+--- ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-11-17 21:38:47.000000000 -0800
++++ ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2012-02-12 13:05:33.000000000 -0800
+@@ -25,6 +25,10 @@
#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
++#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
++#endif
+
#ifdef TARGET_COMPILER_gcc
# include "utilities/globalDefinitions_gcc.hpp"
#endif
-@@ -37,6 +39,8 @@
+@@ -37,6 +41,8 @@
#include "utilities/macros.hpp"
@@ -14666,7 +13982,7 @@
// This file holds all globally used constants & types, class (forward)
// declarations and a few frequently used utility functions.
-@@ -1188,20 +1192,20 @@
+@@ -1188,20 +1194,20 @@
#define BOOL_TO_STR(_b_) ((_b_) ? "true" : "false")
// Format 32-bit quantities.
@@ -14695,7 +14011,7 @@
// Format macros that allow the field width to be specified. The width must be
// a string literal (e.g., "8") or a macro that evaluates to one.
-@@ -1226,19 +1230,17 @@
+@@ -1226,19 +1232,17 @@
// using "%x".
#ifdef _LP64
#define PTR_FORMAT PTR64_FORMAT
@@ -14718,7 +14034,7 @@
// Enable zap-a-lot if in debug version.
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-06-27 09:15:14.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-04-23 12:13:39.000000000 -0700
@@ -76,15 +76,28 @@
# include <sys/procfs.h>
@@ -14789,7 +14105,7 @@
inline int g_isnan(float f) { return isnanf(f); }
inline int g_isnan(double f) { return isnan(f); }
#else
---- ./hotspot/src/share/vm/utilities/growableArray.cpp 2011-06-27 09:15:14.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/growableArray.cpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/growableArray.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14801,7 +14117,7 @@
#ifdef ASSERT
void GenericGrowableArray::set_nesting() {
if (on_stack()) {
---- ./hotspot/src/share/vm/utilities/histogram.hpp 2011-06-27 09:15:15.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/histogram.hpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/histogram.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14813,7 +14129,7 @@
// This class provides a framework for collecting various statistics.
// The current implementation is oriented towards counting invocations
---- ./hotspot/src/share/vm/utilities/macros.hpp 2011-06-27 09:15:15.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/macros.hpp 2011-11-17 21:38:47.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/macros.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -161,6 +161,14 @@
#define NOT_WINDOWS(code) code
@@ -14830,8 +14146,8 @@
#ifdef _WIN64
#define WIN64_ONLY(code) code
#define NOT_WIN64(code)
---- ./hotspot/src/share/vm/utilities/ostream.cpp 2011-06-27 09:15:16.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2011-04-22 22:28:37.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/ostream.cpp 2011-11-17 21:38:48.000000000 -0800
++++ ./hotspot/src/share/vm/utilities/ostream.cpp 2012-02-26 13:59:22.000000000 -0800
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
@@ -14842,7 +14158,7 @@
extern "C" void jio_print(const char* s); // Declarationtion of jvm method
-@@ -909,7 +912,7 @@
+@@ -992,7 +995,7 @@
#ifndef PRODUCT
@@ -14851,7 +14167,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
---- ./hotspot/src/share/vm/utilities/preserveException.hpp 2011-06-27 09:15:17.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/preserveException.hpp 2011-11-17 21:38:48.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/preserveException.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14863,7 +14179,7 @@
// This file provides more support for exception handling; see also exceptions.hpp
class PreserveExceptionMark {
---- ./hotspot/src/share/vm/utilities/taskqueue.cpp 2011-06-27 09:15:17.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/taskqueue.cpp 2011-11-17 21:38:49.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/taskqueue.cpp 2011-04-22 22:28:38.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14875,7 +14191,7 @@
#ifdef TRACESPINNING
uint ParallelTaskTerminator::_total_yields = 0;
---- ./hotspot/src/share/vm/utilities/taskqueue.hpp 2011-06-27 09:15:17.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/taskqueue.hpp 2011-11-17 21:38:49.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/taskqueue.hpp 2011-04-22 22:28:38.000000000 -0700
@@ -53,6 +53,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -14890,7 +14206,7 @@
// Simple TaskQueue stats that are collected by default in debug builds.
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2011-06-27 09:15:18.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/vmError.cpp 2011-11-17 21:38:49.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2011-04-22 22:28:38.000000000 -0700
@@ -45,13 +45,18 @@
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
@@ -14921,7 +14237,7 @@
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
---- ./hotspot/src/share/vm/utilities/workgroup.hpp 2011-06-27 09:15:18.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/workgroup.hpp 2011-11-17 21:38:49.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/workgroup.hpp 2011-04-22 22:28:38.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14933,7 +14249,7 @@
// Task class hierarchy:
// AbstractGangTask
---- ./hotspot/test/Makefile 2011-06-27 09:15:19.000000000 -0700
+--- ./hotspot/test/Makefile 2011-11-17 21:38:50.000000000 -0800
+++ ./hotspot/test/Makefile 2011-04-22 22:28:38.000000000 -0700
@@ -44,6 +44,22 @@
ARCH = i586
@@ -14967,7 +14283,30 @@
ifdef TESTDIRS
JTREG_TESTDIRS = $(TESTDIRS)
endif
---- ./hotspot/test/jprt.config 2011-06-27 09:15:41.000000000 -0700
+--- ./hotspot/test/compiler/5091921/Test7005594.sh 2011-11-17 21:38:50.000000000 -0800
++++ ./hotspot/test/compiler/5091921/Test7005594.sh 2012-03-03 22:34:03.000000000 -0800
+@@ -71,6 +71,9 @@
+ # Windows/MKS
+ MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
+ MEM="$(($machine_memory / 1024))"
++elif [ -n `sysctl -n hw.physmem64 2> /dev/null` -o -n `sysctl -n hw.physmem 2> /dev/null` ];
++ # BSD
++ MEM=`sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }'`
+ else
+ echo "Unable to determine amount of physical memory on the machine"
+ fi
+--- ./hotspot/test/gc/6941923/test6941923.sh 2011-11-17 21:39:01.000000000 -0800
++++ ./hotspot/test/gc/6941923/test6941923.sh 2012-03-03 22:35:30.000000000 -0800
+@@ -9,7 +9,7 @@
+ ## skip on windows
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux )
++ SunOS | Linux | *BSD )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./hotspot/test/jprt.config 2011-11-17 21:39:01.000000000 -0800
+++ ./hotspot/test/jprt.config 2011-04-22 22:28:38.000000000 -0700
@@ -75,8 +75,8 @@
@@ -15036,7 +14375,7 @@
# Export PATH setting
PATH="${path4sdk}"
---- ./hotspot/test/runtime/6929067/Test6929067.sh 2011-06-27 09:15:43.000000000 -0700
+--- ./hotspot/test/runtime/6929067/Test6929067.sh 2011-11-17 21:39:01.000000000 -0800
+++ ./hotspot/test/runtime/6929067/Test6929067.sh 2011-04-22 22:28:38.000000000 -0700
@@ -29,7 +29,7 @@
PS=":"
@@ -15047,7 +14386,7 @@
NULL=NUL
PS=";"
FS="\\"
---- ./hotspot/test/runtime/7020373/Test7020373.sh 2011-06-27 09:15:43.000000000 -0700
+--- ./hotspot/test/runtime/7020373/Test7020373.sh 2011-11-17 21:39:01.000000000 -0800
+++ ./hotspot/test/runtime/7020373/Test7020373.sh 2011-06-21 18:23:22.000000000 -0700
@@ -32,7 +32,7 @@
# set platform-dependent variables
@@ -15058,40 +14397,31 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jaxp/.hgtags 2011-06-27 09:19:43.000000000 -0700
-+++ ./jaxp/.hgtags 2011-06-27 22:08:07.000000000 -0700
-@@ -121,3 +121,4 @@
- 39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144
- 10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145
- bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
-+fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
---- ./jaxp/.jcheck/conf 2011-06-27 09:19:44.000000000 -0700
-+++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
-@@ -1 +0,0 @@
--project=jdk7
---- ./jaxws/.hgtags 2011-06-27 09:28:50.000000000 -0700
-+++ ./jaxws/.hgtags 2011-06-27 22:08:10.000000000 -0700
-@@ -121,3 +121,4 @@
- 6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144
- 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145
- 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
-+d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
---- ./jaxws/.jcheck/conf 2011-06-27 09:28:50.000000000 -0700
-+++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
-@@ -1 +0,0 @@
--project=jdk7
---- ./jdk/.hgtags 2011-06-27 10:18:12.000000000 -0700
-+++ ./jdk/.hgtags 2011-06-27 22:08:14.000000000 -0700
-@@ -121,3 +121,4 @@
- 23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144
- 1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145
- 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
-+f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
---- ./jdk/.jcheck/conf 2011-06-27 10:18:13.000000000 -0700
-+++ ./jdk/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
-@@ -1 +0,0 @@
--project=jdk7
---- ./jdk/make/com/sun/java/pack/Makefile 2011-06-27 10:18:17.000000000 -0700
+--- ./jaxp/.hgtags 2011-11-17 21:40:18.000000000 -0800
++++ ./jaxp/.hgtags 2012-02-26 13:58:25.000000000 -0800
+@@ -139,3 +139,5 @@
+ 407177580b012f89df837094b45287b7d250c911 jdk7u1-b08
+ 0c5c2b2462f104970eefa4a47b3c4428efd81cf0 jdk7u2-b11
+ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
++d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
++0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
+--- ./jaxws/.hgtags 2011-11-17 21:41:46.000000000 -0800
++++ ./jaxws/.hgtags 2012-02-26 13:58:41.000000000 -0800
+@@ -139,3 +139,5 @@
+ 97365155cf6df7a7bed4d9e288eab8b7b58f72d7 jdk7u1-b08
+ f3bb1066a71f2a64c7bcf45a7ba0a8de63657696 jdk7u2-b11
+ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12
++9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13
++d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21
+--- ./jdk/.hgtags 2011-11-17 21:55:30.000000000 -0800
++++ ./jdk/.hgtags 2012-02-26 15:38:41.000000000 -0800
+@@ -139,3 +139,5 @@
+ 50d739b0c45631b386af3f2cb6235f137c1a6e91 jdk7u1-b08
+ b5090771e19b2b20670bef60a84de95797cb01be jdk7u2-b11
+ 79c8c4608f60e1f981b17ba4077dfcaa2ed67be4 jdk7u2-b12
++fb2980d7c9439e3d62ab12f40506a2a2db2df0f4 jdk7u2-b13
++24e42f1f9029f9f5a9b1481d523facaf09452e5b jdk7u2-b21
+--- ./jdk/make/com/sun/java/pack/Makefile 2011-11-17 21:55:32.000000000 -0800
+++ ./jdk/make/com/sun/java/pack/Makefile 2011-05-07 21:54:09.000000000 -0700
@@ -57,6 +57,7 @@
vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
@@ -15124,7 +14454,7 @@
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
---- ./jdk/make/com/sun/nio/Makefile 2011-06-27 10:18:19.000000000 -0700
+--- ./jdk/make/com/sun/nio/Makefile 2011-11-17 21:55:32.000000000 -0800
+++ ./jdk/make/com/sun/nio/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -30,7 +30,16 @@
BUILDDIR = ../../..
@@ -15143,7 +14473,7 @@
include $(BUILDDIR)/common/Subdirs.gmk
all build clean clobber::
---- ./jdk/make/com/sun/nio/sctp/Makefile 2011-06-27 10:18:20.000000000 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile 2011-11-17 21:55:32.000000000 -0800
+++ ./jdk/make/com/sun/nio/sctp/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -59,15 +59,11 @@
-I$(PLATFORM_SRC)/native/java/net \
@@ -15163,7 +14493,7 @@
else # windows
include $(BUILDDIR)/common/Classes.gmk
---- ./jdk/make/com/sun/security/auth/module/Makefile 2011-06-27 10:18:23.000000000 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile 2011-11-17 21:55:33.000000000 -0800
+++ ./jdk/make/com/sun/security/auth/module/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
@@ -15174,7 +14504,7 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2011-06-27 10:18:24.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2011-11-17 21:55:33.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,5 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
@@ -15186,7 +14516,7 @@
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2011-06-27 10:18:24.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2011-11-17 21:55:33.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -39,4 +39,7 @@
LinuxVirtualMachine.c
@@ -15197,7 +14527,7 @@
+FILES_c = \
+ BsdVirtualMachine.c
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2011-06-27 10:18:24.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2011-11-17 21:55:33.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,6 +43,11 @@
sun/tools/attach/LinuxAttachProvider.java
@@ -15211,7 +14541,7 @@
#
# Files that need to be copied
#
---- ./jdk/make/com/sun/tools/attach/Makefile 2011-06-27 10:18:24.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile 2011-11-17 21:55:33.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/Makefile 2011-06-21 05:39:00.000000000 -0700
@@ -36,6 +36,9 @@
ifeq ($(PLATFORM), linux)
@@ -15223,7 +14553,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2011-04-22 23:08:15.000000000 -0700
@@ -30,14 +30,12 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
@@ -15241,8 +14571,8 @@
local:
*;
};
---- ./jdk/make/common/Defs-bsd.gmk 2011-06-27 23:25:38.000000000 -0700
-+++ ./jdk/make/common/Defs-bsd.gmk 2011-05-07 22:01:55.000000000 -0700
+--- ./jdk/make/common/Defs-bsd.gmk 2012-03-04 16:33:49.000000000 -0800
++++ ./jdk/make/common/Defs-bsd.gmk 2012-03-03 18:32:21.000000000 -0800
@@ -25,7 +25,7 @@
#
@@ -15261,7 +14591,7 @@
PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
# suffix used for make dependencies files.
-@@ -100,9 +100,11 @@
+@@ -151,9 +151,11 @@
# We need this frame pointer to make it easy to walk the stacks.
# This should be the default on X86, but ia64 and amd64 may not have this
# as the default.
@@ -15276,7 +14606,7 @@
CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
-@@ -119,9 +121,13 @@
+@@ -170,9 +172,13 @@
CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
endif
@@ -15291,7 +14621,7 @@
_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu')
ifneq ($(_HAS_HASH_STYLE_GNU),)
LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
-@@ -156,7 +162,7 @@
+@@ -207,7 +213,7 @@
CFLAGS_COMMON += -pipe
endif
@@ -15300,7 +14630,7 @@
DEBUG_FLAG = -g
ifeq ($(FASTDEBUG), true)
ifeq ($(ARCH_DATA_MODEL), 64)
-@@ -193,8 +199,7 @@
+@@ -244,8 +250,7 @@
else
CPP_ARCH_FLAGS += -D_$(ARCH)_
endif
@@ -15310,7 +14640,7 @@
-D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
ifeq ($(ARCH_DATA_MODEL), 64)
-@@ -207,44 +212,37 @@
+@@ -258,44 +263,37 @@
CPPFLAGS_DBG += -DLOGGING
endif
@@ -15379,7 +14709,7 @@
#
# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
-@@ -265,9 +263,9 @@
+@@ -316,9 +314,9 @@
ifeq ($(VARIANT), OPT)
ifneq ($(NO_STRIP), true)
ifneq ($(DEBUG_BINARIES), true)
@@ -15391,7 +14721,7 @@
endif
endif
endif
-@@ -286,6 +284,11 @@
+@@ -337,6 +335,16 @@
LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
endif
@@ -15399,11 +14729,16 @@
+ifeq ($(OS_VENDOR), Apple)
+LDNOMAP=true
+endif
++# Using map files currently break compilation on FreeBSD during shared library
++# checks for some of the AWT native libraries.
++ifeq ($(OS_VENDOR), FreeBSD)
++LDNOMAP=true
++endif
+
#
# Path and option to link against the VM, if you have to. Note that
# there are libraries that link against only -ljava, but they do get
-@@ -293,7 +296,11 @@
+@@ -344,7 +352,11 @@
# the library itself should not.
#
VM_NAME = server
@@ -15415,7 +14750,7 @@
JAVALIB = -ljava $(JVMLIB)
#
-@@ -312,7 +319,9 @@
+@@ -363,7 +375,9 @@
override HAVE_FILIOH = false
override HAVE_GETHRTIME = false
override HAVE_GETHRVTIME = false
@@ -15425,9 +14760,9 @@
override LEX_LIBRARY = -lfl
ifeq ($(STATIC_CXX),true)
override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-@@ -323,13 +332,11 @@
- override LIBSOCKET =
+@@ -375,13 +389,11 @@
override LIBNSL =
+ override LIBSCF =
override LIBTHREAD =
+override LIBDL =
override MOOT_PRIORITIES = true
@@ -15441,7 +14776,7 @@
override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =
override THREADS_FLAG = native
-@@ -350,6 +357,14 @@
+@@ -402,6 +414,14 @@
# DPS (Displayable PostScript) is available on Solaris machines
HAVE_DPS = no
@@ -15456,8 +14791,8 @@
#
# Japanese manpages
#
-@@ -361,7 +376,7 @@
- SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
+@@ -414,7 +434,7 @@
+ SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo
# The JDI - Serviceability Agent binding is not currently supported
-# on Bsd-ia64.
@@ -15465,11 +14800,11 @@
ifeq ($(ARCH), ia64)
INCLUDE_SA = false
else
---- ./jdk/make/common/Defs-linux.gmk 2011-06-27 10:18:26.000000000 -0700
-+++ ./jdk/make/common/Defs-linux.gmk 2011-05-07 21:54:09.000000000 -0700
-@@ -323,8 +323,10 @@
- override LIBSOCKET =
+--- ./jdk/make/common/Defs-linux.gmk 2011-11-17 21:55:33.000000000 -0800
++++ ./jdk/make/common/Defs-linux.gmk 2012-02-26 15:38:41.000000000 -0800
+@@ -375,8 +375,10 @@
override LIBNSL =
+ override LIBSCF =
override LIBTHREAD =
+override LIBDL = -ldl
override MOOT_PRIORITIES = true
@@ -15478,20 +14813,20 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs-solaris.gmk 2011-06-27 10:18:26.000000000 -0700
-+++ ./jdk/make/common/Defs-solaris.gmk 2011-05-07 21:54:09.000000000 -0700
-@@ -648,6 +648,9 @@
+--- ./jdk/make/common/Defs-solaris.gmk 2011-11-17 21:55:33.000000000 -0800
++++ ./jdk/make/common/Defs-solaris.gmk 2012-02-26 15:39:30.000000000 -0800
+@@ -711,6 +711,9 @@
# Network Services library
LIBNSL = -lnsl
+# Dynamic Loading library
+LIBDL = -ldl
+
- # GLOBAL_KPIC: If set means all libraries are PIC, position independent code
- # EXCEPT for select compiles
- # If a .o file is compiled non-PIC then it should be forced
---- ./jdk/make/common/Defs.gmk 2011-06-27 10:18:26.000000000 -0700
-+++ ./jdk/make/common/Defs.gmk 2011-04-22 23:08:15.000000000 -0700
+ # service configuration facility library
+ LIBSCF = -lscf
+
+--- ./jdk/make/common/Defs.gmk 2011-11-17 21:55:33.000000000 -0800
++++ ./jdk/make/common/Defs.gmk 2012-02-26 15:38:41.000000000 -0800
@@ -109,6 +109,49 @@
endif
endif
@@ -15561,7 +14896,18 @@
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./jdk/make/common/Program.gmk 2011-06-27 10:18:27.000000000 -0700
+--- ./jdk/make/common/Mapfile-vers.gmk 2011-11-17 21:55:33.000000000 -0800
++++ ./jdk/make/common/Mapfile-vers.gmk 2011-08-02 23:11:42.000000000 -0700
+@@ -76,7 +76,7 @@
+
+ endif # PLATFORM
+
+-ifeq ($(PLATFORM), linux)
++ifneq (,$(findstring $(PLATFORM), linux bsd))
+
+ ifeq ($(VARIANT), OPT)
+ # OPT build MUST have a mapfile?
+--- ./jdk/make/common/Program.gmk 2011-11-17 21:55:33.000000000 -0800
+++ ./jdk/make/common/Program.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -73,11 +73,27 @@
# Create a dependency on libjli (Java Launcher Infrastructure)
@@ -15623,9 +14969,9 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk 2011-06-27 10:18:27.000000000 -0700
-+++ ./jdk/make/common/Release.gmk 2011-06-21 05:39:00.000000000 -0700
-@@ -128,7 +128,6 @@
+--- ./jdk/make/common/Release.gmk 2011-11-17 21:55:34.000000000 -0800
++++ ./jdk/make/common/Release.gmk 2012-02-26 15:38:41.000000000 -0800
+@@ -132,7 +132,6 @@
JDK_MAN_PAGES = \
$(JRE_MAN_PAGES) \
appletviewer.1 \
@@ -15633,7 +14979,7 @@
extcheck.1 \
idlj.1 \
jar.1 \
-@@ -167,6 +166,12 @@
+@@ -171,6 +170,12 @@
JA_DIRNAME=ja_JP.UTF-8
endif # linux
@@ -15646,7 +14992,7 @@
define copy-man-pages
$(MKDIR) -p $1/man/man1
for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
-@@ -300,6 +305,12 @@
+@@ -304,6 +309,12 @@
SOURCE_DIRS += $(CLOSED_SRC)/share/classes
endif
@@ -15659,7 +15005,7 @@
#
# Specific files and directories that will be filtered out from above areas.
-@@ -992,7 +1003,7 @@
+@@ -1003,7 +1014,7 @@
@# generated by the more efficient solaris/windows method of copying files.
@# So for Linux, make use of the -T option (like Solaris' -I option) of
@# obtaining the list of files from a file. MKS tar has no such option.
@@ -15668,7 +15014,7 @@
for d in $(SOURCE_DIRS); do \
$(RM) $(ABS_TEMPDIR)/src-files.list; \
($(CD) $$d && \
-@@ -1005,7 +1016,7 @@
+@@ -1016,7 +1027,7 @@
done ; \
) ; \
if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \
@@ -15677,7 +15023,7 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/shared/Compiler-gcc.gmk 2011-06-27 10:18:29.000000000 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk 2011-11-17 21:55:34.000000000 -0800
+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -72,6 +72,24 @@
@@ -15704,8 +15050,8 @@
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./jdk/make/common/shared/Defs-bsd.gmk 2011-06-27 23:25:38.000000000 -0700
-+++ ./jdk/make/common/shared/Defs-bsd.gmk 2011-04-22 23:08:15.000000000 -0700
+--- ./jdk/make/common/shared/Defs-bsd.gmk 2012-03-04 16:33:49.000000000 -0800
++++ ./jdk/make/common/shared/Defs-bsd.gmk 2011-07-15 21:28:12.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -15753,7 +15099,7 @@
# Import JDK images allow for partial builds, components not built are
# imported (or copied from) these import areas when needed.
-@@ -196,6 +192,20 @@
+@@ -196,6 +192,34 @@
# Macro to check it's input file for banned dependencies and verify the
# binary built properly. Relies on process exit code.
ifndef CROSS_COMPILE_ARCH
@@ -15771,19 +15117,34 @@
+) || true
+endef
+else
++ifeq ($(OS_VENDOR), OpenBSD)
++define binary_file_verification # binary_file
++( \
++ $(ECHO) "Checking for mapfile use in: $1" && \
++ if [ "`$(OBJDUMP) -T $1 | $(EGREP) '[0-9a-f]* g *DF \.text.*SUNWprivate'`" = "" ] ; then \
++ $(ECHO) "$(MAPFILE_WARNING): File was not built with a mapfile: $1"; \
++ fi && \
++ $(ECHO) "Library loads for: $1" && \
++ $(LDD) $1 && \
++ $(ECHO) "RUNPATH for: $1" && \
++ ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
++) || true
++endef
++else
define binary_file_verification # binary_file
( \
$(ECHO) "Checking for mapfile use in: $1" && \
-@@ -208,6 +218,7 @@
+@@ -208,6 +232,8 @@
( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
)
endef
++endif # OS_VENDOR == OpenBSD
+endif # OS_VENDOR == Apple
else
define binary_file_verification
( \
---- ./jdk/make/common/shared/Defs-utils.gmk 2011-06-27 10:18:30.000000000 -0700
-+++ ./jdk/make/common/shared/Defs-utils.gmk 2011-05-07 21:54:09.000000000 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk 2011-11-17 21:55:34.000000000 -0800
++++ ./jdk/make/common/shared/Defs-utils.gmk 2011-07-15 21:28:12.000000000 -0700
@@ -67,6 +67,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
@@ -15807,7 +15168,7 @@
PKGMK = $(UTILS_COMMAND_PATH)pkgmk
PRINTF = $(UTILS_USR_BIN_PATH)printf
PWD = $(UTILS_COMMAND_PATH)pwd
-@@ -220,3 +229,39 @@
+@@ -220,3 +229,40 @@
ECHO = /usr/bin/echo
endif
@@ -15837,6 +15198,7 @@
+ endif
+ ifeq ($(OS_VENDOR), OpenBSD)
+ NAWK = $(UTILS_USR_BIN_PATH)awk
++ OBJDUMP = $(UTILS_USR_BIN_PATH)objdump
+ else
+ CPIO = $(UTILS_USR_BIN_PATH)cpio
+ TAR = $(UTILS_USR_BIN_PATH)tar
@@ -15847,7 +15209,7 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs-versions.gmk 2011-06-27 10:18:30.000000000 -0700
+--- ./jdk/make/common/shared/Defs-versions.gmk 2011-11-17 21:55:34.000000000 -0800
+++ ./jdk/make/common/shared/Defs-versions.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -44,6 +44,11 @@
override CC_VERSION = gcc
@@ -15861,8 +15223,8 @@
##########################################################################
#
# List of JDK official minimum, expected, or required versions:
---- ./jdk/make/common/shared/Platform.gmk 2011-06-27 10:18:31.000000000 -0700
-+++ ./jdk/make/common/shared/Platform.gmk 2011-05-07 21:54:09.000000000 -0700
+--- ./jdk/make/common/shared/Platform.gmk 2011-11-17 21:55:35.000000000 -0800
++++ ./jdk/make/common/shared/Platform.gmk 2011-07-15 21:28:12.000000000 -0700
@@ -86,7 +86,7 @@
SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
# When changing SCM_DIRs also change SCM_DIRS_rexp and SCM_DIRS_prune:
@@ -15901,7 +15263,7 @@
+ PLATFORM = bsd
+ OS_NAME = openbsd
+ OS_VENDOR = OpenBSD
-+ REQUIRED_OS_VERSION = 4.2
++ REQUIRED_OS_VERSION = 4.9
+endif
+
+# Platform settings specific to BSD
@@ -15989,26 +15351,7 @@
# Machines with 512Mb or less of real memory are considered low memory
# build machines and adjustments will be made to prevent excessing
# system swapping during the build.
-@@ -452,6 +555,18 @@
- export MIN_VM_MEMORY
- endif
-
-+# for OpenBSD/i386 limit to 736 max
-+ifeq ($(OS_VENDOR), OpenBSD)
-+ ifeq ($(ARCH_DATA_MODEL), 32)
-+ MAX_VM_MEMORY := $(shell \
-+ if [ $(MAX_VM_MEMORY) -gt 736 ] ; then \
-+ echo "736"; \
-+ else \
-+ echo "$(MAX_VM_MEMORY)" ; \
-+ fi)
-+ endif
-+endif
-+
- # If blanks in the username, use the first 4 words and pack them together
- _USER1:=$(subst ', ,$(_USER))
- _USER2:=$(subst ", ,$(_USER1))
---- ./jdk/make/common/shared/Sanity.gmk 2011-06-27 10:18:31.000000000 -0700
+--- ./jdk/make/common/shared/Sanity.gmk 2011-11-17 21:55:35.000000000 -0800
+++ ./jdk/make/common/shared/Sanity.gmk 2011-05-07 23:39:41.000000000 -0700
@@ -140,6 +140,9 @@
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
@@ -16039,7 +15382,7 @@
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
---- ./jdk/make/java/Makefile 2011-06-27 10:18:32.000000000 -0700
+--- ./jdk/make/java/Makefile 2011-11-17 21:55:35.000000000 -0800
+++ ./jdk/make/java/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -53,7 +53,7 @@
endif
@@ -16050,7 +15393,7 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/instrument/Makefile 2011-06-27 10:18:33.000000000 -0700
+--- ./jdk/make/java/instrument/Makefile 2011-11-17 21:55:36.000000000 -0800
+++ ./jdk/make/java/instrument/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -102,9 +102,29 @@
# equivalent of strcasecmp is stricmp on Windows
@@ -16091,8 +15434,8 @@
#
# Library to compile.
---- ./jdk/make/java/java/Makefile 2011-06-27 10:18:34.000000000 -0700
-+++ ./jdk/make/java/java/Makefile 2011-05-12 20:55:05.000000000 -0700
+--- ./jdk/make/java/java/Makefile 2011-11-17 21:55:36.000000000 -0800
++++ ./jdk/make/java/java/Makefile 2012-02-26 15:40:15.000000000 -0800
@@ -165,8 +165,10 @@
# Is the altzone extern documented in ctime(3C) available?
#
@@ -16108,12 +15451,12 @@
-libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib \
shell32.lib delayimp.lib /DELAYLOAD:shell32.dll
else
--OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) -ldl \
-+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBDL) \
+-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBSCF) -ldl \
++OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBSCF) $(LIBDL) \
-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
endif
---- ./jdk/make/java/java/genlocales.gmk 2011-06-27 10:18:34.000000000 -0700
+--- ./jdk/make/java/java/genlocales.gmk 2011-11-17 21:55:36.000000000 -0800
+++ ./jdk/make/java/java/genlocales.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -76,10 +76,14 @@
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
@@ -16134,7 +15477,7 @@
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
---- ./jdk/make/java/java/localegen.sh 2011-06-27 10:18:34.000000000 -0700
+--- ./jdk/make/java/java/localegen.sh 2011-11-17 21:55:36.000000000 -0800
+++ ./jdk/make/java/java/localegen.sh 2011-04-22 23:08:15.000000000 -0700
@@ -55,9 +55,9 @@
for FILE in $RESOURCE_NAMES
@@ -16148,7 +15491,7 @@
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
---- ./jdk/make/java/java_hprof_demo/Makefile 2011-06-27 10:18:35.000000000 -0700
+--- ./jdk/make/java/java_hprof_demo/Makefile 2011-11-17 21:55:38.000000000 -0800
+++ ./jdk/make/java/java_hprof_demo/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -83,7 +83,7 @@
ifeq ($(PLATFORM), windows)
@@ -16159,7 +15502,7 @@
endif
#
---- ./jdk/make/java/jli/Makefile 2011-06-27 10:18:36.000000000 -0700
+--- ./jdk/make/java/jli/Makefile 2011-11-17 21:55:39.000000000 -0800
+++ ./jdk/make/java/jli/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -44,7 +44,9 @@
@@ -16251,7 +15594,7 @@
+ vpath %.c $(ZIP_SRC)
+endif
+
---- ./jdk/make/java/net/FILES_c.gmk 2011-06-27 10:18:38.000000000 -0700
+--- ./jdk/make/java/net/FILES_c.gmk 2011-11-17 21:55:42.000000000 -0800
+++ ./jdk/make/java/net/FILES_c.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,6 +43,10 @@
FILES_c += linux_close.c
@@ -16264,7 +15607,7 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile 2011-06-27 10:18:38.000000000 -0700
+--- ./jdk/make/java/net/Makefile 2011-11-17 21:55:42.000000000 -0800
+++ ./jdk/make/java/net/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -91,16 +91,23 @@
@@ -16291,8 +15634,8 @@
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
---- ./jdk/make/java/nio/Makefile 2011-06-27 10:18:39.000000000 -0700
-+++ ./jdk/make/java/nio/Makefile 2011-04-22 23:08:15.000000000 -0700
+--- ./jdk/make/java/nio/Makefile 2011-11-17 21:55:42.000000000 -0800
++++ ./jdk/make/java/nio/Makefile 2012-02-26 15:38:41.000000000 -0800
@@ -260,6 +260,69 @@
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
@@ -16389,7 +15732,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
---- ./jdk/make/java/nio/mapfile-bsd 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/make/java/nio/mapfile-bsd 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/make/java/nio/mapfile-bsd 2011-05-12 20:59:33.000000000 -0700
@@ -36,24 +36,6 @@
Java_sun_nio_ch_DatagramDispatcher_readv0;
@@ -16446,7 +15789,7 @@
Java_sun_nio_fs_UnixNativeDispatcher_init;
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
Java_sun_nio_fs_UnixNativeDispatcher_strerror;
---- ./jdk/make/java/npt/Makefile 2011-06-27 10:18:40.000000000 -0700
+--- ./jdk/make/java/npt/Makefile 2011-11-17 21:55:42.000000000 -0800
+++ ./jdk/make/java/npt/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -67,6 +67,18 @@
OTHER_LCF += -export:nptInitialize -export:nptTerminate
@@ -16467,7 +15810,7 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile 2011-06-27 10:18:40.000000000 -0700
+--- ./jdk/make/java/redist/fonts/Makefile 2011-11-17 21:55:43.000000000 -0800
+++ ./jdk/make/java/redist/fonts/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -42,7 +42,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
@@ -16496,25 +15839,18 @@
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/java/security/Makefile 2011-06-27 10:18:40.000000000 -0700
-+++ ./jdk/make/java/security/Makefile 2011-05-12 20:58:11.000000000 -0700
-@@ -47,7 +47,14 @@
+--- ./jdk/make/java/security/Makefile 2011-11-17 21:55:43.000000000 -0800
++++ ./jdk/make/java/security/Makefile 2011-07-15 21:28:12.000000000 -0700
+@@ -47,7 +47,7 @@
# Register Microsoft CryptoAPI provider only on Windows platform.
ifeq ($(PLATFORM), windows)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
-endif
-+else # windows
-+
-+ifeq ($(PLATFORM), bsd)
-+ ifeq ($(OS_VENDOR), OpenBSD)
-+ PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-openbsd
-+ endif
-+endif # bsd
+endif # windows
endif # PLATFORM
---- ./jdk/make/java/zip/FILES_c.gmk 2011-06-27 10:18:43.000000000 -0700
+--- ./jdk/make/java/zip/FILES_c.gmk 2011-11-17 21:55:44.000000000 -0800
+++ ./jdk/make/java/zip/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -29,7 +29,10 @@
Deflater.c \
@@ -16535,7 +15871,7 @@
- zutil.c
+ zutil.c
+endif
---- ./jdk/make/java/zip/Makefile 2011-06-27 10:18:43.000000000 -0700
+--- ./jdk/make/java/zip/Makefile 2011-11-17 21:55:44.000000000 -0800
+++ ./jdk/make/java/zip/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -74,16 +74,24 @@
CPPFLAGS += -UDEBUG
@@ -16563,7 +15899,7 @@
OTHER_LDLIBS = $(JVMLIB)
+endif
+
---- ./jdk/make/javax/sound/FILES_c.gmk 2011-06-27 10:18:47.000000000 -0700
+--- ./jdk/make/javax/sound/FILES_c.gmk 2011-11-17 21:55:46.000000000 -0800
+++ ./jdk/make/javax/sound/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -34,6 +34,8 @@
@@ -16574,7 +15910,7 @@
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
---- ./jdk/make/javax/sound/Makefile 2011-06-27 10:18:47.000000000 -0700
+--- ./jdk/make/javax/sound/Makefile 2011-11-17 21:55:47.000000000 -0800
+++ ./jdk/make/javax/sound/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -105,6 +105,22 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
@@ -16599,7 +15935,7 @@
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk 2011-06-27 10:18:47.000000000 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk 2011-11-17 21:55:47.000000000 -0800
+++ ./jdk/make/javax/sound/SoundDefs.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
@@ -16612,7 +15948,7 @@
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
---- ./jdk/make/javax/sound/jsoundalsa/Makefile 2011-06-27 10:18:47.000000000 -0700
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile 2011-11-17 21:55:47.000000000 -0800
+++ ./jdk/make/javax/sound/jsoundalsa/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -51,6 +51,7 @@
$(PORTFILES_c)
@@ -16664,7 +16000,7 @@
#
# Add to the ambient VPATH.
---- ./jdk/make/jpda/back/Makefile 2011-06-27 10:18:51.000000000 -0700
+--- ./jdk/make/jpda/back/Makefile 2011-11-17 21:55:48.000000000 -0800
+++ ./jdk/make/jpda/back/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -49,7 +49,7 @@
-I$(GENNATIVESRCDIR)/jdwp
@@ -16675,7 +16011,7 @@
endif # PLATFORM
#
---- ./jdk/make/jpda/transport/socket/Makefile 2011-06-27 10:18:52.000000000 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile 2011-11-17 21:55:49.000000000 -0800
+++ ./jdk/make/jpda/transport/socket/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -40,6 +40,11 @@
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
@@ -16689,7 +16025,7 @@
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET)
endif
---- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2011-06-27 10:19:02.000000000 -0700
+--- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2011-11-17 21:55:54.000000000 -0800
+++ ./jdk/make/mkdemo/jvmti/hprof/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -37,12 +37,11 @@
@@ -16708,7 +16044,7 @@
endif
#
---- ./jdk/make/sun/awt/Makefile 2011-06-27 10:19:25.000000000 -0700
+--- ./jdk/make/sun/awt/Makefile 2011-11-17 21:55:58.000000000 -0800
+++ ./jdk/make/sun/awt/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -93,7 +93,7 @@
ifeq ($(PLATFORM), solaris)
@@ -16789,7 +16125,7 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mawt.gmk 2011-06-27 10:19:26.000000000 -0700
+--- ./jdk/make/sun/awt/mawt.gmk 2011-11-17 21:55:58.000000000 -0800
+++ ./jdk/make/sun/awt/mawt.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
@@ -16853,7 +16189,7 @@
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
---- ./jdk/make/sun/font/Makefile 2011-06-27 10:19:29.000000000 -0700
+--- ./jdk/make/sun/font/Makefile 2011-11-17 21:55:58.000000000 -0800
+++ ./jdk/make/sun/font/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -172,6 +172,15 @@
# Libraries to link, and other C flags.
@@ -16879,7 +16215,7 @@
endif # PLATFORM
---- ./jdk/make/sun/image/generic/Makefile 2011-06-27 10:19:32.000000000 -0700
+--- ./jdk/make/sun/image/generic/Makefile 2011-11-17 21:55:59.000000000 -0800
+++ ./jdk/make/sun/image/generic/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -70,6 +70,6 @@
OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
@@ -16889,7 +16225,7 @@
+ OTHER_LDLIBS = $(LIBM) $(LIBDL)
endif
---- ./jdk/make/sun/image/vis/Makefile 2011-06-27 10:19:32.000000000 -0700
+--- ./jdk/make/sun/image/vis/Makefile 2011-11-17 21:55:59.000000000 -0800
+++ ./jdk/make/sun/image/vis/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -68,5 +68,5 @@
CFLAGS += $(CFLAGS_$(ARCH)) $(INLINE) -I$(PLATFORM_SRC)/native/sun/awt/medialib -I$(SHARE_SRC)/native/sun/awt/medialib
@@ -16898,7 +16234,7 @@
-OTHER_LDLIBS = $(LIBM) -ldl
+OTHER_LDLIBS = $(LIBM) $(LIBDL)
---- ./jdk/make/sun/jawt/Makefile 2011-06-27 10:19:39.000000000 -0700
+--- ./jdk/make/sun/jawt/Makefile 2011-11-17 21:56:00.000000000 -0800
+++ ./jdk/make/sun/jawt/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -92,8 +92,7 @@
#
@@ -16935,7 +16271,7 @@
#
# Lets not remove any class files.
#
---- ./jdk/make/sun/jdga/Makefile 2011-06-27 10:19:40.000000000 -0700
+--- ./jdk/make/sun/jdga/Makefile 2011-11-17 21:56:00.000000000 -0800
+++ ./jdk/make/sun/jdga/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -55,7 +55,7 @@
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
@@ -16946,7 +16282,7 @@
CPPFLAGS += \
-I$(SHARE_SRC)/javavm/export \
---- ./jdk/make/sun/rmi/rmi/Makefile 2011-06-27 10:19:48.000000000 -0700
+--- ./jdk/make/sun/rmi/rmi/Makefile 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/rmi/rmi/Makefile 2011-05-20 20:16:38.000000000 -0700
@@ -97,6 +97,9 @@
BUILD_TARGETS += bin
@@ -16958,7 +16294,7 @@
build: $(BUILD_TARGETS)
---- ./jdk/make/sun/security/ec/Makefile 2011-06-27 10:19:49.000000000 -0700
+--- ./jdk/make/sun/security/ec/Makefile 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/security/ec/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -192,7 +192,7 @@
ifeq ($(PLATFORM), windows)
@@ -16969,7 +16305,7 @@
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2011-06-27 10:19:50.000000000 -0700
+--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -71,6 +71,6 @@
#
@@ -16980,7 +16316,7 @@
+ifeq ($(PLATFORM), windows)
+OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
endif
---- ./jdk/make/sun/security/krb5/Makefile 2011-06-27 10:19:50.000000000 -0700
+--- ./jdk/make/sun/security/krb5/Makefile 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/security/krb5/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -75,7 +75,7 @@
ifeq ($(PLATFORM), windows)
@@ -16991,7 +16327,7 @@
endif
build:
---- ./jdk/make/sun/security/pkcs11/Makefile 2011-06-27 10:19:51.000000000 -0700
+--- ./jdk/make/sun/security/pkcs11/Makefile 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/security/pkcs11/Makefile 2011-06-21 05:39:00.000000000 -0700
@@ -156,10 +156,10 @@
#
@@ -17006,7 +16342,7 @@
endif
# Other config files
---- ./jdk/make/sun/security/smartcardio/Makefile 2011-06-27 10:19:52.000000000 -0700
+--- ./jdk/make/sun/security/smartcardio/Makefile 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/security/smartcardio/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -75,6 +75,6 @@
ifeq ($(PLATFORM), windows)
@@ -17016,7 +16352,7 @@
+ OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
OTHER_CFLAGS = -D__sun_jdk
endif
---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2011-06-27 10:19:53.000000000 -0700
+--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -49,18 +49,6 @@
dgif_lib.c \
@@ -17056,7 +16392,7 @@
+ zcrc32.c \
+ zutil.c
+endif
---- ./jdk/make/sun/splashscreen/Makefile 2011-06-27 10:19:53.000000000 -0700
+--- ./jdk/make/sun/splashscreen/Makefile 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/splashscreen/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -63,8 +63,24 @@
@@ -17108,7 +16444,7 @@
# Shun the less than portable MMX assembly code in pnggccrd.c,
# and use alternative implementations in C.
---- ./jdk/make/sun/tracing/dtrace/Makefile 2011-06-27 10:19:55.000000000 -0700
+--- ./jdk/make/sun/tracing/dtrace/Makefile 2011-11-17 21:56:01.000000000 -0800
+++ ./jdk/make/sun/tracing/dtrace/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -55,7 +55,7 @@
FILES_export = $(FILES_java)
@@ -17119,7 +16455,7 @@
endif
#
---- ./jdk/make/sun/xawt/Makefile 2011-06-27 10:19:56.000000000 -0700
+--- ./jdk/make/sun/xawt/Makefile 2011-11-17 21:56:02.000000000 -0800
+++ ./jdk/make/sun/xawt/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -47,6 +47,9 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -17192,7 +16528,7 @@
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
---- ./jdk/make/tools/freetypecheck/Makefile 2011-06-27 10:20:36.000000000 -0700
+--- ./jdk/make/tools/freetypecheck/Makefile 2011-11-17 21:56:08.000000000 -0800
+++ ./jdk/make/tools/freetypecheck/Makefile 2011-04-22 23:08:17.000000000 -0700
@@ -49,8 +49,15 @@
# Add runtime lib search path to ensure test will be runnable
@@ -17211,7 +16547,7 @@
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
---- ./jdk/make/tools/reorder/Makefile 2011-06-27 10:20:38.000000000 -0700
+--- ./jdk/make/tools/reorder/Makefile 2011-11-17 21:56:09.000000000 -0800
+++ ./jdk/make/tools/reorder/Makefile 2011-04-22 23:08:17.000000000 -0700
@@ -185,11 +185,11 @@
@@ -17227,7 +16563,7 @@
# Reorder libraries.
---- ./jdk/src/bsd/doc/man/ja/jvisualvm.1 2011-06-27 23:25:37.000000000 -0700
+--- ./jdk/src/bsd/doc/man/ja/jvisualvm.1 2012-03-04 16:33:48.000000000 -0800
+++ ./jdk/src/bsd/doc/man/ja/jvisualvm.1 1969-12-31 16:00:00.000000000 -0800
@@ -1,126 +0,0 @@
-." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -17759,7 +17095,7 @@
+¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢UNIX ¤Î
+.BI ps
+¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢¹¶·â¼Ô¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
---- ./jdk/src/bsd/doc/man/jvisualvm.1 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/bsd/doc/man/jvisualvm.1 2012-03-04 16:33:48.000000000 -0800
+++ ./jdk/src/bsd/doc/man/jvisualvm.1 1969-12-31 16:00:00.000000000 -0800
@@ -1,104 +0,0 @@
-." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -17866,7 +17202,7 @@
-\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP
-.LP
-
---- ./jdk/src/share/back/commonRef.c 2011-06-27 10:21:43.000000000 -0700
+--- ./jdk/src/share/back/commonRef.c 2011-11-17 21:56:19.000000000 -0800
+++ ./jdk/src/share/back/commonRef.c 2011-04-22 23:08:18.000000000 -0700
@@ -23,6 +23,10 @@
* questions.
@@ -17879,7 +17215,7 @@
#include "util.h"
#include "commonRef.h"
---- ./jdk/src/share/bin/java.c 2011-06-27 10:21:51.000000000 -0700
+--- ./jdk/src/share/bin/java.c 2011-11-17 21:56:19.000000000 -0800
+++ ./jdk/src/share/bin/java.c 2011-04-22 23:08:18.000000000 -0700
@@ -70,6 +70,10 @@
static jboolean printXUsage = JNI_FALSE; /* print and exit*/
@@ -17977,7 +17313,7 @@
static void
DumpState()
{
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2011-06-27 10:22:33.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2011-11-17 21:56:27.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2011-04-22 23:08:19.000000000 -0700
@@ -477,6 +477,10 @@
String[] dirs = new String[] {
@@ -17990,7 +17326,7 @@
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
---- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2011-06-27 10:23:47.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2011-11-17 21:56:38.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2011-04-22 23:08:19.000000000 -0700
@@ -78,6 +78,9 @@
*/
@@ -18002,7 +17338,7 @@
/**
---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2012-03-04 16:33:48.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 1969-12-31 16:00:00.000000000 -0800
@@ -1,6 +0,0 @@
-# service provider file for Bsd: with DirectAudioDeviceProvider
@@ -18011,7 +17347,7 @@
-com.sun.media.sound.SimpleInputDeviceProvider
-com.sun.media.sound.DirectAudioDeviceProvider
-com.sun.media.sound.HeadspaceMixerProvider
---- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -18207,7 +17543,7 @@
- }
-
-}
---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2011-06-27 10:26:57.000000000 -0700
+--- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2011-11-17 21:57:19.000000000 -0800
+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2011-04-22 23:08:22.000000000 -0700
@@ -172,7 +172,12 @@
} else {
@@ -18223,7 +17559,7 @@
(System.getenv("DISPLAY") == null));
}
} else if (nm.equals("true")) {
---- ./jdk/src/share/classes/java/util/TimeZone.java 2011-06-27 10:30:46.000000000 -0700
+--- ./jdk/src/share/classes/java/util/TimeZone.java 2011-11-17 21:58:07.000000000 -0800
+++ ./jdk/src/share/classes/java/util/TimeZone.java 2011-04-22 23:08:24.000000000 -0700
@@ -849,15 +849,13 @@
}
@@ -18242,9 +17578,9 @@
}
return zi;
}
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2011-06-27 10:36:21.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2011-04-22 23:08:28.000000000 -0700
-@@ -1131,7 +1131,7 @@
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2011-11-17 21:59:04.000000000 -0800
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2012-02-26 15:38:42.000000000 -0800
+@@ -1146,7 +1146,7 @@
*/
HashMap<String, Boolean> existsMap;
public boolean needToSearchForFile(String fileName) {
@@ -18253,7 +17589,7 @@
return false;
} else if (existsMap == null) {
existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2011-06-27 10:36:23.000000000 -0700
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java 2011-11-17 21:59:04.000000000 -0800
+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2011-04-22 23:08:28.000000000 -0700
@@ -39,6 +39,7 @@
WINDOWS,
@@ -18278,7 +17614,7 @@
// determine another OS here
}
---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2011-06-27 10:36:40.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java 2011-11-17 21:59:07.000000000 -0800
+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2011-04-22 23:08:28.000000000 -0700
@@ -48,6 +48,8 @@
@@ -18301,7 +17637,7 @@
String t2kStr = System.getProperty("sun.java2d.font.scaler");
if (t2kStr != null) {
useT2K = "t2k".equals(t2kStr);
---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2011-06-27 10:36:43.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2011-11-17 21:59:08.000000000 -0800
+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2011-04-22 23:08:28.000000000 -0700
@@ -413,7 +413,7 @@
* registerFonts method as on-screen these JRE fonts
@@ -18312,7 +17648,7 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,190 +0,0 @@
-/*
@@ -18505,7 +17841,7 @@
- return charOff - outOff;
- }
-}
---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -18701,7 +18037,7 @@
- return 2;
- }
-}
---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,370 +0,0 @@
-/*
@@ -19074,7 +18410,7 @@
- }
- }
-}
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2011-06-27 10:38:48.000000000 -0700
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2011-11-17 21:59:35.000000000 -0800
+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2011-04-22 23:08:30.000000000 -0700
@@ -1534,7 +1534,9 @@
pFlags |= NOSHEET;
@@ -19087,7 +18423,7 @@
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2011-06-27 10:39:43.000000000 -0700
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2011-11-17 21:59:53.000000000 -0800
+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2011-04-22 23:08:31.000000000 -0700
@@ -83,7 +83,9 @@
String osname = System.getProperty("os.name");
@@ -19100,14 +18436,14 @@
gssLibs = new String[]{
"libgssapi.so",
"libgssapi_krb5.so",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2011-06-27 10:42:16.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2011-11-17 22:00:16.000000000 -0800
+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2011-04-22 23:08:32.000000000 -0700
@@ -30,3 +30,4 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[bsd]sun.tools.attach.BsdAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java 2011-06-27 10:42:17.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2011-11-17 22:00:16.000000000 -0800
+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2011-04-22 23:08:32.000000000 -0700
@@ -51,6 +51,7 @@
String zname = "";
@@ -19179,7 +18515,7 @@
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2011-06-27 10:42:17.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2011-11-17 22:00:16.000000000 -0800
+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2011-04-22 23:08:32.000000000 -0700
@@ -44,6 +44,8 @@
{0} : could not create directory
@@ -19190,7 +18526,7 @@
out.added.manifest=\
added manifest
out.update.manifest=\
---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-06-27 10:44:42.000000000 -0700
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-11-17 22:00:40.000000000 -0800
+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-04-22 23:08:34.000000000 -0700
@@ -38,6 +38,7 @@
# gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
@@ -19230,279 +18566,7 @@
# Common -I options
CFLAGS += -I.
CFLAGS += -I../agent_util
---- ./jdk/src/share/lib/security/java.security-openbsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/lib/security/java.security-openbsd 2011-04-22 23:08:35.000000000 -0700
-@@ -0,0 +1,269 @@
-+#
-+# This is the "master security properties file".
-+#
-+# In this file, various security properties are set for use by
-+# java.security classes. This is where users can statically register
-+# Cryptography Package Providers ("providers" for short). The term
-+# "provider" refers to a package or set of packages that supply a
-+# concrete implementation of a subset of the cryptography aspects of
-+# the Java Security API. A provider may, for example, implement one or
-+# more digital signature algorithms or message digest algorithms.
-+#
-+# Each provider must implement a subclass of the Provider class.
-+# To register a provider in this master security properties file,
-+# specify the Provider subclass name and priority in the format
-+#
-+# security.provider.<n>=<className>
-+#
-+# This declares a provider, and specifies its preference
-+# order n. The preference order is the order in which providers are
-+# searched for requested algorithms (when no specific provider is
-+# requested). The order is 1-based; 1 is the most preferred, followed
-+# by 2, and so on.
-+#
-+# <className> must specify the subclass of the Provider class whose
-+# constructor sets the values of various properties that are required
-+# for the Java Security API to look up the algorithms or other
-+# facilities implemented by the provider.
-+#
-+# There must be at least one provider specification in java.security.
-+# There is a default provider that comes standard with the JDK. It
-+# is called the "SUN" provider, and its Provider subclass
-+# named Sun appears in the sun.security.provider package. Thus, the
-+# "SUN" provider is registered via the following:
-+#
-+# security.provider.1=sun.security.provider.Sun
-+#
-+# (The number 1 is used for the default provider.)
-+#
-+# Note: Providers can be dynamically registered instead by calls to
-+# either the addProvider or insertProviderAt method in the Security
-+# class.
-+
-+#
-+# List of providers and their preference orders (see above):
-+#
-+security.provider.1=sun.security.provider.Sun
-+security.provider.2=sun.security.rsa.SunRsaSign
-+security.provider.3=sun.security.ec.SunEC
-+security.provider.4=com.sun.net.ssl.internal.ssl.Provider
-+security.provider.5=com.sun.crypto.provider.SunJCE
-+security.provider.6=sun.security.jgss.SunProvider
-+security.provider.7=com.sun.security.sasl.Provider
-+security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-+security.provider.9=sun.security.smartcardio.SunPCSC
-+
-+#
-+# Select the source of seed data for SecureRandom. By default an
-+# attempt is made to use the entropy gathering device specified by
-+# the securerandom.source property. If an exception occurs when
-+# accessing the URL then the traditional system/thread activity
-+# algorithm is used.
-+#
-+# On Solaris and Linux systems, if file:/dev/urandom is specified and it
-+# exists, a special SecureRandom implementation is activated by default.
-+# This "NativePRNG" reads random bytes directly from /dev/urandom.
-+#
-+# On Windows systems, the URLs file:/dev/random and file:/dev/urandom
-+# enables use of the Microsoft CryptoAPI seed functionality.
-+#
-+# On OpenBSD use file:///dev/srandom for strong but blocking random
-+# generator, file:/dev/random for hardware random generators,
-+# file:///dev/arandom for non-blocking high-quality pseudo-random
-+# data and file:///dev/urandom for non-blocking random data that
-+# does not guarantee the data to be strong. See random(4) for more
-+# info.
-+#
-+securerandom.source=file:///dev/arandom
-+#
-+# The entropy gathering device is described as a URL and can also
-+# be specified with the system property "java.security.egd". For example,
-+# -Djava.security.egd=file:/dev/urandom
-+# Specifying this system property will override the securerandom.source
-+# setting.
-+
-+#
-+# Class to instantiate as the javax.security.auth.login.Configuration
-+# provider.
-+#
-+login.configuration.provider=com.sun.security.auth.login.ConfigFile
-+
-+#
-+# Default login configuration file
-+#
-+#login.config.url.1=file:${user.home}/.java.login.config
-+
-+#
-+# Class to instantiate as the system Policy. This is the name of the class
-+# that will be used as the Policy object.
-+#
-+policy.provider=sun.security.provider.PolicyFile
-+
-+# The default is to have a single system-wide policy file,
-+# and a policy file in the user's home directory.
-+policy.url.1=file:${java.home}/lib/security/java.policy
-+policy.url.2=file:${user.home}/.java.policy
-+
-+# whether or not we expand properties in the policy file
-+# if this is set to false, properties (${...}) will not be expanded in policy
-+# files.
-+policy.expandProperties=true
-+
-+# whether or not we allow an extra policy to be passed on the command line
-+# with -Djava.security.policy=somefile. Comment out this line to disable
-+# this feature.
-+policy.allowSystemProperty=true
-+
-+# whether or not we look into the IdentityScope for trusted Identities
-+# when encountering a 1.1 signed JAR file. If the identity is found
-+# and is trusted, we grant it AllPermission.
-+policy.ignoreIdentityScope=false
-+
-+#
-+# Default keystore type.
-+#
-+keystore.type=jks
-+
-+#
-+# Class to instantiate as the system scope:
-+#
-+system.scope=sun.security.provider.IdentityDatabase
-+
-+#
-+# List of comma-separated packages that start with or equal this string
-+# will cause a security exception to be thrown when
-+# passed to checkPackageAccess unless the
-+# corresponding RuntimePermission ("accessClassInPackage."+package) has
-+# been granted.
-+package.access=sun.,com.sun.imageio.
-+
-+#
-+# List of comma-separated packages that start with or equal this string
-+# will cause a security exception to be thrown when
-+# passed to checkPackageDefinition unless the
-+# corresponding RuntimePermission ("defineClassInPackage."+package) has
-+# been granted.
-+#
-+# by default, no packages are restricted for definition, and none of
-+# the class loaders supplied with the JDK call checkPackageDefinition.
-+#
-+#package.definition=
-+
-+#
-+# Determines whether this properties file can be appended to
-+# or overridden on the command line via -Djava.security.properties
-+#
-+security.overridePropertiesFile=true
-+
-+#
-+# Determines the default key and trust manager factory algorithms for
-+# the javax.net.ssl package.
-+#
-+ssl.KeyManagerFactory.algorithm=SunX509
-+ssl.TrustManagerFactory.algorithm=PKIX
-+
-+#
-+# The Java-level namelookup cache policy for successful lookups:
-+#
-+# any negative value: caching forever
-+# any positive value: the number of seconds to cache an address for
-+# zero: do not cache
-+#
-+# default value is forever (FOREVER). For security reasons, this
-+# caching is made forever when a security manager is set. When a security
-+# manager is not set, the default behavior in this implementation
-+# is to cache for 30 seconds.
-+#
-+# NOTE: setting this to anything other than the default value can have
-+# serious security implications. Do not set it unless
-+# you are sure you are not exposed to DNS spoofing attack.
-+#
-+#networkaddress.cache.ttl=-1
-+
-+# The Java-level namelookup cache policy for failed lookups:
-+#
-+# any negative value: cache forever
-+# any positive value: the number of seconds to cache negative lookup results
-+# zero: do not cache
-+#
-+# In some Microsoft Windows networking environments that employ
-+# the WINS name service in addition to DNS, name service lookups
-+# that fail may take a noticeably long time to return (approx. 5 seconds).
-+# For this reason the default caching policy is to maintain these
-+# results for 10 seconds.
-+#
-+#
-+networkaddress.cache.negative.ttl=10
-+
-+#
-+# Properties to configure OCSP for certificate revocation checking
-+#
-+
-+# Enable OCSP
-+#
-+# By default, OCSP is not used for certificate revocation checking.
-+# This property enables the use of OCSP when set to the value "true".
-+#
-+# NOTE: SocketPermission is required to connect to an OCSP responder.
-+#
-+# Example,
-+# ocsp.enable=true
-+
-+#
-+# Location of the OCSP responder
-+#
-+# By default, the location of the OCSP responder is determined implicitly
-+# from the certificate being validated. This property explicitly specifies
-+# the location of the OCSP responder. The property is used when the
-+# Authority Information Access extension (defined in RFC 3280) is absent
-+# from the certificate or when it requires overriding.
-+#
-+# Example,
-+# ocsp.responderURL=http://ocsp.example.net:80
-+
-+#
-+# Subject name of the OCSP responder's certificate
-+#
-+# By default, the certificate of the OCSP responder is that of the issuer
-+# of the certificate being validated. This property identifies the certificate
-+# of the OCSP responder when the default does not apply. Its value is a string
-+# distinguished name (defined in RFC 2253) which identifies a certificate in
-+# the set of certificates supplied during cert path validation. In cases where
-+# the subject name alone is not sufficient to uniquely identify the certificate
-+# then both the "ocsp.responderCertIssuerName" and
-+# "ocsp.responderCertSerialNumber" properties must be used instead. When this
-+# property is set then those two properties are ignored.
-+#
-+# Example,
-+# ocsp.responderCertSubjectName="CN=OCSP Responder, O=XYZ Corp"
-+
-+#
-+# Issuer name of the OCSP responder's certificate
-+#
-+# By default, the certificate of the OCSP responder is that of the issuer
-+# of the certificate being validated. This property identifies the certificate
-+# of the OCSP responder when the default does not apply. Its value is a string
-+# distinguished name (defined in RFC 2253) which identifies a certificate in
-+# the set of certificates supplied during cert path validation. When this
-+# property is set then the "ocsp.responderCertSerialNumber" property must also
-+# be set. When the "ocsp.responderCertSubjectName" property is set then this
-+# property is ignored.
-+#
-+# Example,
-+# ocsp.responderCertIssuerName="CN=Enterprise CA, O=XYZ Corp"
-+
-+#
-+# Serial number of the OCSP responder's certificate
-+#
-+# By default, the certificate of the OCSP responder is that of the issuer
-+# of the certificate being validated. This property identifies the certificate
-+# of the OCSP responder when the default does not apply. Its value is a string
-+# of hexadecimal digits (colon or space separators may be present) which
-+# identifies a certificate in the set of certificates supplied during cert path
-+# validation. When this property is set then the "ocsp.responderCertIssuerName"
-+# property must also be set. When the "ocsp.responderCertSubjectName" property
-+# is set then this property is ignored.
-+#
-+# Example,
-+# ocsp.responderCertSerialNumber=2A:FF:00
-+
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-06-27 10:45:30.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-11-17 22:00:50.000000000 -0800
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-04-22 23:08:35.000000000 -0700
@@ -32,6 +32,10 @@
#include <unistd.h>
@@ -19529,7 +18593,7 @@
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2011-06-27 10:45:30.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2011-11-17 22:00:50.000000000 -0800
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2011-04-22 23:08:35.000000000 -0700
@@ -22,6 +22,9 @@
* or visit www.oracle.com if you need additional information or have any
@@ -19571,7 +18635,7 @@
true));
}
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2011-06-27 10:45:32.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2011-11-17 22:00:50.000000000 -0800
+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2011-04-22 23:08:35.000000000 -0700
@@ -33,7 +33,11 @@
@@ -19585,7 +18649,7 @@
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2011-06-27 10:45:33.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2011-11-17 22:00:50.000000000 -0800
+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2011-04-22 23:08:35.000000000 -0700
@@ -99,5 +99,24 @@
return com_sun_media_sound_Platform_LIB_ALSA;
@@ -19612,7 +18676,7 @@
+#endif
return 0;
}
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-06-27 10:45:34.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-11-17 22:00:51.000000000 -0800
+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-04-22 23:08:35.000000000 -0700
@@ -31,6 +31,7 @@
#define X_WINDOWS 1
@@ -19641,7 +18705,7 @@
+
+
#endif // __SOUNDDEFS_INCLUDED__
---- ./jdk/src/share/native/common/check_code.c 2011-06-27 10:45:35.000000000 -0700
+--- ./jdk/src/share/native/common/check_code.c 2011-11-17 22:00:51.000000000 -0800
+++ ./jdk/src/share/native/common/check_code.c 2011-04-22 23:08:35.000000000 -0700
@@ -1067,7 +1067,7 @@
* Make sure that branches don't go into the middle of nowhere.
@@ -19704,7 +18768,7 @@
/* There can't be more than 64K labels because of the limit
* on per-method byte code length.
*/
---- ./jdk/src/share/native/java/io/io_util.h 2011-06-27 10:45:38.000000000 -0700
+--- ./jdk/src/share/native/java/io/io_util.h 2011-11-17 22:00:51.000000000 -0800
+++ ./jdk/src/share/native/java/io/io_util.h 2011-04-22 23:08:35.000000000 -0700
@@ -29,7 +29,15 @@
extern jfieldID IO_fd_fdID;
@@ -19723,8 +18787,8 @@
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2011-06-27 10:45:41.000000000 -0700
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2011-04-22 23:08:35.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2011-11-17 22:00:51.000000000 -0800
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2012-02-26 15:38:42.000000000 -0800
@@ -24,6 +24,15 @@
* questions.
*/
@@ -19751,8 +18815,8 @@
#define __HI(x) *(1+(int*)&x)
#define __LO(x) *(int*)&x
#define __HIp(x) *(1+(int*)x)
---- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2011-06-27 10:45:41.000000000 -0700
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2011-04-22 23:08:35.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2011-11-17 22:00:51.000000000 -0800
++++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2012-02-26 15:38:42.000000000 -0800
@@ -61,7 +61,7 @@
#define log1p jlog1p
#define expm1 jexpm1
@@ -19761,8 +18825,8 @@
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
- #define __ieee754_acosh __j__ieee754_acosh
---- ./jdk/src/share/native/java/util/zip/Inflater.c 2011-06-27 10:45:56.000000000 -0700
+ #define __ieee754_log __j__ieee754_log
+--- ./jdk/src/share/native/java/util/zip/Inflater.c 2011-11-17 22:00:54.000000000 -0800
+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2011-04-22 23:08:35.000000000 -0700
@@ -65,6 +65,10 @@
return jlong_zero;
@@ -19786,7 +18850,7 @@
}
JNIEXPORT void JNICALL
---- ./jdk/src/share/native/java/util/zip/zip_util.c 2011-06-27 10:45:56.000000000 -0700
+--- ./jdk/src/share/native/java/util/zip/zip_util.c 2011-11-17 22:00:55.000000000 -0800
+++ ./jdk/src/share/native/java/util/zip/zip_util.c 2011-04-22 23:08:35.000000000 -0700
@@ -46,6 +46,11 @@
#include "zip_util.h"
@@ -19800,7 +18864,7 @@
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
#include <sys/mman.h>
---- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2011-06-27 10:46:03.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2011-11-17 22:00:57.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2011-04-22 23:08:35.000000000 -0700
@@ -50,7 +50,9 @@
#include <stdio.h>
@@ -19812,7 +18876,7 @@
#include <limits.h>
/* keep these after the other headers */
---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2011-06-27 10:46:04.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2011-11-17 22:00:57.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2011-04-22 23:08:35.000000000 -0700
@@ -24,7 +24,11 @@
*/
@@ -19826,7 +18890,7 @@
#include "sun_awt_image_BufImgSurfaceData.h"
---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2011-06-27 10:46:05.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2011-11-17 22:00:57.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2011-04-22 23:08:35.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
@@ -19840,7 +18904,7 @@
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2011-06-27 10:46:30.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2011-11-17 22:01:00.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2011-04-22 23:08:36.000000000 -0700
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -19881,7 +18945,7 @@
#endif /* _NO_LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2011-06-27 10:46:31.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2011-11-17 22:01:00.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -19922,7 +18986,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2011-06-27 10:46:31.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2011-11-17 22:01:00.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -19963,7 +19027,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2011-06-27 10:46:32.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2011-11-17 22:01:00.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -20004,7 +19068,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2011-06-27 10:46:32.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2011-11-17 22:01:00.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -20045,7 +19109,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2011-06-27 10:46:32.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2011-11-17 22:01:01.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -20086,7 +19150,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2011-06-27 10:46:32.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2011-11-17 22:01:01.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -20127,7 +19191,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2011-06-27 10:46:33.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2011-11-17 22:01:01.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2011-04-22 23:08:36.000000000 -0700
@@ -95,7 +95,7 @@
dst = dp[0];
@@ -20348,7 +19412,7 @@
}
#else /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2011-06-27 10:46:34.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2011-11-17 22:01:01.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2011-04-22 23:08:36.000000000 -0700
@@ -168,7 +168,7 @@
}
@@ -20630,7 +19694,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2011-06-27 10:46:34.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2011-11-17 22:01:01.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2011-04-22 23:08:36.000000000 -0700
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -20783,7 +19847,7 @@
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2011-06-27 10:46:34.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2011-11-17 22:01:01.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2011-04-22 23:08:36.000000000 -0700
@@ -30,7 +30,7 @@
typedef union {
@@ -20794,7 +19858,7 @@
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2011-06-27 10:46:37.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2011-11-17 22:01:02.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2011-04-22 23:08:36.000000000 -0700
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
@@ -20894,7 +19958,7 @@
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2011-06-27 10:46:38.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2011-11-17 22:01:02.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2011-04-22 23:08:36.000000000 -0700
@@ -120,7 +120,7 @@
} \
@@ -22128,7 +21192,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2011-06-27 10:46:39.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2011-11-17 22:01:02.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2011-04-22 23:08:36.000000000 -0700
@@ -27,6 +27,16 @@
#ifndef MLIB_IMAGE_H
@@ -22147,7 +21211,7 @@
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2011-06-27 10:46:40.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2011-11-17 22:01:02.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2011-04-22 23:08:36.000000000 -0700
@@ -26,9 +26,15 @@
@@ -22179,7 +21243,7 @@
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2011-06-27 10:46:40.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2011-11-17 22:01:02.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2011-04-22 23:08:36.000000000 -0700
@@ -59,7 +59,10 @@
@@ -22193,7 +21257,7 @@
#include <stdint.h> /* for uintptr_t */
#include <malloc.h> /* for ptrdiff_t */
#else
---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-06-27 10:46:42.000000000 -0700
+--- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-11-17 22:01:02.000000000 -0800
+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-04-22 23:08:36.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
@@ -22207,7 +21271,7 @@
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2011-06-27 10:46:42.000000000 -0700
+--- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2011-11-17 22:01:03.000000000 -0800
+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2011-04-22 23:08:36.000000000 -0700
@@ -26,7 +26,11 @@
#include "jlong.h"
@@ -22221,7 +21285,7 @@
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
---- ./jdk/src/share/native/sun/font/sunFont.c 2011-06-27 10:47:08.000000000 -0700
+--- ./jdk/src/share/native/sun/font/sunFont.c 2011-11-17 22:01:06.000000000 -0800
+++ ./jdk/src/share/native/sun/font/sunFont.c 2011-04-22 23:08:36.000000000 -0700
@@ -24,7 +24,9 @@
*/
@@ -22233,7 +21297,7 @@
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2011-06-27 10:47:08.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2011-11-17 22:01:07.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2011-04-22 23:08:36.000000000 -0700
@@ -28,7 +28,11 @@
#include "jni_util.h"
@@ -22247,7 +21311,7 @@
#include "string.h"
/**
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2011-06-27 10:47:31.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2011-11-17 22:01:09.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2011-04-22 23:08:36.000000000 -0700
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
@@ -22259,7 +21323,7 @@
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2011-06-27 10:47:32.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2011-11-17 22:01:10.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2011-04-22 23:08:36.000000000 -0700
@@ -25,7 +25,11 @@
@@ -22273,7 +21337,7 @@
#include "sun_java2d_pipe_BufferedOpCodes.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-06-27 10:47:33.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-11-17 22:01:10.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-04-22 23:08:36.000000000 -0700
@@ -25,7 +25,11 @@
@@ -22287,7 +21351,7 @@
#include <math.h>
#include <jlong.h>
---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2011-06-27 10:47:38.000000000 -0700
+--- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2011-11-17 22:01:11.000000000 -0800
+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2011-05-20 20:04:18.000000000 -0700
@@ -28,6 +28,7 @@
#include <winsock2.h>
@@ -22297,7 +21361,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-06-27 10:47:42.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-11-17 22:01:12.000000000 -0800
+++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-06-07 20:03:04.000000000 -0700
@@ -57,6 +57,14 @@
typedef enum { B_FALSE, B_TRUE } boolean_t;
@@ -22314,7 +21378,7 @@
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-06-27 10:47:42.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-11-17 22:01:12.000000000 -0800
+++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-06-07 20:03:04.000000000 -0700
@@ -39,9 +39,9 @@
#include <sys/types.h>
@@ -22328,7 +21392,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-06-27 10:47:47.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-11-17 22:01:13.000000000 -0800
+++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-06-07 20:03:04.000000000 -0700
@@ -38,9 +38,9 @@
#include <sys/types.h>
@@ -22342,7 +21406,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-06-27 10:47:47.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-11-17 22:01:13.000000000 -0800
+++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-06-07 20:03:04.000000000 -0700
@@ -43,9 +43,9 @@
#include <sys/types.h>
@@ -22356,8 +21420,8 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/transport/socket/socketTransport.c 2011-06-27 10:48:16.000000000 -0700
-+++ ./jdk/src/share/transport/socket/socketTransport.c 2011-04-22 23:08:37.000000000 -0700
+--- ./jdk/src/share/transport/socket/socketTransport.c 2011-11-17 22:01:19.000000000 -0800
++++ ./jdk/src/share/transport/socket/socketTransport.c 2012-02-12 13:05:35.000000000 -0800
@@ -65,6 +65,9 @@
#define HEADER_SIZE 11
#define MAX_DATA_SIZE 1000
@@ -22410,7 +21474,7 @@
RETURN_IO_ERROR("send failed");
}
}
-@@ -575,13 +578,33 @@
+@@ -575,7 +578,7 @@
return JDWPTRANSPORT_ERROR_NONE;
}
@@ -22419,11 +21483,17 @@
recv_fully(int f, char *buf, int len)
{
int nbytes = 0;
- while (nbytes < len) {
- int res = dbgsysRecv(f, buf + nbytes, len - nbytes, 0);
- if (res < 0) {
-+ if (errno == EINTR)
-+ continue;
+@@ -591,6 +594,22 @@
+ return nbytes;
+ }
+
++jint
++send_fully(int f, char *buf, int len)
++{
++ int nbytes = 0;
++ while (nbytes < len) {
++ int res = dbgsysSend(f, buf + nbytes, len - nbytes, 0);
++ if (res < 0) {
+ return res;
+ } else if (res == 0) {
+ break; /* eof, return nbytes which is less than len */
@@ -22433,19 +21503,10 @@
+ return nbytes;
+}
+
-+jint
-+send_fully(int f, char *buf, int len)
-+{
-+ int nbytes = 0;
-+ while (nbytes < len) {
-+ int res = dbgsysSend(f, buf + nbytes, len - nbytes, 0);
-+ if (res < 0) {
-+ if (errno == EINTR)
-+ continue;
- return res;
- } else if (res == 0) {
- break; /* eof, return nbytes which is less than len */
---- ./jdk/src/solaris/back/exec_md.c 2011-06-27 10:48:17.000000000 -0700
+ static jdwpTransportError JNICALL
+ socketTransport_readPacket(jdwpTransportEnv* env, jdwpPacket* packet) {
+ jint length, data_len;
+--- ./jdk/src/solaris/back/exec_md.c 2011-11-17 22:01:20.000000000 -0800
+++ ./jdk/src/solaris/back/exec_md.c 2011-04-22 23:08:37.000000000 -0700
@@ -30,7 +30,7 @@
#include "sys.h"
@@ -22456,7 +21517,7 @@
/* Linux */
#define FORK() fork()
#else
---- ./jdk/src/solaris/back/linker_md.c 2011-06-27 10:48:17.000000000 -0700
+--- ./jdk/src/solaris/back/linker_md.c 2011-11-17 22:01:20.000000000 -0800
+++ ./jdk/src/solaris/back/linker_md.c 2011-04-22 23:08:37.000000000 -0700
@@ -48,6 +48,12 @@
#include "threads_md.h"
@@ -22483,7 +21544,7 @@
}
}
---- ./jdk/src/solaris/back/util_md.h 2011-06-27 10:48:17.000000000 -0700
+--- ./jdk/src/solaris/back/util_md.h 2011-11-17 22:01:20.000000000 -0800
+++ ./jdk/src/solaris/back/util_md.h 2011-04-22 23:08:37.000000000 -0700
@@ -31,6 +31,11 @@
@@ -22506,7 +21567,7 @@
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo.c 2011-06-27 10:48:18.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.c 2011-11-17 22:01:20.000000000 -0800
+++ ./jdk/src/solaris/bin/ergo.c 2011-04-22 23:08:37.000000000 -0700
@@ -100,14 +100,39 @@
/* Compute physical memory by asking the OS */
@@ -22550,7 +21611,7 @@
return result;
+#endif /* _ALLBSD_SOURCE */
}
---- ./jdk/src/solaris/bin/ergo.h 2011-06-27 10:48:18.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.h 2011-11-17 22:01:20.000000000 -0800
+++ ./jdk/src/solaris/bin/ergo.h 2011-04-22 23:08:37.000000000 -0700
@@ -33,6 +33,10 @@
#include <sys/stat.h>
@@ -22563,7 +21624,7 @@
#include "java.h"
---- ./jdk/src/solaris/bin/ergo_i586.c 2011-06-27 10:48:18.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo_i586.c 2011-11-17 22:01:20.000000000 -0800
+++ ./jdk/src/solaris/bin/ergo_i586.c 2011-04-22 23:08:37.000000000 -0700
@@ -106,7 +106,7 @@
@@ -22645,7 +21706,7 @@
JLI_TraceLauncher("physical processors: %lu\n", result);
return result;
}
---- ./jdk/src/solaris/bin/java_md.c 2011-06-27 10:48:19.000000000 -0700
+--- ./jdk/src/solaris/bin/java_md.c 2011-11-17 22:01:20.000000000 -0800
+++ ./jdk/src/solaris/bin/java_md.c 2011-05-07 21:54:10.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -22755,7 +21816,7 @@
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./jdk/src/solaris/bin/java_md.h 2011-06-27 10:48:19.000000000 -0700
+--- ./jdk/src/solaris/bin/java_md.h 2011-11-17 22:01:20.000000000 -0800
+++ ./jdk/src/solaris/bin/java_md.h 2011-04-22 23:08:37.000000000 -0700
@@ -47,10 +47,14 @@
#include <sys/time.h>
@@ -22773,7 +21834,7 @@
/*
* Function prototypes.
---- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-06-27 10:48:42.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-11-17 22:01:23.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-04-22 23:08:38.000000000 -0700
@@ -101,7 +101,8 @@
ICE_WM = 10,
@@ -22823,7 +21884,7 @@
} else if (doIsIceWM && isIceWM()) {
awt_wmgr = XWM.ICE_WM;
}
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2011-06-27 10:48:47.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2011-11-17 22:01:24.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2011-04-22 23:08:38.000000000 -0700
@@ -213,7 +213,7 @@
if (fontID != null) {
@@ -22852,7 +21913,7 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,377 +0,0 @@
-#
@@ -23232,7 +22293,7 @@
-filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf
-filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf
-
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,154 +0,0 @@
-#
@@ -23389,7 +22450,7 @@
-filename.UnDotum_Bold=/usr/share/fonts/truetype/UnDotumBold.ttf
-filename.UnBatang=/usr/share/fonts/truetype/UnBatang.ttf
-filename.UnBatang_Bold=/usr/share/fonts/truetype/UnBatangBold.ttf
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,348 +0,0 @@
-#
@@ -23740,7 +22801,7 @@
-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,90 +0,0 @@
-/*
@@ -23833,7 +22894,7 @@
- return new UnixAsynchronousSocketChannelImpl(toPort(group));
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,281 +0,0 @@
-/*
@@ -24117,7 +23178,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2011-04-22 23:08:38.000000000 -0700
@@ -36,10 +36,6 @@
class BsdFileStore
@@ -24197,7 +23258,7 @@
return super.supportsFileAttributeView(name);
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2011-04-22 23:08:38.000000000 -0700
@@ -28,13 +28,15 @@
import java.nio.file.*;
@@ -24290,7 +23351,7 @@
@Override
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java 2011-04-22 23:08:38.000000000 -0700
@@ -54,14 +54,6 @@
Class<V> type,
@@ -24322,7 +23383,7 @@
return super.getFileAttributeView(obj, name, options);
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2011-04-22 23:08:38.000000000 -0700
@@ -36,84 +36,23 @@
private BsdNativeDispatcher() { }
@@ -24427,7 +23488,7 @@
+ initIDs();
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,350 +0,0 @@
-/*
@@ -24780,7 +23841,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,463 +0,0 @@
-/*
@@ -25246,7 +24307,7 @@
- }});
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2011-06-27 10:49:13.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2011-11-17 22:01:29.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2011-04-22 23:08:38.000000000 -0700
@@ -68,6 +68,8 @@
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
@@ -25257,7 +24318,7 @@
throw new AssertionError("Platform not recognized");
}
}
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2011-06-27 10:49:19.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2011-11-17 22:01:30.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2011-04-22 23:08:38.000000000 -0700
@@ -119,7 +119,11 @@
}
@@ -25292,7 +24353,7 @@
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2011-04-22 23:08:38.000000000 -0700
@@ -40,9 +40,6 @@
// temp directory for socket file
@@ -25391,9 +24452,9 @@
- isBsdThreads = isBsdThreads();
}
}
---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2011-06-27 10:49:22.000000000 -0700
-+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2011-04-22 23:08:38.000000000 -0700
-@@ -33,7 +33,7 @@
+--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2011-11-17 22:01:31.000000000 -0800
++++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2012-02-26 15:38:43.000000000 -0800
+@@ -42,7 +42,7 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -25402,7 +24463,7 @@
#include <procfs.h>
#endif
-@@ -53,6 +53,7 @@
+@@ -62,6 +62,7 @@
#include <time.h>
#include "jni.h"
@@ -25410,7 +24471,7 @@
#include "hprof.h"
int
-@@ -76,7 +77,7 @@
+@@ -85,7 +86,7 @@
void
md_init(void)
{
@@ -25419,7 +24480,7 @@
/* No Hi-Res timer option? */
#else
if ( gdata->micro_state_accounting ) {
-@@ -238,7 +239,7 @@
+@@ -247,7 +248,7 @@
jlong
md_get_microsecs(void)
{
@@ -25428,7 +24489,7 @@
return (jlong)(md_timeofday() * (jlong)1000); /* Milli to micro */
#else
return (jlong)(gethrtime()/(hrtime_t)1000); /* Nano seconds to micro seconds */
-@@ -256,7 +257,7 @@
+@@ -265,7 +266,7 @@
jlong
md_get_thread_cpu_timemillis(void)
{
@@ -25437,7 +24498,7 @@
return md_timeofday();
#else
return (jlong)(gethrvtime()/1000); /* Nano seconds to milli seconds */
-@@ -271,7 +272,7 @@
+@@ -280,7 +281,7 @@
Dl_info dlinfo;
libdir[0] = 0;
@@ -25446,7 +24507,7 @@
addr = (void*)&Agent_OnLoad;
#else
/* Just using &Agent_OnLoad will get the first external symbol with
-@@ -379,9 +380,9 @@
+@@ -388,9 +389,9 @@
/* Construct path to library */
if (pnamelen == 0) {
@@ -25458,38 +24519,7 @@
}
}
---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2011-06-27 10:49:37.000000000 -0700
-+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2011-04-22 23:08:38.000000000 -0700
-@@ -28,7 +28,10 @@
- #include <string.h>
- #include <ctype.h>
- #include <locale.h>
-+#ifndef __OpenBSD__
-+#define HAVE_NL_LANGINFO
- #include <langinfo.h>
-+#endif
- #include <iconv.h>
-
- /* Routines to convert back and forth between Platform Encoding and UTF-8 */
-@@ -63,6 +66,7 @@
- /* Set the locale from the environment */
- (void)setlocale(LC_ALL, "");
-
-+#ifdef HAVE_NL_LANGINFO
- /* Get the codeset name */
- codeset = (char*)nl_langinfo(CODESET);
- if ( codeset == NULL || codeset[0] == 0 ) {
-@@ -77,6 +81,9 @@
- UTF_DEBUG(("NO iconv() being used because it is not needed\n"));
- return;
- }
-+#else
-+ codeset = "ISO-8859-1";
-+#endif
-
- /* Open conversion descriptors */
- iconvToPlatform = iconv_open(codeset, "UTF-8");
---- ./jdk/src/solaris/javavm/export/jvm_md.h 2011-06-27 10:49:37.000000000 -0700
+--- ./jdk/src/solaris/javavm/export/jvm_md.h 2011-11-17 22:01:35.000000000 -0800
+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2011-04-22 23:08:38.000000000 -0700
@@ -41,7 +41,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
@@ -25515,7 +24545,7 @@
/* Signals */
---- ./jdk/src/solaris/native/com/sun/management/BsdOperatingSystem.c 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/native/com/sun/management/BsdOperatingSystem.c 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/management/BsdOperatingSystem.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,332 +0,0 @@
-/*
@@ -25850,7 +24880,7 @@
- return -1.0;
- }
-}
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2011-06-27 10:49:39.000000000 -0700
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2011-11-17 22:01:35.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2011-04-22 23:08:38.000000000 -0700
@@ -32,10 +32,16 @@
@@ -26014,7 +25044,7 @@
}
JNIEXPORT jlong JNICALL
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2011-06-27 10:49:44.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2011-11-17 22:01:36.000000000 -0800
+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -41,6 +41,12 @@
#include "java_io_FileSystem.h"
@@ -26037,7 +25067,7 @@
JNIEXPORT jboolean JNICALL
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2011-06-27 10:49:44.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2011-11-17 22:01:36.000000000 -0800
+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,9 @@
#include <sys/stat.h>
@@ -26049,7 +25079,7 @@
/* Note: The comments in this file use the terminology
---- ./jdk/src/solaris/native/java/io/io_util_md.c 2011-06-27 10:49:44.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/io_util_md.c 2011-11-17 22:01:36.000000000 -0800
+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -36,7 +36,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
@@ -26060,7 +25090,7 @@
/* Remove trailing slashes, since the kernel won't */
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2011-06-27 10:49:44.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,6 +28,11 @@
#include "jni.h"
@@ -26102,7 +25132,7 @@
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2011-06-27 10:49:44.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -40,7 +40,11 @@
#include <stdlib.h>
@@ -26206,7 +25236,7 @@
if (envp == NULL || (char **) envp == environ) {
execvp(file, (char **) argv);
return;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2011-06-27 10:49:45.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -23,7 +23,7 @@
* questions.
@@ -26280,7 +25310,7 @@
return &sprops;
}
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2011-06-27 10:49:45.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -36,12 +36,288 @@
#include <stdlib.h>
@@ -26632,7 +25662,7 @@
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2011-06-27 10:49:45.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,6 +33,9 @@
#include <strings.h>
@@ -26674,8 +25704,8 @@
}
return (*env)->NewStringUTF(env, hostname);
}
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-06-27 10:49:45.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-04-22 23:08:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-11-17 22:01:37.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-07-06 09:10:57.000000000 -0700
@@ -26,6 +26,9 @@
#include <errno.h>
@@ -26725,7 +25755,7 @@
char *name_colonP;
int mask;
-@@ -1648,3 +1668,307 @@
+@@ -1648,3 +1668,311 @@
#endif
@@ -27029,11 +26059,15 @@
+ return -1;
+ }
+
-+ return if2.ifr_flags;
++#ifdef __FreeBSD__
++ return ((if2.ifr_flags & 0xffff) | (if2.ifr_flagshigh << 16));
++#else
++ return (((int) if2.ifr_flags) & 0xffff);
++#endif
+}
+
+#endif
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2011-06-27 10:49:45.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -23,12 +23,12 @@
* questions.
@@ -27141,7 +26175,7 @@
}
}
}
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2011-06-27 10:49:45.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -483,9 +483,11 @@
if (connect_rv == JVM_IO_INTR) {
@@ -27164,7 +26198,7 @@
int port;
jobject iaObj;
jclass iaCntrClass;
---- ./jdk/src/solaris/native/java/net/bsd_close.c 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/bsd_close.c 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2011-04-22 23:08:39.000000000 -0700
@@ -57,7 +57,7 @@
/*
@@ -27201,7 +26235,7 @@
}
int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
---- ./jdk/src/solaris/native/java/net/net_util_md.c 2011-06-27 10:49:46.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,16 @@
#include <netdb.h>
@@ -27413,7 +26447,7 @@
len = sizeof(arg);
if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg,
---- ./jdk/src/solaris/native/java/net/net_util_md.h 2011-06-27 10:49:46.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.h 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -37,7 +37,7 @@
#endif
@@ -27424,7 +26458,7 @@
extern int NET_Timeout(int s, long timeout);
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2011-06-27 10:49:47.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2011-04-22 23:08:39.000000000 -0700
@@ -47,8 +47,11 @@
return (jint) result;
@@ -27463,18 +26497,17 @@
if (rc < 0) {
close(fd);
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2011-06-27 10:49:47.000000000 -0700
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2011-04-22 23:08:39.000000000 -0700
-@@ -31,7 +31,7 @@
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2011-11-17 22:01:37.000000000 -0800
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2012-03-04 13:19:33.000000000 -0800
+@@ -30,6 +30,7 @@
+ #include <limits.h>
#include <errno.h>
#include <stddef.h>
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- #include <string.h>
- #include <dirent.h>
++
#include <sys/stat.h>
-@@ -49,7 +49,11 @@
+ #include <sys/types.h>
+ #include <string.h>
+@@ -49,7 +50,11 @@
#define fileclose fclose
#endif
@@ -27486,7 +26519,25 @@
static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
static const char *ZONEINFO_DIR = "/usr/share/zoneinfo";
-@@ -199,7 +203,9 @@
+@@ -122,7 +127,7 @@
+ return NULL;
+ }
+
+-#if defined(__linux__) || (defined(__solaris__) && (defined(_POSIX_PTHREAD_SEMANTICS) || \
++#if defined(__linux__) || defined(_ALLBSD_SOURCE) || (defined(__solaris__) && (defined(_POSIX_PTHREAD_SEMANTICS) || \
+ defined(_LP64)))
+ while (readdir_r(dirp, entry, &dp) == 0 && dp != NULL) {
+ #else
+@@ -211,7 +216,7 @@
+ return tz;
+ }
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+
+ /*
+ * Performs Linux specific mapping and returns a zone ID
+@@ -226,7 +231,9 @@
int fd;
char *buf;
size_t size;
@@ -27496,7 +26547,7 @@
/*
* Try reading the /etc/timezone file for Debian distros. There's
* no spec of the file format available. This parsing assumes that
-@@ -223,6 +229,7 @@
+@@ -250,6 +257,7 @@
return tz;
}
}
@@ -27504,18 +26555,17 @@
/*
* Next, try /etc/localtime to find the zone ID.
-@@ -231,6 +238,10 @@
+@@ -258,6 +266,9 @@
return NULL;
}
+ strncpy(zoneinfo_file, DEFAULT_ZONEINFO_FILE, PATH_MAX);
+ zoneinfo_file[PATH_MAX] = '\0';
+
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
/*
* If it's a symlink, get the link name and its zone ID part. (The
* older versions of timeconfig created a symlink as described in
-@@ -239,21 +250,25 @@
+@@ -266,20 +277,23 @@
* from /etc/localtime.)
*/
if (S_ISLNK(statbuf.st_mode)) {
@@ -27542,11 +26592,9 @@
}
- return tz;
}
-+#endif /* __linux__ || _ALLBSD_SOURCE */
/*
- * If it's a regular file, we need to find out the same zoneinfo file
-@@ -264,7 +279,7 @@
+@@ -291,7 +305,7 @@
if (buf == NULL) {
return NULL;
}
@@ -27555,7 +26603,16 @@
free((void *) buf);
return NULL;
}
-@@ -493,7 +508,7 @@
+@@ -605,7 +619,7 @@
+ return tz;
+ }
+ #endif /*__solaris__*/
+-#endif /*__linux__*/
++#endif /* __linux__ || _ALLBSD_SOURCE */
+
+ /*
+ * findJavaTZ_md() maps platform time zone ID to Java time zone ID
+@@ -624,7 +638,7 @@
tz = getenv("TZ");
@@ -27564,10 +26621,10 @@
if (tz == NULL) {
#else
#ifdef __solaris__
-@@ -532,19 +547,32 @@
+@@ -674,6 +688,21 @@
{
time_t offset;
- char sign, buf[16];
+ char sign, buf[32];
+#if defined(_ALLBSD_SOURCE)
+ struct tm *local_tm;
+ time_t clock;
@@ -27583,25 +26640,18 @@
+ sign = "-";
+ }
+#else
-
- if (timezone == 0) {
- return strdup("GMT");
-- }
--
-- /* Note that the time offset direction is opposite. */
-- if (timezone > 0) {
-+ } else if (timezone > 0) {
- offset = timezone;
- sign = '-';
- } else {
- offset = -timezone;
+ #ifdef __solaris__
+ struct tm localtm;
+ time_t currenttime;
+@@ -699,6 +728,7 @@
+ offset = -offset;
sign = '+';
}
+#endif
sprintf(buf, (const char *)"GMT%c%02d:%02d",
sign, (int)(offset/3600), (int)((offset%3600)/60));
return strdup(buf);
---- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2011-06-27 10:49:47.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2011-04-22 23:08:39.000000000 -0700
@@ -25,6 +25,7 @@
@@ -27625,7 +26675,7 @@
if (handle == NULL) {
return JNI_FALSE;
}
---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2011-06-27 10:49:47.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2011-04-22 23:08:39.000000000 -0700
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -27639,7 +26689,7 @@
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2011-06-27 10:49:48.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/X11Color.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,9 @@
#include <math.h>
@@ -27651,7 +26701,7 @@
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2011-06-27 10:49:48.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2011-11-17 22:01:37.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2011-04-22 23:08:39.000000000 -0700
@@ -31,7 +31,11 @@
#include <Xm/XmP.h>
@@ -27665,7 +26715,7 @@
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2011-06-27 10:49:50.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2011-11-17 22:01:38.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2011-04-22 23:08:39.000000000 -0700
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
@@ -27676,7 +26726,7 @@
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-06-27 10:49:50.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-11-17 22:01:38.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-04-22 23:08:39.000000000 -0700
@@ -40,6 +40,7 @@
#include <jni.h>
@@ -27805,7 +26855,7 @@
if (pLibRandR == NULL) {
J2dRlsTraceLn(J2D_TRACE_ERROR,
"X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2011-06-27 10:49:51.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2011-11-17 22:01:38.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2011-04-22 23:08:39.000000000 -0700
@@ -67,7 +67,7 @@
XIMPreeditDrawCallbackStruct *);
@@ -28046,7 +27096,7 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2011-06-27 10:49:52.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2011-11-17 22:01:38.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2011-05-07 22:00:01.000000000 -0700
@@ -130,10 +130,10 @@
@@ -28061,7 +27111,7 @@
}
if (toolkit) {
---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2011-06-27 10:49:52.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2011-11-17 22:01:38.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,8 +63,9 @@
extern JavaVM *jvm;
@@ -28083,7 +27133,7 @@
statusWindowEventHandler(xev);
#endif
xembed_eventHandler(&xev);
---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2011-06-27 10:49:53.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2011-11-17 22:01:38.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,6 +32,7 @@
#include <dlfcn.h>
@@ -28107,7 +27157,7 @@
}
if (handle == NULL) {
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2011-06-27 10:49:53.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2011-11-17 22:01:38.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2011-05-20 20:09:20.000000000 -0700
@@ -45,7 +45,7 @@
#include "wsutils.h"
@@ -28126,7 +27176,7 @@
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_getRGBPixelsImpl( JNIEnv *env,
jclass cls,
---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2011-06-27 10:49:55.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h 2011-11-17 22:01:39.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2011-04-22 23:08:39.000000000 -0700
@@ -187,15 +187,20 @@
#ifdef __solaris__
@@ -28150,7 +27200,7 @@
typedef struct _XmImRefRec {
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2011-06-27 10:49:55.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2011-11-17 22:01:39.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2011-04-22 23:08:39.000000000 -0700
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -28249,7 +27299,7 @@
awt_wmgr = OPENLOOK_WM;
}
else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2011-06-27 10:49:55.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2011-11-17 22:01:39.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2011-04-22 23:08:39.000000000 -0700
@@ -45,7 +45,10 @@
KDE2_WM,
@@ -28263,7 +27313,7 @@
};
extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h 2011-06-27 10:49:56.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/extutil.h 2011-11-17 22:01:39.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2011-04-22 23:08:39.000000000 -0700
@@ -58,7 +58,7 @@
*/
@@ -28280,8 +27330,8 @@
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2011-06-27 10:49:57.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2011-05-12 20:55:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c 2011-11-17 22:01:39.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2012-03-03 19:11:40.000000000 -0800
@@ -23,7 +23,7 @@
* questions.
*/
@@ -28439,7 +27489,15 @@
if (libfontconfig == NULL) {
return NULL;
}
---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2011-06-27 10:49:57.000000000 -0700
+@@ -1194,6 +1228,7 @@
+ /* We only want TrueType fonts but some Linuxes still depend
+ * on Type 1 fonts for some Locale support, so we'll allow
+ * them there.
++ * XXX: Should we allow this on *BSD as well?
+ */
+ if (fontformat != NULL
+ && (strcmp((char*)fontformat, "TrueType") != 0)
+--- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2011-11-17 22:01:39.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2011-05-07 21:54:10.000000000 -0700
@@ -30,9 +30,12 @@
#include <string.h>
@@ -28495,7 +27553,7 @@
if (setjmp(j) == 0)
{
---- ./jdk/src/solaris/native/sun/awt/list.c 2011-06-27 10:49:58.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/list.c 2011-11-17 22:01:40.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/list.c 2011-04-22 23:08:39.000000000 -0700
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -28509,7 +27567,7 @@
#include "list.h"
---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2011-06-27 10:50:10.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c 2011-11-17 22:01:42.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2011-04-22 23:08:39.000000000 -0700
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
@@ -28521,7 +27579,7 @@
#include "robot_common.h"
/*
---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2011-06-27 10:50:12.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2011-11-17 22:01:42.000000000 -0800
+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,7 +32,11 @@
* into X11FontScaler_md.c, which is compiled into another library.
@@ -28535,7 +27593,7 @@
#include <ctype.h>
#include <sys/utsname.h>
---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2011-06-27 10:50:12.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2011-11-17 22:01:42.000000000 -0800
+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2011-04-22 23:08:39.000000000 -0700
@@ -39,7 +39,11 @@
#include "GraphicsPrimitiveMgr.h"
@@ -28549,7 +27607,7 @@
JNIEXPORT void JNICALL AWTDrawGlyphList
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2011-06-27 10:50:13.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2011-11-17 22:01:42.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -28566,7 +27624,7 @@
typedef unsigned char jubyte;
typedef unsigned short jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2011-06-27 10:50:13.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2011-11-17 22:01:42.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,6 +63,10 @@
* MLIB_EDGE_SRC_PADDED
@@ -28673,7 +27731,7 @@
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2011-06-27 10:50:16.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2011-11-17 22:01:43.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2011-04-22 23:08:39.000000000 -0700
@@ -804,7 +804,7 @@
static int initialized;
@@ -28684,7 +27742,7 @@
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2011-06-27 10:50:20.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2011-11-17 22:01:43.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
@@ -28706,7 +27764,7 @@
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2011-06-27 10:50:21.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2011-11-17 22:01:43.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,6 +32,7 @@
#include "gdefs.h"
@@ -28725,7 +27783,7 @@
}
if (lib != NULL) {
---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2011-06-27 10:50:22.000000000 -0700
+--- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2011-04-22 23:08:39.000000000 -0700
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
@@ -28749,7 +27807,7 @@
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2011-06-27 10:50:22.000000000 -0700
+--- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -30,6 +30,10 @@
#include "jni_util.h"
@@ -28762,7 +27820,7 @@
/*
* Class: sun_management_FileSystemImpl
* Method: isAccessUserOnly0
---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2011-06-27 10:50:23.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,7 @@
#include <strings.h>
@@ -28773,7 +27831,7 @@
#include <string.h>
#endif
---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2011-06-27 10:50:23.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,11 +26,12 @@
#include "jni.h"
@@ -28801,7 +27859,7 @@
gconf_ver = 2;
}
if (gconf_ver > 0) {
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2011-06-27 10:50:23.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -35,7 +35,7 @@
#include <string.h>
@@ -28852,7 +27910,7 @@
}
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2011-06-27 10:50:24.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2011-04-22 23:08:39.000000000 -0700
@@ -73,7 +73,7 @@
m.msg_accrightslen = 0;
@@ -28872,7 +27930,7 @@
m.msg_control = NULL;
m.msg_controllen = 0;
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2011-06-27 10:50:25.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,9 +26,11 @@
#include "jni.h"
@@ -28938,7 +27996,7 @@
+ return IOS_UNSUPPORTED;
#endif
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2011-06-27 10:50:25.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,9 +33,24 @@
#include <sys/socket.h>
@@ -28989,7 +28047,7 @@
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2011-06-27 10:50:25.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2011-04-22 23:08:39.000000000 -0700
@@ -30,6 +30,12 @@
#include "nio_util.h"
@@ -29004,7 +28062,7 @@
static jfieldID key_st_dev; /* id for FileKey.st_dev */
static jfieldID key_st_ino; /* id for FileKey.st_ino */
---- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2011-06-27 10:50:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2011-04-22 23:08:39.000000000 -0700
@@ -116,6 +116,47 @@
@@ -29156,7 +28214,7 @@
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2011-06-27 10:50:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2011-04-22 23:08:39.000000000 -0700
@@ -67,7 +67,7 @@
@@ -29206,7 +28264,7 @@
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2011-06-27 10:50:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -337,11 +337,11 @@
break;
@@ -29222,7 +28280,7 @@
}
addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2011-06-27 10:50:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2011-04-22 23:08:39.000000000 -0700
@@ -58,6 +58,7 @@
*/
@@ -29240,7 +28298,7 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,23 +28,35 @@
#include "jvm.h"
@@ -29522,7 +28580,7 @@
+ free(iter);
+ }
}
---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,153 +0,0 @@
-/*
@@ -29678,7 +28736,7 @@
- }
- return (jint)n;
-}
---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2011-06-27 10:50:28.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2011-11-17 22:01:44.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2011-04-22 23:08:39.000000000 -0700
@@ -30,7 +30,9 @@
@@ -29690,7 +28748,7 @@
#ifdef __solaris__
#include <strings.h>
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2011-06-27 10:50:29.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2011-11-17 22:01:45.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2011-05-20 20:04:19.000000000 -0700
@@ -49,6 +49,19 @@
#include <mntent.h>
@@ -29767,7 +28825,7 @@
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2011-06-27 10:50:29.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2011-11-17 22:01:45.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,7 +63,12 @@
DEFX(O_EXCL);
@@ -29795,7 +28853,7 @@
DEF(ERANGE);
// flags used with openat/unlinkat/etc.
---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2011-06-27 10:50:29.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2011-11-17 22:01:45.000000000 -0800
+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,7 +26,9 @@
#include <stdio.h>
@@ -29807,7 +28865,7 @@
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-06-27 10:50:30.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-11-17 22:01:45.000000000 -0800
+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,12 +28,19 @@
#include <string.h>
@@ -29851,7 +28909,7 @@
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2011-06-27 10:50:30.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2011-11-17 22:01:45.000000000 -0800
+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -64,7 +64,9 @@
#include <assert.h>
@@ -29863,7 +28921,7 @@
#include <jni.h>
---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2011-06-27 10:50:30.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2011-11-17 22:01:45.000000000 -0800
+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -29,7 +29,9 @@
#include <assert.h>
@@ -29875,7 +28933,7 @@
#include <winscard.h>
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2011-04-22 23:08:39.000000000 -0700
@@ -1,12 +1,12 @@
/*
@@ -30210,7 +29268,7 @@
+ JNU_ReleaseStringPlatformChars(env, path, _path);
+ }
+}
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2011-06-27 10:50:32.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2011-11-17 22:01:46.000000000 -0800
+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2011-04-22 23:08:39.000000000 -0700
@@ -228,10 +228,10 @@
{java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
@@ -30236,7 +29294,7 @@
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2011-06-27 10:50:32.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2011-11-17 22:01:46.000000000 -0800
+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2011-04-22 23:08:39.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -30284,7 +29342,7 @@
}
dlerror(); /* Clear errors */
gnome_url_show = (GNOME_URL_SHOW_TYPE*)dlsym(gnome_handle, "gnome_url_show");
---- ./jdk/src/solaris/npt/npt_md.h 2011-06-27 10:50:33.000000000 -0700
+--- ./jdk/src/solaris/npt/npt_md.h 2011-11-17 22:01:46.000000000 -0800
+++ ./jdk/src/solaris/npt/npt_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -32,9 +32,10 @@
#include <string.h>
@@ -30308,8 +29366,8 @@
if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
_sym = dlsym(_handle, "nptInitialize"); \
if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
---- ./jdk/src/solaris/transport/socket/socket_md.c 2011-06-27 10:50:37.000000000 -0700
-+++ ./jdk/src/solaris/transport/socket/socket_md.c 2011-04-22 23:08:39.000000000 -0700
+--- ./jdk/src/solaris/transport/socket/socket_md.c 2011-11-17 22:01:46.000000000 -0800
++++ ./jdk/src/solaris/transport/socket/socket_md.c 2012-02-12 13:05:35.000000000 -0800
@@ -36,7 +36,7 @@
#ifdef __solaris__
#include <thread.h>
@@ -30319,7 +29377,87 @@
#include <pthread.h>
#include <sys/poll.h>
#endif
-@@ -283,7 +283,7 @@
+@@ -52,7 +52,7 @@
+ int
+ dbgsysConnect(int fd, struct sockaddr *name, int namelen) {
+ int rv = connect(fd, name, namelen);
+- if (rv < 0 && errno == EINPROGRESS) {
++ if (rv < 0 && (errno == EINPROGRESS || errno == EINTR)) {
+ return DBG_EINPROGRESS;
+ } else {
+ return rv;
+@@ -79,7 +79,7 @@
+ if (rv >= 0) {
+ return rv;
+ }
+- if (errno != ECONNABORTED) {
++ if (errno != ECONNABORTED && errno != EINTR) {
+ return rv;
+ }
+ }
+@@ -88,23 +88,43 @@
+ int
+ dbgsysRecvFrom(int fd, char *buf, int nBytes,
+ int flags, struct sockaddr *from, int *fromlen) {
+- return recvfrom(fd, buf, nBytes, flags, from, fromlen);
++ int rv;
++ do {
++ rv = recvfrom(fd, buf, nBytes, flags, from, fromlen);
++ } while (rv == -1 && errno == EINTR);
++
++ return rv;
+ }
+
+ int
+ dbgsysSendTo(int fd, char *buf, int len,
+ int flags, struct sockaddr *to, int tolen) {
+- return sendto(fd, buf, len, flags, to, tolen);
++ int rv;
++ do {
++ rv = sendto(fd, buf, len, flags, to, tolen);
++ } while (rv == -1 && errno == EINTR);
++
++ return rv;
+ }
+
+ int
+ dbgsysRecv(int fd, char *buf, int nBytes, int flags) {
+- return recv(fd, buf, nBytes, flags);
++ int rv;
++ do {
++ rv = recv(fd, buf, nBytes, flags);
++ } while (rv == -1 && errno == EINTR);
++
++ return rv;
+ }
+
+ int
+ dbgsysSend(int fd, char *buf, int nBytes, int flags) {
+- return send(fd, buf, nBytes, flags);
++ int rv;
++ do {
++ rv = send(fd, buf, nBytes, flags);
++ } while (rv == -1 && errno == EINTR);
++
++ return rv;
+ }
+
+ struct hostent *
+@@ -123,7 +143,12 @@
+ }
+
+ int dbgsysSocketClose(int fd) {
+- return close(fd);
++ int rv;
++ do {
++ rv = close(fd);
++ } while (rv == -1 && errno == EINTR);
++
++ return rv;
+ }
+
+ int
+@@ -283,7 +308,7 @@
#endif
@@ -30328,7 +29466,7 @@
int
dbgsysTlsAlloc() {
pthread_key_t key;
---- ./jdk/test/Makefile 2011-06-27 10:52:16.000000000 -0700
+--- ./jdk/test/Makefile 2011-11-17 22:02:07.000000000 -0800
+++ ./jdk/test/Makefile 2011-04-22 23:08:40.000000000 -0700
@@ -79,6 +79,16 @@
endif
@@ -30347,7 +29485,7 @@
ifeq ($(OS_NAME),)
OS_NAME = windows
# GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2011-06-27 10:52:43.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2011-11-17 22:02:13.000000000 -0800
+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2011-04-22 23:08:41.000000000 -0700
@@ -56,7 +56,7 @@
@@ -30358,7 +29496,7 @@
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2011-06-27 10:52:45.000000000 -0700
+--- ./jdk/test/com/sun/jdi/JITDebug.sh 2011-11-17 22:02:13.000000000 -0800
+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2011-04-22 23:08:41.000000000 -0700
@@ -63,7 +63,7 @@
OS=`uname -s`
@@ -30369,7 +29507,7 @@
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2011-06-27 10:52:52.000000000 -0700
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2011-11-17 22:02:15.000000000 -0800
+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2011-04-22 23:08:41.000000000 -0700
@@ -123,10 +123,14 @@
esac
@@ -30387,7 +29525,7 @@
Windows*)
is_windows=true
libloc=${jreloc}/bin
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2011-06-27 10:52:56.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2011-11-17 22:02:16.000000000 -0800
+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2011-04-22 23:08:41.000000000 -0700
@@ -292,7 +292,7 @@
psCmd=ps
@@ -30398,7 +29536,7 @@
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2011-06-27 10:52:57.000000000 -0700
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2011-11-17 22:02:16.000000000 -0800
+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2011-04-22 23:08:41.000000000 -0700
@@ -112,7 +112,7 @@
fi
@@ -30409,7 +29547,7 @@
pass "This test always passes on $OS"
;;
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2011-06-27 10:53:02.000000000 -0700
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2011-11-17 22:02:17.000000000 -0800
+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2011-04-22 23:08:41.000000000 -0700
@@ -45,10 +45,7 @@
@@ -30423,7 +29561,7 @@
PS=":"
;;
Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-06-27 10:53:14.000000000 -0700
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-11-17 22:02:20.000000000 -0800
+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-04-22 23:08:41.000000000 -0700
@@ -83,6 +83,10 @@
total_swap=`free -b | grep -i swap | awk '{print $2}'`
@@ -30436,7 +29574,7 @@
* )
runOne GetTotalSwapSpaceSize "sanity-only"
;;
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2011-06-27 10:53:16.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2011-11-17 22:02:20.000000000 -0800
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2011-04-22 23:08:41.000000000 -0700
@@ -48,7 +48,7 @@
@@ -30447,7 +29585,7 @@
runOne GetMaxFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2011-06-27 10:53:16.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2011-11-17 22:02:20.000000000 -0800
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2011-04-22 23:08:41.000000000 -0700
@@ -48,7 +48,7 @@
@@ -30458,7 +29596,7 @@
runOne GetOpenFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2011-06-27 10:53:46.000000000 -0700
+--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2011-11-17 22:02:27.000000000 -0800
+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2011-04-22 23:08:41.000000000 -0700
@@ -36,11 +36,7 @@
@@ -30473,7 +29611,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2011-06-27 10:54:45.000000000 -0700
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2011-11-17 22:02:43.000000000 -0800
+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2011-04-22 23:08:42.000000000 -0700
@@ -25,10 +25,11 @@
fi
@@ -30491,7 +29629,7 @@
# Windows
if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh 2011-06-27 10:56:45.000000000 -0700
+--- ./jdk/test/java/io/File/GetXSpace.sh 2011-11-17 22:03:07.000000000 -0800
+++ ./jdk/test/java/io/File/GetXSpace.sh 2011-04-22 23:08:43.000000000 -0700
@@ -26,7 +26,7 @@
# set platform-dependent variable
@@ -30502,7 +29640,7 @@
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2011-06-27 10:57:26.000000000 -0700
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2011-11-17 22:03:13.000000000 -0800
+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
@@ -30513,7 +29651,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2011-06-27 10:57:41.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2011-11-17 22:03:15.000000000 -0800
+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30524,7 +29662,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2011-06-27 10:57:41.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2011-11-17 22:03:15.000000000 -0800
+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30535,7 +29673,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2011-06-27 10:58:14.000000000 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2011-11-17 22:03:20.000000000 -0800
+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2011-04-22 23:08:44.000000000 -0700
@@ -49,10 +49,7 @@
# set platform-specific variables
@@ -30549,7 +29687,7 @@
FS="/"
;;
Windows* | CYGWIN* )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2011-06-27 10:58:43.000000000 -0700
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2011-11-17 22:03:23.000000000 -0800
+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2011-04-22 23:08:45.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -30560,7 +29698,7 @@
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2011-06-27 10:58:53.000000000 -0700
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2011-11-17 22:03:24.000000000 -0800
+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2011-04-22 23:08:45.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -30571,7 +29709,7 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2011-06-27 10:58:58.000000000 -0700
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2011-11-17 22:03:25.000000000 -0800
+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2011-04-22 23:08:45.000000000 -0700
@@ -49,7 +49,7 @@
@@ -30582,7 +29720,7 @@
PATHSEP=":"
;;
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2011-06-27 10:59:12.000000000 -0700
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2011-11-17 22:03:28.000000000 -0800
+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2011-04-22 23:08:45.000000000 -0700
@@ -35,11 +35,7 @@
@@ -30597,7 +29735,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2011-06-27 10:59:28.000000000 -0700
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2011-11-17 22:03:30.000000000 -0800
+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2011-04-22 23:08:45.000000000 -0700
@@ -61,10 +61,7 @@
while true; do
@@ -30611,7 +29749,7 @@
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2011-06-27 10:59:50.000000000 -0700
+--- ./jdk/test/java/net/Authenticator/B4933582.sh 2011-11-17 22:03:34.000000000 -0800
+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2011-04-22 23:08:45.000000000 -0700
@@ -26,7 +26,7 @@
@@ -30622,7 +29760,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2011-06-27 10:59:56.000000000 -0700
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2011-11-17 22:03:36.000000000 -0800
+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2011-04-22 23:08:45.000000000 -0700
@@ -27,11 +27,7 @@
# set platform-dependent variables
@@ -30637,7 +29775,7 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2011-06-27 11:00:17.000000000 -0700
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2011-11-17 22:03:40.000000000 -0800
+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2011-04-22 23:08:45.000000000 -0700
@@ -28,7 +28,7 @@
@@ -30648,7 +29786,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh 2011-06-27 11:00:25.000000000 -0700
+--- ./jdk/test/java/net/URL/B5086147.sh 2011-11-17 22:03:42.000000000 -0800
+++ ./jdk/test/java/net/URL/B5086147.sh 2011-04-22 23:08:46.000000000 -0700
@@ -26,7 +26,7 @@
@@ -30659,7 +29797,7 @@
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh 2011-06-27 11:00:30.000000000 -0700
+--- ./jdk/test/java/net/URL/runconstructor.sh 2011-11-17 22:03:43.000000000 -0800
+++ ./jdk/test/java/net/URL/runconstructor.sh 2011-04-22 23:08:46.000000000 -0700
@@ -27,7 +27,7 @@
#
@@ -30670,7 +29808,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2011-06-27 11:00:31.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2011-11-17 22:03:43.000000000 -0800
+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2011-04-22 23:08:46.000000000 -0700
@@ -34,11 +34,7 @@
@@ -30685,7 +29823,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2011-06-27 11:00:38.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2011-11-17 22:03:45.000000000 -0800
+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2011-04-22 23:08:46.000000000 -0700
@@ -27,11 +27,7 @@
@@ -30700,7 +29838,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2011-06-27 11:00:38.000000000 -0700
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh 2011-11-17 22:03:45.000000000 -0800
+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2011-04-22 23:08:46.000000000 -0700
@@ -33,11 +33,7 @@
@@ -30715,7 +29853,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2011-06-27 11:01:30.000000000 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2011-11-17 22:03:53.000000000 -0800
+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2011-04-22 23:08:46.000000000 -0700
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
@@ -30766,8 +29904,8 @@
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2011-06-27 11:01:32.000000000 -0700
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /tmp/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2011-11-17 22:03:54.000000000 -0800
+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2011-04-22 23:08:46.000000000 -0700
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -30837,7 +29975,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/charset/Charset/default.sh 2011-06-27 11:01:34.000000000 -0700
+--- ./jdk/test/java/nio/charset/Charset/default.sh 2011-11-17 22:03:54.000000000 -0800
+++ ./jdk/test/java/nio/charset/Charset/default.sh 2011-04-22 23:08:46.000000000 -0700
@@ -41,10 +41,14 @@
fi
@@ -30858,7 +29996,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=$TESTJAVA/bin/java
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2011-06-27 11:01:37.000000000 -0700
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2011-11-17 22:03:54.000000000 -0800
+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2011-04-22 23:08:46.000000000 -0700
@@ -34,7 +34,7 @@
@@ -30869,7 +30007,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
# Skip locale test for Windows
Windows* )
echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh 2011-06-27 11:01:40.000000000 -0700
+--- ./jdk/test/java/nio/charset/spi/basic.sh 2011-11-17 22:03:54.000000000 -0800
+++ ./jdk/test/java/nio/charset/spi/basic.sh 2011-04-22 23:08:46.000000000 -0700
@@ -70,10 +70,14 @@
L="$1"
@@ -30899,7 +30037,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
Windows* ) CPS=';' ;;
*) echo "Unknown platform: `uname`"; exit 1 ;;
esac
---- ./jdk/test/java/nio/file/Files/CopyAndMove.java 2011-06-27 11:01:43.000000000 -0700
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java 2011-11-17 22:03:55.000000000 -0800
+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java 2011-04-22 23:08:46.000000000 -0700
@@ -153,7 +153,8 @@
@@ -30911,7 +30049,18 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
posixAttributes = readAttributes(source, PosixFileAttributes.class, NOFOLLOW_LINKS);
basicAttributes = posixAttributes;
}
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2011-06-27 11:02:51.000000000 -0700
+--- ./jdk/test/java/rmi/registry/readTest/readTest.sh 2011-11-17 22:04:02.000000000 -0800
++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh 2012-03-03 19:12:22.000000000 -0800
+@@ -28,7 +28,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux )
++ SunOS | Linux | *BSD )
+ PS=":"
+ FS="/"
+ FILEURL="file:"
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2011-11-17 22:04:05.000000000 -0800
+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2011-04-22 23:08:47.000000000 -0700
@@ -84,14 +84,12 @@
@@ -30932,7 +30081,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
export PATH_SEP
mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2011-06-27 11:03:47.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2011-11-17 22:04:16.000000000 -0800
+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -30947,7 +30096,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2011-06-27 11:03:48.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2011-11-17 22:04:16.000000000 -0800
+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2011-04-22 23:08:48.000000000 -0700
@@ -34,11 +34,7 @@
# set platform-dependent variables
@@ -30962,7 +30111,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2011-06-27 11:03:51.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2011-11-17 22:04:17.000000000 -0800
+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -30977,7 +30126,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2011-06-27 11:03:51.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh 2011-11-17 22:04:17.000000000 -0800
+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -30992,7 +30141,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2011-06-27 11:04:32.000000000 -0700
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2011-11-17 22:04:26.000000000 -0800
+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2011-04-22 23:08:48.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -31003,7 +30152,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2011-06-27 11:04:56.000000000 -0700
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2011-11-17 22:04:32.000000000 -0800
+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2011-04-22 23:08:48.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -31014,7 +30163,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2011-06-27 11:05:10.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2011-11-17 22:04:35.000000000 -0800
+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2011-04-22 23:08:49.000000000 -0700
@@ -31,7 +31,7 @@
# set platform-dependent variables
@@ -31025,7 +30174,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2011-06-27 11:05:13.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2011-11-17 22:04:36.000000000 -0800
+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2011-04-22 23:08:49.000000000 -0700
@@ -75,7 +75,7 @@
SunOS)
@@ -31036,7 +30185,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
DEL=":"
HAS_S=YES
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh 2011-06-27 11:05:27.000000000 -0700
+--- ./jdk/test/java/util/ServiceLoader/basic.sh 2011-11-17 22:04:39.000000000 -0800
+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2011-04-22 23:08:49.000000000 -0700
@@ -42,9 +42,7 @@
@@ -31049,7 +30198,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2011-06-27 11:06:08.000000000 -0700
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2011-11-17 22:04:52.000000000 -0800
+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2011-04-22 23:08:49.000000000 -0700
@@ -51,7 +51,7 @@
# set platform-dependent variables
@@ -31060,7 +30209,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/script/CommonSetup.sh 2011-06-27 11:06:50.000000000 -0700
+--- ./jdk/test/javax/script/CommonSetup.sh 2011-11-17 22:05:04.000000000 -0800
+++ ./jdk/test/javax/script/CommonSetup.sh 2011-04-22 23:08:50.000000000 -0700
@@ -36,11 +36,7 @@
@@ -31075,7 +30224,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2011-06-27 11:06:54.000000000 -0700
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2011-11-17 22:05:06.000000000 -0800
+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2011-04-22 23:08:50.000000000 -0700
@@ -33,12 +33,7 @@
# set platform-dependent variables
@@ -31091,7 +30240,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/jprt.config 2011-06-27 11:07:52.000000000 -0700
+--- ./jdk/test/jprt.config 2011-11-17 22:05:23.000000000 -0800
+++ ./jdk/test/jprt.config 2011-04-22 23:08:51.000000000 -0700
@@ -71,8 +71,8 @@
@@ -31160,7 +30309,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
# Export PATH setting
PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2011-06-27 11:07:52.000000000 -0700
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2011-11-17 22:05:23.000000000 -0800
+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2011-04-22 23:08:51.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -31171,7 +30320,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2011-06-27 11:08:04.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2011-11-17 22:05:26.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -45,37 +45,50 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
@@ -31249,7 +30398,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
#
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2011-06-27 11:08:04.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2011-11-17 22:05:26.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2011-04-22 23:08:51.000000000 -0700
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -31260,7 +30409,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2011-06-27 11:08:04.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2011-11-17 22:05:26.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -31279,7 +30428,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2011-06-27 11:08:05.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2011-11-17 22:05:26.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -70,10 +70,12 @@
# security the password file.
@@ -31298,7 +30447,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
# Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2011-06-27 11:08:05.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2011-11-17 22:05:27.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -69,10 +69,12 @@
# security the password file.
@@ -31317,8 +30466,8 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/java/nio/channels/spi/Select
# Create management and SSL configuration files
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2011-06-27 11:08:13.000000000 -0700
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /tmp/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
+--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2011-11-17 22:05:28.000000000 -0800
+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2011-04-22 23:08:52.000000000 -0700
@@ -36,11 +36,7 @@
@@ -31333,7 +30482,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2011-06-27 11:08:18.000000000 -0700
+--- ./jdk/test/sun/net/www/MarkResetTest.sh 2011-11-17 22:05:30.000000000 -0800
+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2011-04-22 23:08:52.000000000 -0700
@@ -28,7 +28,7 @@
@@ -31344,7 +30493,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2011-06-27 11:08:21.000000000 -0700
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2011-11-17 22:05:31.000000000 -0800
+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2011-04-22 23:08:52.000000000 -0700
@@ -28,7 +28,7 @@
@@ -31355,7 +30504,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2011-06-27 11:08:27.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2011-11-17 22:05:32.000000000 -0800
+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2011-04-22 23:08:52.000000000 -0700
@@ -31,11 +31,7 @@
@@ -31370,7 +30519,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2011-06-27 11:08:28.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2011-11-17 22:05:33.000000000 -0800
+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2011-04-22 23:08:52.000000000 -0700
@@ -31,11 +31,7 @@
@@ -31385,7 +30534,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,79 +0,0 @@
-/*
@@ -31467,7 +30616,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
- System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
- if (failed > 0) throw new AssertionError("Some tests failed");}
-}
---- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2011-06-27 23:25:38.000000000 -0700
+--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2012-03-04 16:33:49.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,70 +0,0 @@
-/*
@@ -31540,7 +30689,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
- }
- }
-}
---- ./jdk/test/sun/security/krb5/runNameEquals.sh 2011-06-27 11:09:04.000000000 -0700
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh 2011-11-17 22:05:44.000000000 -0800
+++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2011-04-22 23:08:53.000000000 -0700
@@ -58,6 +58,11 @@
FILESEP="/"
@@ -31554,7 +30703,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
CYGWIN* )
PATHSEP=";"
FILESEP="/"
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2011-06-27 11:09:08.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2011-11-17 22:05:45.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2011-04-22 23:08:53.000000000 -0700
@@ -131,6 +131,27 @@
;;
@@ -31584,7 +30733,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2011-06-27 11:09:09.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2011-11-17 22:05:45.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2011-04-22 23:08:53.000000000 -0700
@@ -92,6 +92,27 @@
;;
@@ -31614,7 +30763,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2011-06-27 11:09:12.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2011-11-17 22:05:46.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2011-04-22 23:08:53.000000000 -0700
@@ -50,13 +50,7 @@
@@ -31631,7 +30780,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2011-06-27 11:09:13.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2011-11-17 22:05:46.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2011-04-22 23:08:53.000000000 -0700
@@ -51,13 +51,7 @@
@@ -31648,22 +30797,22 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
-Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2011-06-27 11:09:33.000000000 -0700
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
+Files /tmp/openjdk_srcdir.D3vYK7Iv/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2011-11-17 22:05:53.000000000 -0800
+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2011-04-22 23:08:53.000000000 -0700
@@ -44,11 +44,7 @@
# set platform-dependent variables
@@ -31678,7 +30827,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2011-06-27 11:09:35.000000000 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2011-11-17 22:05:54.000000000 -0800
+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -31693,7 +30842,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2011-06-27 11:09:48.000000000 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2011-11-17 22:05:57.000000000 -0800
+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -42,7 +42,7 @@
@@ -31704,7 +30853,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FILESEP="/"
PATHSEP=":"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2011-06-27 11:10:01.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2011-11-17 22:05:59.000000000 -0800
+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -31715,7 +30864,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2011-06-27 11:10:01.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2011-11-17 22:05:59.000000000 -0800
+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2011-04-22 23:08:54.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -31726,7 +30875,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2011-06-27 11:10:03.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2011-11-17 22:06:00.000000000 -0800
+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31737,7 +30886,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2011-06-27 11:10:04.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2011-11-17 22:06:00.000000000 -0800
+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31748,7 +30897,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2011-06-27 11:10:04.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2011-11-17 22:06:00.000000000 -0800
+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2011-04-22 23:08:54.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -31759,7 +30908,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2011-06-27 11:10:05.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2011-11-17 22:06:00.000000000 -0800
+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2011-04-22 23:08:54.000000000 -0700
@@ -42,7 +42,7 @@
# set platform-dependent variables
@@ -31770,7 +30919,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2011-06-27 11:10:05.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2011-11-17 22:06:00.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31781,7 +30930,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2011-06-27 11:10:06.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2011-11-17 22:06:00.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -31796,7 +30945,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2011-06-27 11:10:06.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2011-04-22 23:08:54.000000000 -0700
@@ -45,7 +45,7 @@
# set platform-dependent variables
@@ -31807,7 +30956,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2011-06-27 11:10:06.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31818,7 +30967,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2011-06-27 11:10:07.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -72,6 +72,27 @@
;;
@@ -31848,7 +30997,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
* )
echo "Will not run test on: ${OS}"
exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh 2011-06-27 11:10:07.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31859,7 +31008,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2011-06-27 11:10:07.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2011-04-22 23:08:54.000000000 -0700
@@ -37,7 +37,7 @@
# set platform-dependent variables
@@ -31870,7 +31019,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh 2011-06-27 11:10:08.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/resource.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2011-04-22 23:08:54.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -31881,7 +31030,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
FS="/"
TMP=/tmp
---- ./jdk/test/sun/security/tools/keytool/standard.sh 2011-06-27 11:10:08.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/standard.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2011-04-22 23:08:54.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -31892,7 +31041,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2011-06-27 11:10:08.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31903,7 +31052,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2011-06-27 11:10:08.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31914,7 +31063,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2011-06-27 11:10:09.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31925,7 +31074,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2011-06-27 11:10:09.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2011-11-17 22:06:01.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31936,7 +31085,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2011-06-27 11:10:09.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2011-11-17 22:06:02.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31947,7 +31096,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2011-06-27 11:10:09.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2011-11-17 22:06:02.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31958,7 +31107,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2011-06-27 11:10:09.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh 2011-11-17 22:06:02.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31969,7 +31118,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2011-06-27 11:10:15.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2011-11-17 22:06:03.000000000 -0800
+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -53,7 +53,7 @@
@@ -31980,7 +31129,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2011-06-27 11:10:15.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2011-11-17 22:06:03.000000000 -0800
+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -54,7 +54,7 @@
@@ -31991,7 +31140,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2011-06-27 11:10:25.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2011-11-17 22:06:06.000000000 -0800
+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2011-04-22 23:08:55.000000000 -0700
@@ -33,7 +33,7 @@
@@ -32002,7 +31151,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
esac
N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2011-06-27 11:10:25.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2011-11-17 22:06:06.000000000 -0800
+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2011-04-22 23:08:55.000000000 -0700
@@ -56,7 +56,7 @@
@@ -32013,38 +31162,39 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./langtools/.hgtags 2011-06-27 11:16:49.000000000 -0700
-+++ ./langtools/.hgtags 2011-06-27 22:08:19.000000000 -0700
-@@ -121,3 +121,4 @@
- 8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144
- c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145
- 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
-+58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
---- ./langtools/.jcheck/conf 2011-06-27 11:16:50.000000000 -0700
-+++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
-@@ -1 +0,0 @@
--project=jdk7
---- ./langtools/make/build.xml 2011-06-27 11:16:50.000000000 -0700
-+++ ./langtools/make/build.xml 2011-05-07 21:54:16.000000000 -0700
-@@ -186,9 +186,14 @@
- </condition>
-
+--- ./langtools/.hgtags 2011-11-17 22:08:21.000000000 -0800
++++ ./langtools/.hgtags 2012-02-26 15:37:57.000000000 -0800
+@@ -139,3 +139,5 @@
+ ee94565d9f57ee9885e3af44891877163b637cc3 jdk7u1-b08
+ d37897312d318c18b0a855ce80f70c410865d105 jdk7u2-b11
+ f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12
++f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13
++fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21
+--- ./langtools/make/build.xml 2011-11-17 22:08:21.000000000 -0800
++++ ./langtools/make/build.xml 2011-07-15 21:28:16.000000000 -0700
+@@ -169,10 +169,10 @@
+ in the build-bootstrap-classes macro. -->
+
+ <available property="import.jdk.src.dir" value="${import.jdk}/src/share/classes"
+- filepath="${import.jdk}/src/share/classes" file="java/nio/file/Path.java"/>
++ filepath="${import.jdk}/src/share/classes" file="java/nio/file/StandardWatchEventKinds.java"/>
+ <available property="import.jdk.jar" value="${import.jdk}/jre/lib/rt.jar"
+ ignoresystemclasses="true"
+- classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
++ classpath="${import.jdk}/jre/lib/rt.jar" classname="java.nio.file.StandardWatchEventKinds"/>
+
+ <!-- Set the default bootclasspath option used for javac.
+ Note that different variants of the option are used, meaning we can't just
+@@ -188,7 +188,7 @@
<condition property="boot.java.provides.latest.jdk">
-- <available
-- ignoresystemclasses="true"
+ <available
+ ignoresystemclasses="true"
- classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
-+ <and>
-+ <available
-+ ignoresystemclasses="true"
-+ classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
-+ <hasmethod
-+ classpath="${boot.java.home}/jre/lib/rt.jar"
-+ classname="java.nio.file.Path" method="getFileName"/>
-+ </and>
++ classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.StandardWatchEventKinds"/>
</condition>
<condition property="bootstrap.exclude.files" value="" else="${require.latest.jdk.files}">
---- ./langtools/test/Makefile 2011-06-27 11:17:33.000000000 -0700
+--- ./langtools/test/Makefile 2011-11-17 22:08:32.000000000 -0800
+++ ./langtools/test/Makefile 2011-04-22 23:11:42.000000000 -0700
@@ -34,6 +34,22 @@
ARCH=i586
@@ -32089,7 +31239,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Root of all test results
TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
---- ./langtools/test/jprt.config 2011-06-27 11:18:00.000000000 -0700
+--- ./langtools/test/jprt.config 2011-11-17 22:08:39.000000000 -0800
+++ ./langtools/test/jprt.config 2011-04-22 23:11:43.000000000 -0700
@@ -71,8 +71,8 @@
@@ -32158,7 +31308,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Export PATH setting
PATH="${path4sdk}"
---- ./langtools/test/tools/javac/4846262/Test.sh 2011-06-27 11:18:08.000000000 -0700
+--- ./langtools/test/tools/javac/4846262/Test.sh 2011-11-17 22:08:41.000000000 -0800
+++ ./langtools/test/tools/javac/4846262/Test.sh 2011-04-22 23:11:44.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -32169,7 +31319,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2011-06-27 11:18:10.000000000 -0700
+--- ./langtools/test/tools/javac/6302184/T6302184.sh 2011-11-17 22:08:42.000000000 -0800
+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2011-04-22 23:11:44.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -32180,7 +31330,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2011-06-27 11:18:23.000000000 -0700
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2011-11-17 22:08:45.000000000 -0800
+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2011-04-22 23:11:44.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -32191,7 +31341,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2011-06-27 11:18:30.000000000 -0700
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2011-11-17 22:08:47.000000000 -0800
+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2011-04-22 23:11:44.000000000 -0700
@@ -54,7 +54,7 @@
# set platform-dependent variables
@@ -32202,7 +31352,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/MissingInclude.sh 2011-06-27 11:18:37.000000000 -0700
+--- ./langtools/test/tools/javac/MissingInclude.sh 2011-11-17 22:08:48.000000000 -0800
+++ ./langtools/test/tools/javac/MissingInclude.sh 2011-04-22 23:11:45.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -32213,7 +31363,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2011-06-27 11:18:43.000000000 -0700
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2011-11-17 22:08:49.000000000 -0800
+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2011-04-22 23:11:45.000000000 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
@@ -32224,7 +31374,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2011-06-27 11:18:48.000000000 -0700
+--- ./langtools/test/tools/javac/T5090006/compiler.sh 2011-11-17 22:08:51.000000000 -0800
+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2011-04-22 23:11:45.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -32235,7 +31385,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/apt.sh 2011-06-27 11:19:07.000000000 -0700
+--- ./langtools/test/tools/javac/apt.sh 2011-11-17 22:08:55.000000000 -0800
+++ ./langtools/test/tools/javac/apt.sh 2011-04-22 23:11:45.000000000 -0700
@@ -38,7 +38,7 @@
# set platform-dependent variables
@@ -32246,7 +31396,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2011-06-27 11:19:14.000000000 -0700
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2011-11-17 22:08:56.000000000 -0800
+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2011-04-22 23:11:46.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -32257,7 +31407,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2011-06-27 11:19:44.000000000 -0700
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2011-11-17 22:09:03.000000000 -0800
+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2011-04-22 23:11:46.000000000 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
@@ -32268,7 +31418,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2011-06-27 11:20:21.000000000 -0700
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2011-11-17 22:09:12.000000000 -0800
+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2011-04-22 23:11:47.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -32279,7 +31429,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh 2011-06-27 11:20:22.000000000 -0700
+--- ./langtools/test/tools/javac/javazip/Test.sh 2011-11-17 22:09:12.000000000 -0800
+++ ./langtools/test/tools/javac/javazip/Test.sh 2011-04-22 23:11:47.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -32290,7 +31440,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
SCR=`pwd`
;;
---- ./langtools/test/tools/javac/links/links.sh 2011-06-27 11:20:23.000000000 -0700
+--- ./langtools/test/tools/javac/links/links.sh 2011-11-17 22:09:12.000000000 -0800
+++ ./langtools/test/tools/javac/links/links.sh 2011-04-22 23:11:47.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -32301,7 +31451,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh 2011-06-27 11:20:30.000000000 -0700
+--- ./langtools/test/tools/javac/newlines/Newlines.sh 2011-11-17 22:09:14.000000000 -0800
+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2011-04-22 23:11:48.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -32312,7 +31462,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2011-06-27 11:20:43.000000000 -0700
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2011-11-17 22:09:17.000000000 -0800
+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2011-04-22 23:11:48.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -32323,7 +31473,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2011-06-27 11:20:47.000000000 -0700
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2011-11-17 22:09:18.000000000 -0800
+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2011-04-22 23:11:48.000000000 -0700
@@ -66,6 +66,17 @@
exit 0;
@@ -32343,7 +31493,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
Windows_98 | Windows_ME )
echo "As Windows 98/Me do not provide Unicode-aware file system, the compilation of the test case is expected to fail on these platforms. Ignoring this test."
exit 0;
---- ./langtools/test/tools/javah/6257087/foo.sh 2011-06-27 11:20:59.000000000 -0700
+--- ./langtools/test/tools/javah/6257087/foo.sh 2011-11-17 22:09:21.000000000 -0800
+++ ./langtools/test/tools/javah/6257087/foo.sh 2011-04-22 23:11:49.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -32354,7 +31504,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2011-06-27 11:21:00.000000000 -0700
+--- ./langtools/test/tools/javah/ConstMacroTest.sh 2011-11-17 22:09:21.000000000 -0800
+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2011-04-22 23:11:49.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -32365,7 +31515,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2011-06-27 11:21:00.000000000 -0700
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2011-11-17 22:09:21.000000000 -0800
+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2011-04-22 23:11:49.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -32376,7 +31526,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ReadOldClass.sh 2011-06-27 11:21:00.000000000 -0700
+--- ./langtools/test/tools/javah/ReadOldClass.sh 2011-11-17 22:09:21.000000000 -0800
+++ ./langtools/test/tools/javah/ReadOldClass.sh 2011-04-22 23:11:49.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -32387,7 +31537,7 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javap/pathsep.sh 2011-06-27 11:21:03.000000000 -0700
+--- ./langtools/test/tools/javap/pathsep.sh 2011-11-17 22:09:22.000000000 -0800
+++ ./langtools/test/tools/javap/pathsep.sh 2011-04-22 23:11:49.000000000 -0700
@@ -40,7 +40,7 @@
# set platform-dependent variables
@@ -32398,8 +31548,8 @@ Files /tmp/openjdk_srcdir.XT51s7Am/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./make/Defs-internal.gmk 2011-06-27 08:44:06.000000000 -0700
-+++ ./make/Defs-internal.gmk 2011-04-22 22:19:24.000000000 -0700
+--- ./make/Defs-internal.gmk 2011-11-17 21:30:05.000000000 -0800
++++ ./make/Defs-internal.gmk 2012-02-26 13:57:18.000000000 -0800
@@ -79,7 +79,7 @@
# Find all build_time_* files and print their contents in a list sorted
# on the name of the sub repository.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 05:09:27 +0000