diff options
| author | glewis <glewis@FreeBSD.org> | 2010-07-12 03:06:54 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2010-07-12 03:06:54 +0800 |
| commit | 417c3bba50f67d2b6e534af91e5fa08947c23159 (patch) | |
| tree | 376095d1825e0ff8e7fcab6c9ce16f59adb990b9 | |
| parent | 7f04f96533fbadd3402ed12ec24f9bf3993f7014 (diff) | |
| download | freebsd-ports-gnome-417c3bba50f67d2b6e534af91e5fa08947c23159.tar.gz freebsd-ports-gnome-417c3bba50f67d2b6e534af91e5fa08947c23159.tar.zst freebsd-ports-gnome-417c3bba50f67d2b6e534af91e5fa08947c23159.zip | |
. Update to Build 100.
| -rw-r--r-- | java/openjdk7/Makefile | 5 | ||||
| -rw-r--r-- | java/openjdk7/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-set | 4450 |
3 files changed, 2536 insertions, 1925 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 5c1c2fdfb959..ef7394cfcff5 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -15,6 +15,7 @@ DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ MAINTAINER= glewis@FreeBSD.org COMMENT= Java Development Kit 7 +LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} @@ -22,8 +23,8 @@ USE_ZIP= YES JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 0 -JDK_BUILD_NUMBER= 86 -JDK_BUILD_DATE= 18_mar_2010 +JDK_BUILD_NUMBER= 100 +JDK_BUILD_DATE= 09_jul_2010 JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}-ea-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} # Use our own version of ant to avoid circular dependencies diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo index 303158b64134..51b1a92c6baf 100644 --- a/java/openjdk7/distinfo +++ b/java/openjdk7/distinfo @@ -1,6 +1,6 @@ -MD5 (openjdk-7-ea-src-b86-18_mar_2010.zip) = c4c6eb552bffd2f6bfcef48aa237bf13 -SHA256 (openjdk-7-ea-src-b86-18_mar_2010.zip) = f769442f54cca429cc4bf3799fd2e6c75c3ef7d3e990d946290dae5ac51079bc -SIZE (openjdk-7-ea-src-b86-18_mar_2010.zip) = 95002753 +MD5 (openjdk-7-ea-src-b100-09_jul_2010.zip) = 658f5f92126100d6df275b28f1ab830a +SHA256 (openjdk-7-ea-src-b100-09_jul_2010.zip) = 06a91883accc747e69a5d6b432b8215ebb18c7c15d64431a7fe5f5c088437cb2 +SIZE (openjdk-7-ea-src-b100-09_jul_2010.zip) = 96065451 MD5 (apache-ant-1.7.1-bin.zip) = f64c979dd593324fd1e58eea4d991522 SHA256 (apache-ant-1.7.1-bin.zip) = 879a6ae22ae022a944a43f6dea21acfdec0acb30175e743664536f89626c0281 SIZE (apache-ant-1.7.1-bin.zip) = 11657986 diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set index a0de16f36e93..5e640eea222b 100644 --- a/java/openjdk7/files/patch-set +++ b/java/openjdk7/files/patch-set @@ -1,27 +1,13 @@ ---- ./.hgtags 2010-03-18 01:40:42.000000000 -0700 -+++ ./.hgtags 2010-03-20 11:11:41.000000000 -0700 -@@ -60,3 +60,4 @@ - 6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83 - 2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84 - cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85 -+433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 ---- ./.jcheck/conf 2010-03-18 01:40:42.000000000 -0700 +--- ./.jcheck/conf 2010-07-09 01:47:50.000000000 -0700 +++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./corba/.hgtags 2010-03-18 01:40:50.000000000 -0700 -+++ ./corba/.hgtags 2010-03-20 11:11:48.000000000 -0700 -@@ -60,3 +60,4 @@ - fde0df7a2384f7fe33204a79678989807d9c2b98 jdk7-b83 - 68c8961a82e4a3ad2a67991e5d834192a81eb4cd jdk7-b84 - c67a9df7bc0ca291f08f9a9cc05cb78ea15d25e6 jdk7-b85 -+6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 ---- ./corba/.jcheck/conf 2010-03-18 01:40:50.000000000 -0700 +--- ./corba/.jcheck/conf 2010-07-09 01:47:58.000000000 -0700 +++ ./corba/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./corba/make/common/Defs-bsd.gmk 2010-03-27 11:09:14.000000000 -0700 -+++ ./corba/make/common/Defs-bsd.gmk 2009-11-14 12:49:01.000000000 -0800 +--- ./corba/make/common/Defs-bsd.gmk 2010-07-11 09:19:15.000000000 -0700 ++++ ./corba/make/common/Defs-bsd.gmk 2010-07-11 09:11:16.000000000 -0700 @@ -25,7 +25,7 @@ # @@ -76,16 +62,16 @@ DEBUG_FLAG = -g ifeq ($(FASTDEBUG), true) ifeq ($(ARCH_DATA_MODEL), 64) -@@ -176,7 +183,7 @@ - CXXFLAGS_DBG += $(CC_LOWER_OPT) +@@ -185,7 +192,7 @@ + CPP_ARCH_FLAGS += -D_$(ARCH)_ endif --CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DBSD $(VERSION_DEFINES) \ -+CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -D_ALLBSD_SOURCE $(VERSION_DEFINES) \ +-CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DBSD $(VERSION_DEFINES) \ ++CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D_ALLBSD_SOURCE $(VERSION_DEFINES) \ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT ifeq ($(ARCH_DATA_MODEL), 64) -@@ -186,33 +193,15 @@ +@@ -195,33 +202,15 @@ CPPFLAGS_OPT = CPPFLAGS_DBG = -DDEBUG @@ -123,7 +109,7 @@ # # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always -@@ -243,6 +232,11 @@ +@@ -252,6 +241,11 @@ # LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker @@ -135,7 +121,7 @@ # # Support for Quantify. # -@@ -278,7 +272,9 @@ +@@ -287,7 +281,9 @@ override HAVE_FILIOH = false override HAVE_GETHRTIME = false override HAVE_GETHRVTIME = false @@ -145,7 +131,7 @@ override LEX_LIBRARY = -lfl ifeq ($(STATIC_CXX),true) override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic -@@ -290,12 +286,8 @@ +@@ -299,12 +295,8 @@ override LIBTHREAD = override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = true @@ -159,9 +145,9 @@ override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = override THREADS_FLAG = native ---- ./corba/make/common/Defs-linux.gmk 2010-03-18 01:40:51.000000000 -0700 -+++ ./corba/make/common/Defs-linux.gmk 2009-11-13 00:07:56.000000000 -0800 -@@ -290,7 +290,7 @@ +--- ./corba/make/common/Defs-linux.gmk 2010-07-09 01:47:59.000000000 -0700 ++++ ./corba/make/common/Defs-linux.gmk 2010-07-11 09:11:16.000000000 -0700 +@@ -299,7 +299,7 @@ override LIBTHREAD = override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = true @@ -170,8 +156,8 @@ ifeq ($(ARCH), amd64) override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 else ---- ./corba/make/common/Defs.gmk 2010-03-18 01:40:51.000000000 -0700 -+++ ./corba/make/common/Defs.gmk 2009-10-05 22:35:11.000000000 -0700 +--- ./corba/make/common/Defs.gmk 2010-07-09 01:47:59.000000000 -0700 ++++ ./corba/make/common/Defs.gmk 2010-07-11 09:11:16.000000000 -0700 @@ -53,6 +53,28 @@ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) @@ -211,8 +197,8 @@ endif # PROGRAM LDLIBS_COMMON += $(EXTRA_LIBS) ---- ./corba/make/common/Mapfile-vers.gmk 2010-03-18 01:40:51.000000000 -0700 -+++ ./corba/make/common/Mapfile-vers.gmk 2009-06-06 16:47:35.000000000 -0700 +--- ./corba/make/common/Mapfile-vers.gmk 2010-07-09 01:47:59.000000000 -0700 ++++ ./corba/make/common/Mapfile-vers.gmk 2010-07-11 09:11:16.000000000 -0700 @@ -77,7 +77,7 @@ endif # PLATFORM @@ -222,8 +208,8 @@ ifeq ($(VARIANT), OPT) # OPT build MUST have a mapfile? ---- ./corba/make/common/shared/Compiler-gcc.gmk 2010-03-18 01:40:51.000000000 -0700 -+++ ./corba/make/common/shared/Compiler-gcc.gmk 2009-11-13 00:07:56.000000000 -0800 +--- ./corba/make/common/shared/Compiler-gcc.gmk 2010-07-09 01:47:59.000000000 -0700 ++++ ./corba/make/common/shared/Compiler-gcc.gmk 2010-07-11 09:11:16.000000000 -0700 @@ -100,6 +100,23 @@ endif @@ -248,8 +234,8 @@ ifeq ($(PLATFORM), solaris) # Settings specific to Solaris ---- ./corba/make/common/shared/Compiler.gmk 2010-03-18 01:40:51.000000000 -0700 -+++ ./corba/make/common/shared/Compiler.gmk 2009-06-06 16:47:35.000000000 -0700 +--- ./corba/make/common/shared/Compiler.gmk 2010-07-09 01:47:59.000000000 -0700 ++++ ./corba/make/common/shared/Compiler.gmk 2010-07-11 09:11:16.000000000 -0700 @@ -42,6 +42,11 @@ override CC_VERSION = gcc endif @@ -262,8 +248,8 @@ # Get the compiler specific settings include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk ---- ./corba/make/common/shared/Defs-bsd.gmk 2010-03-27 11:09:14.000000000 -0700 -+++ ./corba/make/common/shared/Defs-bsd.gmk 2009-06-06 16:47:35.000000000 -0700 +--- ./corba/make/common/shared/Defs-bsd.gmk 2010-07-11 09:19:15.000000000 -0700 ++++ ./corba/make/common/shared/Defs-bsd.gmk 2010-07-11 09:11:16.000000000 -0700 @@ -54,7 +54,7 @@ endef @@ -282,8 +268,8 @@ endif # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK. ---- ./corba/make/common/shared/Defs-utils.gmk 2010-03-18 01:40:51.000000000 -0700 -+++ ./corba/make/common/shared/Defs-utils.gmk 2009-10-05 22:35:11.000000000 -0700 +--- ./corba/make/common/shared/Defs-utils.gmk 2010-07-09 01:47:59.000000000 -0700 ++++ ./corba/make/common/shared/Defs-utils.gmk 2010-07-11 09:11:16.000000000 -0700 @@ -53,6 +53,13 @@ UTILS_DEVTOOL_PATH=$(USRBIN_PATH) endif @@ -331,9 +317,9 @@ + TAR = $(UTILS_USR_BIN_PATH)tar + endif +endif ---- ./corba/make/common/shared/Platform.gmk 2010-03-18 01:40:51.000000000 -0700 -+++ ./corba/make/common/shared/Platform.gmk 2009-12-20 19:49:46.000000000 -0800 -@@ -258,6 +258,101 @@ +--- ./corba/make/common/shared/Platform.gmk 2010-07-09 01:47:59.000000000 -0700 ++++ ./corba/make/common/shared/Platform.gmk 2010-07-11 09:11:16.000000000 -0700 +@@ -254,6 +254,101 @@ MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) endif @@ -435,7 +421,7 @@ # Windows with and without CYGWIN will be slightly different ifeq ($(SYSTEM_UNAME), Windows_NT) PLATFORM = windows -@@ -418,6 +513,18 @@ +@@ -417,6 +512,18 @@ export MAX_VM_MEMORY endif @@ -454,220 +440,12 @@ REQUIRED_ZIP_VER = 2.2 REQUIRED_UNZIP_VER = 5.12 REQUIRED_MAKE_VER = 3.78 ---- ./corba/make/sun/corba/core/Makefile 2010-03-18 01:40:51.000000000 -0700 -+++ ./corba/make/sun/corba/core/Makefile 2009-06-06 16:47:35.000000000 -0700 -@@ -53,11 +53,19 @@ - ifdef STANDALONE_CORBA_WS - # FIXUP: What is this all about? - OTHER_LDFLAGS=-L$(BOOTDIR)/jre/lib/$(ARCH) -L$(BOOTDIR)/jre/lib/$(LIBARCH)/native_threads -ljvm -+ifeq ($(PLATFORM), bsd) -+OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(OS_NAME) -+else - OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(PLATFORM) -+endif - else - OTHER_LDLIBS=$(JVMLIB) -+ifeq ($(PLATFORM), bsd) -+OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(OS_NAME) -+else - OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(PLATFORM) - endif -+endif - - - FILES_c = ioser.c ---- ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2010-03-18 01:40:54.000000000 -0700 -+++ ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2009-06-06 16:47:41.000000000 -0700 -@@ -24,6 +24,7 @@ - */ - - #include "jni.h" -+#include <stdint.h> - - #include "com_sun_corba_se_internal_io_IIOPInputStream.h" - #include "com_sun_corba_se_internal_io_IIOPOutputStream.h" -@@ -643,7 +644,7 @@ - JNIEXPORT jobject JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getObjectFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetObjectField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetObjectField(env, obj, (jfieldID)(intptr_t)fieldID); - } - - /* -@@ -654,7 +655,7 @@ - JNIEXPORT jboolean JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getBooleanFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetBooleanField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetBooleanField(env, obj, (jfieldID)(intptr_t)fieldID); - } - - /* -@@ -665,7 +666,7 @@ - JNIEXPORT jbyte JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getByteFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetByteField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetByteField(env, obj, (jfieldID)(intptr_t)fieldID); - - } - -@@ -677,7 +678,7 @@ - JNIEXPORT jchar JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getCharFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetCharField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetCharField(env, obj, (jfieldID)(intptr_t)fieldID); - - } - -@@ -689,7 +690,7 @@ - JNIEXPORT jshort JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getShortFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetShortField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetShortField(env, obj, (jfieldID)(intptr_t)fieldID); - } - - /* -@@ -700,7 +701,7 @@ - JNIEXPORT jint JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getIntFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetIntField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetIntField(env, obj, (jfieldID)(intptr_t)fieldID); - - } - -@@ -713,7 +714,7 @@ - JNIEXPORT jlong JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getLongFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetLongField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetLongField(env, obj, (jfieldID)(intptr_t)fieldID); - - } - -@@ -725,7 +726,7 @@ - JNIEXPORT jfloat JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getFloatFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetFloatField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetFloatField(env, obj, (jfieldID)(intptr_t)fieldID); - - } - -@@ -737,7 +738,7 @@ - JNIEXPORT jdouble JNICALL Java_com_sun_corba_se_internal_io_IIOPOutputStream_getDoubleFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID) - { -- return (*env)->GetDoubleField(env, obj, (jfieldID)fieldID); -+ return (*env)->GetDoubleField(env, obj, (jfieldID)(intptr_t)fieldID); - - } - -@@ -751,7 +752,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setObjectFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jobject v) - { -- (*env)->SetObjectField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetObjectField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -762,7 +763,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setBooleanFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jboolean v) - { -- (*env)->SetBooleanField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetBooleanField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -773,7 +774,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setByteFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jbyte v) - { -- (*env)->SetByteField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetByteField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -784,7 +785,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setCharFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jchar v) - { -- (*env)->SetCharField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetCharField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -795,7 +796,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setShortFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jshort v) - { -- (*env)->SetShortField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetShortField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -806,7 +807,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setIntFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jint v) - { -- (*env)->SetIntField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetIntField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -817,7 +818,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setLongFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jlong v) - { -- (*env)->SetLongField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetLongField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -828,7 +829,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setFloatFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jfloat v) - { -- (*env)->SetFloatField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetFloatField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -839,7 +840,7 @@ - JNIEXPORT void JNICALL Java_com_sun_corba_se_internal_io_IIOPInputStream_setDoubleFieldOpt - (JNIEnv *env, jobject this, jobject obj, jlong fieldID, jdouble v) - { -- (*env)->SetDoubleField(env, obj, (jfieldID)fieldID, v); -+ (*env)->SetDoubleField(env, obj, (jfieldID)(intptr_t)fieldID, v); - } - - /* -@@ -858,5 +859,5 @@ - (*env)->ReleaseStringUTFChars(env, fieldName, strFieldName); - (*env)->ReleaseStringUTFChars(env, fieldSig, strFieldSig); - -- return (jlong)fieldID; -+ return (jlong)(intptr_t)fieldID; - } ---- ./hotspot/.hgtags 2010-03-18 01:41:32.000000000 -0700 -+++ ./hotspot/.hgtags 2010-03-20 11:11:57.000000000 -0700 -@@ -83,3 +83,4 @@ - ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84 - 6c9796468b91dcbb39e09dfa1baf9779ac45eb66 jdk7-b85 - 418bc80ce13995149eadc9eecbba21d7a9fa02ae hs17-b10 -+bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86 ---- ./hotspot/.jcheck/conf 2010-03-18 01:41:32.000000000 -0700 +--- ./hotspot/.jcheck/conf 2010-07-09 01:48:39.000000000 -0700 +++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./hotspot/agent/make/Makefile 2010-03-18 01:41:32.000000000 -0700 -+++ ./hotspot/agent/make/Makefile 2009-06-06 16:53:52.000000000 -0700 +--- ./hotspot/agent/make/Makefile 2010-07-09 01:48:39.000000000 -0700 ++++ ./hotspot/agent/make/Makefile 2010-07-11 09:11:30.000000000 -0700 @@ -52,6 +52,9 @@ sun.jvm.hotspot.compiler \ sun.jvm.hotspot.debugger \ @@ -697,8 +475,8 @@ 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 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2009-06-06 16:53:52.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-07-11 09:11:31.000000000 -0700 @@ -22,6 +22,7 @@ * */ @@ -838,14 +616,10 @@ #endif /* amd64 */ ---- ./hotspot/agent/src/os/bsd/Makefile 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/Makefile 2009-10-05 21:49:06.000000000 -0700 -@@ -19,10 +19,10 @@ - # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - # CA 95054 USA or visit www.sun.com if you need additional information or - # have any questions. --# -+# +--- ./hotspot/agent/src/os/bsd/Makefile 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/Makefile 2010-07-11 09:11:31.000000000 -0700 +@@ -22,7 +22,7 @@ + # # -ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) @@ -919,7 +693,7 @@ + -rmdir $(ARCH) --- ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2009-06-06 16:53:52.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2010-07-11 09:11:31.000000000 -0700 @@ -0,0 +1,120 @@ +/* + * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. @@ -1041,8 +815,8 @@ + (JNIEnv *env, jobject this_obj, jint lwp_id) { + return 0; +} ---- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2009-06-06 16:53:52.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/elfmacros.h 2010-07-11 09:11:31.000000000 -0700 @@ -25,16 +25,19 @@ #ifndef _ELFMACROS_H_ #define _ELFMACROS_H_ @@ -1079,7 +853,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 2009-06-06 16:53:52.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2010-07-11 09:11:31.000000000 -0700 @@ -0,0 +1,217 @@ +/* Copyright (C) 1993,1995-1997,2002,2005,2007,2008 + Free Software Foundation, Inc. @@ -1299,7 +1073,7 @@ + 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 2009-06-06 16:53:52.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2010-07-11 09:11:31.000000000 -0700 @@ -0,0 +1,42 @@ +/* Declarations for System V style searching functions. + Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. @@ -1343,8 +1117,8 @@ +extern void hdestroy_r (struct hsearch_data *__htab); + +#endif /* _HSEARCH_R_H_ */ ---- ./hotspot/agent/src/os/bsd/libproc.h 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/libproc.h 2009-06-06 16:53:52.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/libproc.h 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/libproc.h 2010-07-11 09:11:31.000000000 -0700 @@ -27,7 +27,8 @@ #include <unistd.h> @@ -1405,9 +1179,14 @@ // get number of shared objects int get_num_libs(struct ps_prochandle* ph); ---- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2009-06-06 16:53:52.000000000 -0700 -@@ -178,6 +178,9 @@ +--- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-07-11 09:11:31.000000000 -0700 +@@ -174,10 +174,13 @@ + return NULL; + } + +- newlib->symtab = build_symtab(newlib->fd, libname); ++ newlib->symtab = build_symtab(newlib->fd); if (newlib->symtab == NULL) { print_debug("symbol table build failed for %s\n", newlib->name); } @@ -1501,8 +1280,8 @@ + print_debug("ps_pcontinue not implemented\n"); return PS_OK; } ---- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2009-06-06 16:53:52.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-07-11 09:11:31.000000000 -0700 @@ -47,7 +47,7 @@ typedef struct thread_info { lwpid_t lwp_id; @@ -1532,8 +1311,8 @@ // 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 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/mapfile 2009-06-06 16:53:52.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/mapfile 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/mapfile 2010-07-11 09:11:31.000000000 -0700 @@ -43,13 +43,17 @@ # proc_service.h functions - to be used by libthread_db ps_getpid; @@ -1555,11 +1334,11 @@ # used by attach test program init_libproc; ---- ./hotspot/agent/src/os/bsd/proc_service.h 2010-03-27 11:09:09.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/proc_service.h 2010-07-11 09:19:10.000000000 -0700 +++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,76 +0,0 @@ -/* -- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -1576,9 +1355,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -1634,8 +1413,8 @@ -ps_err_e ps_get_thread_area(); - -#endif /* _PROC_SERVICE_H_ */ ---- ./hotspot/agent/src/os/bsd/ps_core.c 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/ps_core.c 2009-10-05 21:49:06.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/ps_core.c 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/ps_core.c 2010-07-11 09:11:31.000000000 -0700 @@ -142,6 +142,7 @@ map->next = ph->core->class_share_maps; @@ -1899,7 +1678,7 @@ if (read_interp_segments(ph) != true) return false; -@@ -870,14 +880,14 @@ +@@ -870,26 +880,23 @@ // address mentioned in shared object and the actual virtual base where runtime // linker loaded it. We use "base diff" in read_lib_segments call below. @@ -1916,7 +1695,21 @@ &lib_name_addr, sizeof(uintptr_t)) != PS_OK) { print_debug("can't read address of shared object name\n"); return false; -@@ -921,7 +931,7 @@ + } + + // read name of the shared object +- lib_name[0] = '\0'; +- if (lib_name_addr != 0 && +- read_string(ph, (uintptr_t) lib_name_addr, lib_name, sizeof(lib_name)) != true) { ++ if (read_string(ph, (uintptr_t) lib_name_addr, lib_name, sizeof(lib_name)) != true) { + print_debug("can't read shared object name\n"); +- // don't let failure to read the name stop opening the file. If something is really wrong +- // it will fail later. ++ return false; + } + + if (lib_name[0] != '\0') { +@@ -924,7 +931,7 @@ } // read next link_map address @@ -1925,7 +1718,7 @@ &link_map_addr, sizeof(uintptr_t)) != PS_OK) { print_debug("can't read next link in link_map\n"); return false; -@@ -935,7 +945,6 @@ +@@ -938,7 +945,6 @@ struct ps_prochandle* Pgrab_core(const char* exec_file, const char* core_file) { ELF_EHDR core_ehdr; ELF_EHDR exec_ehdr; @@ -1933,8 +1726,8 @@ struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle)); if (ph == NULL) { ---- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2009-10-05 21:49:06.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/ps_proc.c 2010-07-11 09:11:31.000000000 -0700 @@ -22,20 +22,22 @@ * */ @@ -2498,8 +2291,8 @@ - } return ph; } ---- ./hotspot/agent/src/os/bsd/salibelf.c 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/salibelf.c 2009-06-06 16:53:52.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/salibelf.c 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/salibelf.c 2010-07-11 09:11:31.000000000 -0700 @@ -25,6 +25,7 @@ #include "salibelf.h" #include <stdlib.h> @@ -2508,8 +2301,8 @@ extern void print_debug(const char*,...); ---- ./hotspot/agent/src/os/bsd/symtab.c 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/symtab.c 2009-06-06 16:53:52.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/symtab.c 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/symtab.c 2010-07-11 09:11:31.000000000 -0700 @@ -23,10 +23,10 @@ */ @@ -2522,30 +2315,303 @@ #include "symtab.h" #include "salibelf.h" -@@ -56,7 +56,6 @@ - // read symbol table from given fd. - struct symtab* build_symtab(int fd) { +@@ -53,276 +53,9 @@ + struct hsearch_data *hash_table; + } symtab_t; + +- +-// Directory that contains global debuginfo files. In theory it +-// should be possible to change this, but in a Java environment there +-// is no obvious place to put a user interface to do it. Maybe this +-// could be set with an environment variable. +-static const char debug_file_directory[] = "/usr/lib/debug"; +- +-/* The CRC used in gnu_debuglink, retrieved from +- http://sourceware.org/gdb/current/onlinedocs/gdb/Separate-Debug-Files.html#Separate-Debug-Files. */ +-unsigned int gnu_debuglink_crc32 (unsigned int crc, +- unsigned char *buf, size_t len) +-{ +- static const unsigned int crc32_table[256] = +- { +- 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, +- 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, +- 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, +- 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, +- 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, +- 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, +- 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, +- 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, +- 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, +- 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, +- 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, +- 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, +- 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, +- 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, +- 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, +- 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, +- 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, +- 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, +- 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, +- 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, +- 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, +- 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, +- 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, +- 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, +- 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, +- 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, +- 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, +- 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, +- 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, +- 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, +- 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, +- 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, +- 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, +- 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, +- 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, +- 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, +- 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, +- 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, +- 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, +- 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, +- 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, +- 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, +- 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, +- 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, +- 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, +- 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, +- 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, +- 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, +- 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, +- 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, +- 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, +- 0x2d02ef8d +- }; +- unsigned char *end; +- +- crc = ~crc & 0xffffffff; +- for (end = buf + len; buf < end; ++buf) +- crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8); +- return ~crc & 0xffffffff; +-} +- +-/* Open a debuginfo file and check its CRC. If it exists and the CRC +- matches return its fd. */ +-static int +-open_debug_file (const char *pathname, unsigned int crc) +-{ +- unsigned int file_crc = 0; +- unsigned char buffer[8 * 1024]; +- +- int fd = pathmap_open(pathname); +- +- if (fd < 0) +- return -1; +- +- lseek(fd, 0, SEEK_SET); +- +- for (;;) { +- int len = read(fd, buffer, sizeof buffer); +- if (len <= 0) +- break; +- file_crc = gnu_debuglink_crc32(file_crc, buffer, len); +- } +- +- if (crc == file_crc) +- return fd; +- else { +- close(fd); +- return -1; +- } +-} +- +-/* Find an ELF section. */ +-static struct elf_section *find_section_by_name(char *name, +- int fd, +- ELF_EHDR *ehdr, +- ELF_SHDR *shbuf, +- struct elf_section *scn_cache) +-{ +- ELF_SHDR* cursct = NULL; +- char *strtab; +- int cnt; +- +- if (scn_cache[ehdr->e_shstrndx].c_data == NULL) { +- if ((scn_cache[ehdr->e_shstrndx].c_data +- = read_section_data(fd, ehdr, cursct)) == NULL) { +- return NULL; +- } +- } +- +- strtab = scn_cache[ehdr->e_shstrndx].c_data; +- +- for (cursct = shbuf, cnt = 0; +- cnt < ehdr->e_shnum; +- cnt++, cursct++) { +- if (strcmp(cursct->sh_name + strtab, name) == 0) { +- scn_cache[cnt].c_data = read_section_data(fd, ehdr, cursct); +- return &scn_cache[cnt]; +- } +- } +- +- return NULL; +-} +- +-/* Look for a ".gnu_debuglink" section. If one exists, try to open a +- suitable debuginfo file. */ +-static int open_file_from_debug_link(const char *name, +- int fd, +- ELF_EHDR *ehdr, +- ELF_SHDR *shbuf, +- struct elf_section *scn_cache) +-{ +- int debug_fd; +- struct elf_section *debug_link = find_section_by_name(".gnu_debuglink", fd, ehdr, +- shbuf, scn_cache); +- if (debug_link == NULL) +- return -1; +- char *debug_filename = debug_link->c_data; +- int offset = (strlen(debug_filename) + 4) >> 2; +- static unsigned int crc; +- crc = ((unsigned int*)debug_link->c_data)[offset]; +- char *debug_pathname = malloc(strlen(debug_filename) +- + strlen(name) +- + strlen(".debug/") +- + strlen(debug_file_directory) +- + 2); +- strcpy(debug_pathname, name); +- char *last_slash = strrchr(debug_pathname, '/'); +- if (last_slash == NULL) +- return -1; +- +- /* Look in the same directory as the object. */ +- strcpy(last_slash+1, debug_filename); +- +- debug_fd = open_debug_file(debug_pathname, crc); +- if (debug_fd >= 0) { +- free(debug_pathname); +- return debug_fd; +- } +- +- /* Look in a subdirectory named ".debug". */ +- strcpy(last_slash+1, ".debug/"); +- strcat(last_slash, debug_filename); +- +- debug_fd = open_debug_file(debug_pathname, crc); +- if (debug_fd >= 0) { +- free(debug_pathname); +- return debug_fd; +- } +- +- /* Look in /usr/lib/debug + the full pathname. */ +- strcpy(debug_pathname, debug_file_directory); +- strcat(debug_pathname, name); +- last_slash = strrchr(debug_pathname, '/'); +- strcpy(last_slash+1, debug_filename); +- +- debug_fd = open_debug_file(debug_pathname, crc); +- if (debug_fd >= 0) { +- free(debug_pathname); +- return debug_fd; +- } +- +- free(debug_pathname); +- return -1; +-} +- +-static struct symtab* build_symtab_internal(int fd, const char *filename, bool try_debuginfo); +- +-/* Look for a ".gnu_debuglink" section. If one exists, try to open a +- suitable debuginfo file and read a symbol table from it. */ +-static struct symtab *build_symtab_from_debug_link(const char *name, +- int fd, +- ELF_EHDR *ehdr, +- ELF_SHDR *shbuf, +- struct elf_section *scn_cache) +-{ +- fd = open_file_from_debug_link(name, fd, ehdr, shbuf, scn_cache); +- +- if (fd >= 0) { +- struct symtab *symtab = build_symtab_internal(fd, NULL, /* try_debuginfo */ false); +- close(fd); +- return symtab; +- } +- +- return NULL; +-} +- +-// Given a build_id, find the associated debuginfo file +-static char * +-build_id_to_debug_filename (size_t size, unsigned char *data) +-{ +- char *filename, *s; +- +- filename = malloc(strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 +- + 2 * size + (sizeof ".debug" - 1) + 1); +- s = filename + sprintf (filename, "%s/.build-id/", debug_file_directory); +- if (size > 0) +- { +- size--; +- s += sprintf (s, "%02x", *data++); +- } +- if (size > 0) +- *s++ = '/'; +- while (size-- > 0) +- s += sprintf (s, "%02x", *data++); +- strcpy (s, ".debug"); +- +- return filename; +-} +- +-// Read a build ID note. Try to open any associated debuginfo file +-// and return its symtab +-static struct symtab* build_symtab_from_build_id(Elf64_Nhdr *note) +-{ +- int fd; +- struct symtab *symtab = NULL; +- +- unsigned char *bytes +- = (unsigned char*)(note+1) + note->n_namesz; +- unsigned char *filename +- = (build_id_to_debug_filename (note->n_descsz, bytes)); +- +- fd = pathmap_open(filename); +- if (fd >= 0) { +- symtab = build_symtab_internal(fd, NULL, /* try_debuginfo */ false); +- close(fd); +- } +- free(filename); +- +- return symtab; +-} +- +-// read symbol table from given fd. If try_debuginfo) is true, also +-// try to open an associated debuginfo file +-static struct symtab* build_symtab_internal(int fd, const char *filename, bool try_debuginfo) { ++// read symbol table from given fd. ++struct symtab* build_symtab(int fd) { ELF_EHDR ehdr; - char *names = NULL; struct symtab* symtab = NULL; // Reading of elf header -@@ -65,7 +64,9 @@ +@@ -331,8 +64,9 @@ ELF_SHDR* shbuf = NULL; ELF_SHDR* cursct = NULL; ELF_PHDR* phbuf = NULL; - ELF_PHDR* phdr = NULL; +- int sym_section = SHT_DYNSYM; + int symtab_found = 0; + int dynsym_found = 0; + uint32_t symsection = SHT_SYMTAB; uintptr_t baseaddr = (uintptr_t)-1; -@@ -90,18 +91,30 @@ +@@ -357,23 +91,30 @@ 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) { +- if (cursct->sh_type == SHT_SYMTAB || cursct->sh_type == SHT_STRTAB +- || cursct->sh_type == SHT_NOTE || cursct->sh_type == SHT_DYNSYM) { + if (cursct->sh_type == SHT_SYMTAB || + cursct->sh_type == SHT_STRTAB || + cursct->sh_type == SHT_DYNSYM) { @@ -2553,6 +2619,10 @@ goto quit; } } +- if (cursct->sh_type == SHT_SYMTAB) { +- // Full symbol table available so use that +- sym_section = cursct->sh_type; +- } + + if (cursct->sh_type == SHT_SYMTAB) + symtab_found++; @@ -2569,13 +2639,82 @@ for (cnt = 1; cnt < ehdr.e_shnum; cnt++) { ELF_SHDR *shdr = scn_cache[cnt].c_shdr; -- if (shdr->sh_type == SHT_SYMTAB) { +- if (shdr->sh_type == sym_section) { + if (shdr->sh_type == symsection) { ELF_SYM *syms; int j, n, rslt; size_t size; ---- ./hotspot/agent/src/os/bsd/test.c 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/test.c 2009-06-06 16:53:52.000000000 -0700 +@@ -435,45 +176,6 @@ + } + } + +- // Look for a separate debuginfo file. +- if (try_debuginfo) { +- +- // We prefer a debug symtab to an object's own symtab, so look in +- // the debuginfo file. We stash a copy of the old symtab in case +- // there is no debuginfo. +- struct symtab* prev_symtab = symtab; +- symtab = NULL; +- +-#ifdef NT_GNU_BUILD_ID +- // First we look for a Build ID +- for (cursct = shbuf, cnt = 0; +- symtab == NULL && cnt < ehdr.e_shnum; +- cnt++) { +- if (cursct->sh_type == SHT_NOTE) { +- Elf64_Nhdr *note = (Elf64_Nhdr *)scn_cache[cnt].c_data; +- if (note->n_type == NT_GNU_BUILD_ID) { +- symtab = build_symtab_from_build_id(note); +- } +- } +- cursct++; +- } +-#endif +- +- // Then, if that doesn't work, the debug link +- if (symtab == NULL) { +- symtab = build_symtab_from_debug_link(filename, fd, &ehdr, shbuf, +- scn_cache); +- } +- +- // If we still haven't found a symtab, use the object's own symtab. +- if (symtab != NULL) { +- if (prev_symtab != NULL) +- destroy_symtab(prev_symtab); +- } else { +- symtab = prev_symtab; +- } +- } +- + quit: + if (shbuf) free(shbuf); + if (phbuf) free(phbuf); +@@ -488,11 +190,6 @@ + return symtab; + } + +-struct symtab* build_symtab(int fd, const char *filename) { +- return build_symtab_internal(fd, filename, /* try_debuginfo */ true); +-} +- +- + void destroy_symtab(struct symtab* symtab) { + if (!symtab) return; + if (symtab->strs) free(symtab->strs); +--- ./hotspot/agent/src/os/bsd/symtab.h 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/symtab.h 2010-07-11 09:11:31.000000000 -0700 +@@ -32,7 +32,7 @@ + struct symtab; + + // build symbol table for a given ELF file descriptor +-struct symtab* build_symtab(int fd, const char *filename); ++struct symtab* build_symtab(int fd); + + // destroy the symbol table + void destroy_symtab(struct symtab* symtab); +--- ./hotspot/agent/src/os/bsd/test.c 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/test.c 2010-07-11 09:11:31.000000000 -0700 @@ -44,7 +44,7 @@ } @@ -2585,8 +2724,8 @@ return 1; } } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-03-18 01:41:33.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2009-06-06 16:53:53.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-07-09 01:48:40.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-07-11 09:11:32.000000000 -0700 @@ -28,6 +28,7 @@ import java.net.*; import java.rmi.*; @@ -2656,8 +2795,8 @@ /** 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 2010-03-18 01:41:33.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2009-06-06 16:53:54.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-07-09 01:48:40.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-07-11 09:11:33.000000000 -0700 @@ -29,6 +29,7 @@ import java.rmi.*; import sun.jvm.hotspot.*; @@ -2729,8 +2868,8 @@ /** 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 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2009-06-06 16:53:54.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-07-11 09:11:34.000000000 -0700 @@ -30,10 +30,8 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -2756,8 +2895,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2009-06-06 16:53:54.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-07-11 09:11:34.000000000 -0700 @@ -26,9 +26,7 @@ import sun.jvm.hotspot.debugger.*; @@ -2779,11 +2918,11 @@ } else { throw new RuntimeException("cpu " + cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-03-27 11:09:09.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-07-11 09:19:10.000000000 -0700 +++ ./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 @@ -/* -- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -2800,9 +2939,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -2828,11 +2967,11 @@ - return debugger.newAddress(getRegister(index)); - } -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-03-27 11:09:09.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-07-11 09:19:10.000000000 -0700 +++ ./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 @@ -/* -- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -2849,9 +2988,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -2912,11 +3051,11 @@ - private Address sp; - private BsdDebugger dbg; -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-03-27 11:09:09.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-07-11 09:19:10.000000000 -0700 +++ ./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 @@ -/* -- * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -2933,9 +3072,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -2961,8 +3100,8 @@ - return debugger.newAddress(getRegister(index)); - } -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-03-18 01:41:35.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2009-09-07 10:57:21.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-07-09 01:48:42.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-07-11 09:11:37.000000000 -0700 @@ -37,6 +37,8 @@ import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess; import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess; @@ -2986,8 +3125,8 @@ } if (access == null) { ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2009-06-06 16:53:56.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-07-11 09:11:37.000000000 -0700 @@ -28,37 +28,36 @@ private static String[] signalNames = { "", /* No signal 0 */ @@ -3048,11 +3187,11 @@ }; public static String getSignalName(int sigNum) { ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-03-27 11:09:09.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-07-11 09:19:10.000000000 -0700 +++ ./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 @@ -/* -- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -3069,9 +3208,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -3188,11 +3327,11 @@ - return debugger.getThreadForIdentifierAddress(pthreadIdAddr); - } -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-03-27 11:09:09.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-07-11 09:19:10.000000000 -0700 +++ ./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 @@ -/* -- * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -3209,9 +3348,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -3356,8 +3495,8 @@ - - -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2009-06-06 16:53:56.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-07-11 09:11:37.000000000 -0700 @@ -28,37 +28,36 @@ private static String[] signalNames = { "", /* No signal 0 */ @@ -3418,8 +3557,8 @@ }; public static String getSignalName(int sigNum) { ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-03-18 01:41:36.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2009-06-06 16:53:57.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-07-09 01:48:43.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-07-11 09:11:38.000000000 -0700 @@ -37,6 +37,14 @@ return "solaris"; } else if (os.equals("Linux")) { @@ -3435,8 +3574,8 @@ } else if (os.startsWith("Windows")) { return "win32"; } else { ---- ./hotspot/make/Makefile 2010-03-18 01:41:36.000000000 -0700 -+++ ./hotspot/make/Makefile 2010-02-15 08:08:22.000000000 -0800 +--- ./hotspot/make/Makefile 2010-07-09 01:48:43.000000000 -0700 ++++ ./hotspot/make/Makefile 2010-07-11 09:11:39.000000000 -0700 @@ -290,20 +290,20 @@ # Shared Library ifneq ($(OSNAME),windows) @@ -3465,8 +3604,8 @@ $(install-file) endif endif ---- ./hotspot/make/bsd/Makefile 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/make/bsd/Makefile 2009-11-04 19:52:29.000000000 -0800 +--- ./hotspot/make/bsd/Makefile 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/make/bsd/Makefile 2010-07-11 09:11:39.000000000 -0700 @@ -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 @@ -3505,8 +3644,8 @@ OS_VERSION := $(shell uname -r) EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) ---- ./hotspot/make/bsd/makefiles/buildtree.make 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/buildtree.make 2009-11-04 19:52:29.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/buildtree.make 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/buildtree.make 2010-07-11 09:11:39.000000000 -0700 @@ -287,10 +287,11 @@ [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \ { \ @@ -3520,8 +3659,8 @@ ) > $@ env.csh: env.sh ---- ./hotspot/make/bsd/makefiles/cscope.make 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/cscope.make 2009-06-06 16:53:58.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/cscope.make 2010-07-11 09:19:10.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/cscope.make 2010-07-11 09:11:39.000000000 -0700 @@ -71,7 +71,7 @@ # OS-specific files for other systems are excluded by default. Use CS_OS=yes # to include platform-specific files for other platforms. @@ -3531,8 +3670,8 @@ CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS})) endif ---- ./hotspot/make/bsd/makefiles/defs.make 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/defs.make 2009-11-04 21:25:27.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/defs.make 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/defs.make 2010-07-11 09:11:39.000000000 -0700 @@ -72,8 +72,8 @@ HS_ARCH = sparc endif @@ -3620,8 +3759,8 @@ EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar endif endif ---- ./hotspot/make/bsd/makefiles/gcc.make 2010-03-27 11:09:09.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/gcc.make 2009-11-04 19:52:29.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/gcc.make 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/gcc.make 2010-07-11 09:11:39.000000000 -0700 @@ -22,12 +22,15 @@ # # @@ -3733,8 +3872,8 @@ #------------------------------------------------------------------------ # Debug flags ---- ./hotspot/make/bsd/makefiles/jsig.make 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/jsig.make 2010-01-16 14:17:37.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/jsig.make 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/jsig.make 2010-07-11 09:11:39.000000000 -0700 @@ -25,11 +25,16 @@ # Rules to build signal interposition library, used by vm.make @@ -3774,8 +3913,8 @@ $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } install_jsig: $(LIBJSIG) ---- ./hotspot/make/bsd/makefiles/launcher.make 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/launcher.make 2010-01-16 14:12:37.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/launcher.make 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/launcher.make 2010-07-11 09:11:39.000000000 -0700 @@ -46,7 +46,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -3785,8 +3924,8 @@ LIBS_LAUNCHER += -l$(JVM) $(LIBS) endif ---- ./hotspot/make/bsd/makefiles/sa.make 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/sa.make 2009-11-04 19:52:29.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/sa.make 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/sa.make 2010-07-11 09:11:39.000000000 -0700 @@ -42,8 +42,8 @@ # gnumake 3.78.1 does not accept the *s that @@ -3798,8 +3937,8 @@ SA_CLASSDIR = $(GENERATED)/saclasses ---- ./hotspot/make/bsd/makefiles/saproc.make 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/saproc.make 2010-01-16 14:19:38.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/saproc.make 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/saproc.make 2010-07-11 09:11:39.000000000 -0700 @@ -25,23 +25,34 @@ # Rules to build serviceability agent library, used by vm.make @@ -3867,8 +4006,8 @@ $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } install_saproc: checkAndBuildSA ---- ./hotspot/make/bsd/makefiles/vm.make 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/vm.make 2010-01-30 19:00:06.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/vm.make 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/vm.make 2010-07-11 09:11:39.000000000 -0700 @@ -99,7 +99,7 @@ # Extra flags from gnumake's invocation or environment CFLAGS += $(EXTRA_CFLAGS) @@ -3897,9 +4036,9 @@ JVM_OBJ_FILES = $(Obj_Files) -@@ -129,11 +135,7 @@ - rm -f $@ - cat $^ > $@ +@@ -136,11 +142,7 @@ + vm.def: $(Res_Files) $(Obj_Files) + sh $(GAMMADIR)/make/bsd/makefiles/build_vm_def.sh *.o > $@ -ifeq ($(ZERO_LIBARCH), ppc64) - STATIC_CXX = false @@ -3910,7 +4049,7 @@ ifeq ($(LINK_INTO),AOUT) LIBJVM.o = -@@ -145,14 +147,21 @@ +@@ -152,14 +154,21 @@ LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM)) @@ -3933,7 +4072,7 @@ endif LIBS_VM += $(LIBS) -@@ -161,7 +170,6 @@ +@@ -168,7 +177,6 @@ LIBS_VM += $(LIBFFI_LIBS) endif @@ -3941,7 +4080,7 @@ # rule for building precompiled header $(PRECOMPILED_HEADER): $(Precompiled_Files) -@@ -189,11 +197,6 @@ +@@ -196,11 +204,6 @@ LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT) endif @@ -3953,7 +4092,7 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) $(QUIETLY) { \ echo Linking vm...; \ -@@ -203,15 +206,6 @@ +@@ -210,15 +213,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; }; \ @@ -3969,8 +4108,8 @@ } DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) ---- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/zeroshark.make 2009-12-20 19:41:23.000000000 -0800 +--- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/zeroshark.make 2010-07-11 09:11:39.000000000 -0700 @@ -40,4 +40,23 @@ CFLAGS += -D_LP64=1 endif @@ -3995,40 +4134,40 @@ +LIBS += -L$(PACKAGE_PATH)/lib -lffi + OPT_CFLAGS/compactingPermGenGen.o = -O1 ---- ./hotspot/make/bsd/platform_amd64 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/platform_amd64 2009-06-06 16:53:58.000000000 -0700 +--- ./hotspot/make/bsd/platform_amd64 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/platform_amd64 2010-07-11 09:11:39.000000000 -0700 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DAMD64 +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64 ---- ./hotspot/make/bsd/platform_amd64.suncc 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/platform_amd64.suncc 2010-01-17 15:46:11.000000000 -0800 +--- ./hotspot/make/bsd/platform_amd64.suncc 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/platform_amd64.suncc 2010-07-11 09:11:39.000000000 -0700 @@ -14,4 +14,4 @@ gnu_dis_arch = amd64 -sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64 +sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64 ---- ./hotspot/make/bsd/platform_i486 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/platform_i486 2009-06-06 16:53:58.000000000 -0700 +--- ./hotspot/make/bsd/platform_i486 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/platform_i486 2010-07-11 09:11:39.000000000 -0700 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DIA32 +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32 ---- ./hotspot/make/bsd/platform_i486.suncc 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/platform_i486.suncc 2010-01-17 15:46:11.000000000 -0800 +--- ./hotspot/make/bsd/platform_i486.suncc 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/platform_i486.suncc 2010-07-11 09:11:39.000000000 -0700 @@ -14,4 +14,4 @@ gnu_dis_arch = i386 -sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32 +sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32 ---- ./hotspot/make/bsd/platform_ia64 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/platform_ia64 2010-01-17 15:46:11.000000000 -0800 +--- ./hotspot/make/bsd/platform_ia64 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/platform_ia64 2010-07-11 09:11:39.000000000 -0700 @@ -10,6 +10,6 @@ gnu_dis_arch = ia64 @@ -4037,32 +4176,32 @@ +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP mark_style = alignment ---- ./hotspot/make/bsd/platform_sparc 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/platform_sparc 2009-06-06 16:53:58.000000000 -0700 +--- ./hotspot/make/bsd/platform_sparc 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/platform_sparc 2010-07-11 09:11:39.000000000 -0700 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DSPARC +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC ---- ./hotspot/make/bsd/platform_sparcv9 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/platform_sparcv9 2010-01-17 15:46:11.000000000 -0800 +--- ./hotspot/make/bsd/platform_sparcv9 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/platform_sparcv9 2010-07-11 09:11:39.000000000 -0700 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DSPARC +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC ---- ./hotspot/make/bsd/platform_zero.in 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/make/bsd/platform_zero.in 2009-11-04 19:52:29.000000000 -0800 +--- ./hotspot/make/bsd/platform_zero.in 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/make/bsd/platform_zero.in 2010-07-11 09:11:39.000000000 -0700 @@ -14,4 +14,4 @@ gnu_dis_arch = zero -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/defs.make 2010-03-18 01:41:36.000000000 -0700 -+++ ./hotspot/make/defs.make 2010-02-15 08:08:22.000000000 -0800 +--- ./hotspot/make/defs.make 2010-07-09 01:48:43.000000000 -0700 ++++ ./hotspot/make/defs.make 2010-07-11 09:11:39.000000000 -0700 @@ -119,13 +119,23 @@ # Windows should have OS predefined ifeq ($(OS),) @@ -4089,8 +4228,8 @@ else OSNAME=solaris endif ---- ./hotspot/make/linux/makefiles/defs.make 2010-03-18 01:41:36.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/defs.make 2009-11-02 22:51:00.000000000 -0800 +--- ./hotspot/make/linux/makefiles/defs.make 2010-07-09 01:48:43.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/defs.make 2010-07-11 09:11:39.000000000 -0700 @@ -100,28 +100,31 @@ JDK_INCLUDE_SUBDIR=linux @@ -4128,8 +4267,8 @@ EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar endif endif ---- ./hotspot/make/sa.files 2010-03-18 01:41:37.000000000 -0700 -+++ ./hotspot/make/sa.files 2009-06-06 16:53:58.000000000 -0700 +--- ./hotspot/make/sa.files 2010-07-09 01:48:43.000000000 -0700 ++++ ./hotspot/make/sa.files 2010-07-11 09:11:40.000000000 -0700 @@ -50,6 +50,9 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \ @@ -4150,9 +4289,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 2010-03-18 01:41:37.000000000 -0700 -+++ ./hotspot/make/solaris/makefiles/defs.make 2009-11-04 19:52:29.000000000 -0800 -@@ -61,32 +61,35 @@ +--- ./hotspot/make/solaris/makefiles/defs.make 2010-07-09 01:48:43.000000000 -0700 ++++ ./hotspot/make/solaris/makefiles/defs.make 2010-07-11 09:11:40.000000000 -0700 +@@ -61,30 +61,33 @@ JDK_INCLUDE_SUBDIR=solaris @@ -4182,27 +4321,25 @@ - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so -+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) - ifeq ($(ARCH),sparc) -- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so -- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so -- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so -- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so -+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) - endif +- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so +- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so +- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so +- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) ++ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) ++ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) 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/windows/makefiles/defs.make 2010-03-18 01:41:37.000000000 -0700 -+++ ./hotspot/make/windows/makefiles/defs.make 2009-11-02 22:49:17.000000000 -0800 -@@ -69,6 +69,9 @@ +--- ./hotspot/make/windows/makefiles/defs.make 2010-07-09 01:48:44.000000000 -0700 ++++ ./hotspot/make/windows/makefiles/defs.make 2010-07-11 09:11:40.000000000 -0700 +@@ -109,6 +109,9 @@ JDK_INCLUDE_SUBDIR=win32 @@ -4212,7 +4349,7 @@ # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make. -@@ -132,26 +135,26 @@ +@@ -172,26 +175,26 @@ EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt @@ -4243,39 +4380,9 @@ 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/x86/vm/interp_masm_x86_32.cpp 2010-03-18 01:41:38.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-03-08 21:37:50.000000000 -0800 -@@ -455,10 +455,10 @@ - void InterpreterMacroAssembler::tag_local(frame::Tag tag, int n) { - if (TaggedStackInterpreter) { - if (tag == frame::TagCategory2) { -- movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (int32_t)frame::TagValue); -- movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)frame::TagValue); -+ movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (intptr_t)frame::TagValue); -+ movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)frame::TagValue); - } else { -- movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)tag); -+ movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)tag); - } - } - } -@@ -467,12 +467,12 @@ - if (TaggedStackInterpreter) { - if (tag == frame::TagCategory2) { - movptr(Address(rdi, idx, Interpreter::stackElementScale(), -- Interpreter::local_tag_offset_in_bytes(1)), (int32_t)frame::TagValue); -+ Interpreter::local_tag_offset_in_bytes(1)), (intptr_t)frame::TagValue); - movptr(Address(rdi, idx, Interpreter::stackElementScale(), -- Interpreter::local_tag_offset_in_bytes(0)), (int32_t)frame::TagValue); -+ Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)frame::TagValue); - } else { - movptr(Address(rdi, idx, Interpreter::stackElementScale(), -- Interpreter::local_tag_offset_in_bytes(0)), (int32_t)tag); -+ Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)tag); - } - } - } -@@ -1336,7 +1336,7 @@ +--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-07-09 01:48:44.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-07-11 09:11:41.000000000 -0700 +@@ -1153,7 +1153,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)); @@ -4284,7 +4391,7 @@ set_mdp_data_at(mdp, count_offset, reg2); if (start_row > 0) { jmp(done); -@@ -1479,7 +1479,7 @@ +@@ -1296,7 +1296,7 @@ test_method_data_pointer(mdp, profile_continue); // Build the base (index * per_case_size_in_bytes()) + case_array_offset_in_bytes() @@ -4293,8 +4400,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/jni_x86.h 2010-03-18 01:41:38.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2009-06-06 16:54:00.000000000 -0700 +--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-07-09 01:48:45.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-07-11 09:11:41.000000000 -0700 @@ -26,7 +26,7 @@ #ifndef _JAVASOFT_JNI_MD_H_ #define _JAVASOFT_JNI_MD_H_ @@ -4304,8 +4411,8 @@ #define JNIEXPORT #define JNIIMPORT #define JNICALL ---- ./hotspot/src/os/bsd/launcher/java_md.c 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/launcher/java_md.c 2009-12-20 19:41:24.000000000 -0800 +--- ./hotspot/src/os/bsd/launcher/java_md.c 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/launcher/java_md.c 2010-07-11 09:11:42.000000000 -0700 @@ -45,8 +45,15 @@ #include "version_comp.h" #endif @@ -4443,9 +4550,9 @@ result = bsd_i586_ServerClassMachine(); #else if (_launcher_debug) { ---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2009-06-06 16:54:01.000000000 -0700 -@@ -179,32 +179,19 @@ +--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 +@@ -179,33 +179,20 @@ struct sockaddr_un addr; addr.sun_family = AF_UNIX; @@ -4462,12 +4569,14 @@ - res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr)); - } - if (res == -1) { -- sprintf(path, "%s/.java_pid%d", os::get_temp_directory(), os::current_process_id()); +- snprintf(path, PATH_MAX+1, "%s/.java_pid%d", +- os::get_temp_directory(), os::current_process_id()); - strcpy(addr.sun_path, path); - ::unlink(path); - res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr)); - } -+ sprintf(path, "%s/.java_pid%d", os::get_temp_directory(), os::current_process_id()); ++ snprintf(path, PATH_MAX+1, "%s/.java_pid%d", ++ os::get_temp_directory(), os::current_process_id()); + strcpy(addr.sun_path, path); + ::unlink(path); + res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr)); @@ -4485,7 +4594,7 @@ RESTARTABLE(::close(listener), res); ::unlink(path); set_path(NULL); -@@ -330,6 +317,15 @@ +@@ -331,6 +318,15 @@ // get the credentials of the peer and check the effective uid/guid // - check with jeff on this. @@ -4501,7 +4610,7 @@ struct ucred cred_info; socklen_t optlen = sizeof(cred_info); if (::getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void*)&cred_info, &optlen) == -1) { -@@ -337,10 +333,13 @@ +@@ -338,10 +334,13 @@ RESTARTABLE(::close(s), res); continue; } @@ -4516,29 +4625,31 @@ int res; RESTARTABLE(::close(s), res); continue; -@@ -460,15 +459,12 @@ +@@ -461,16 +460,13 @@ if (init_at_startup() || is_initialized()) { return false; // initialized at startup or already initialized } -- char fn[32]; +- char fn[PATH_MAX+1]; - sprintf(fn, ".attach_pid%d", os::current_process_id()); + char path[PATH_MAX + 1]; int ret; - struct stat64 st; - RESTARTABLE(::stat64(fn, &st), ret); - if (ret == -1) { -- sprintf(fn, "/tmp/.attach_pid%d", os::current_process_id()); +- snprintf(fn, sizeof(fn), "%s/.attach_pid%d", +- os::get_temp_directory(), os::current_process_id()); - RESTARTABLE(::stat64(fn, &st), ret); - } + struct stat st; + -+ sprintf(path, "%s/.attach_pid%d", os::get_temp_directory(), os::current_process_id()); ++ snprintf(path, PATH_MAX + 1, "%s/.attach_pid%d", ++ os::get_temp_directory(), os::current_process_id()); + RESTARTABLE(::stat(path, &st), ret); if (ret == 0) { // simple check to avoid starting the attach mechanism when // a bogus user creates the file ---- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 @@ -28,6 +28,14 @@ # include <sys/param.h> # include <dlfcn.h> @@ -4568,8 +4679,8 @@ #endif *(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */ ---- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2009-06-28 17:53:14.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-07-11 09:11:42.000000000 -0700 @@ -36,7 +36,7 @@ // HPI_FileInterface @@ -4620,8 +4731,8 @@ } ---- ./hotspot/src/os/bsd/vm/jsig.c 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/jsig.c 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/jsig.c 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/jsig.c 2010-07-11 09:11:42.000000000 -0700 @@ -143,7 +143,8 @@ } @@ -4632,8 +4743,8 @@ } static int call_os_sigaction(int sig, const struct sigaction *act, ---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 @@ -144,38 +144,31 @@ "ILL", SIGILL, /* Illegal instruction (ANSI). */ "TRAP", SIGTRAP, /* Trace trap (POSIX). */ @@ -4683,8 +4794,8 @@ }; JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name)) ---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-07-11 09:11:42.000000000 -0700 @@ -51,7 +51,11 @@ #define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"} @@ -4718,8 +4829,8 @@ #endif /* JVM_MD_H */ // Reconciliation History ---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 @@ -28,8 +28,8 @@ void OSThread::pd_initialize() { @@ -4731,8 +4842,8 @@ _siginfo = NULL; _ucontext = NULL; _expanding_stack = 0; ---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2009-06-28 17:53:14.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-07-11 09:11:42.000000000 -0700 @@ -36,6 +36,12 @@ private: @@ -4790,9 +4901,9 @@ pthread_t pthread_id() const { return _pthread_id; } ---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-01-16 14:25:14.000000000 -0800 -@@ -42,17 +42,39 @@ +--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 +@@ -44,20 +44,42 @@ # include <sys/utsname.h> # include <sys/socket.h> # include <sys/wait.h> @@ -4812,9 +4923,12 @@ +#endif # include <sys/ipc.h> # include <sys/shm.h> -+ +-# include <link.h> + # include <stdint.h> + # include <inttypes.h> + +#ifndef __APPLE__ - # include <link.h> ++# include <link.h> +#endif + +#if defined(__FreeBSD__) || defined(__NetBSD__) @@ -4829,10 +4943,11 @@ +#ifndef MAP_ANONYMOUS +#define MAP_ANONYMOUS MAP_ANON +#endif - ++ #define MAX_PATH (2 * K) -@@ -64,19 +86,25 @@ + // for timer info max values which include all bits +@@ -68,19 +90,25 @@ // global variables julong os::Bsd::_physical_memory = 0; @@ -4858,7 +4973,7 @@ static jlong initial_time_count=0; -@@ -94,8 +122,6 @@ +@@ -98,8 +126,6 @@ static int SR_signum = SIGUSR2; sigset_t SR_sigset; @@ -4867,7 +4982,7 @@ //////////////////////////////////////////////////////////////////////////////// // utility functions -@@ -108,11 +134,16 @@ +@@ -112,11 +138,16 @@ } julong os::Bsd::available_memory() { @@ -4884,7 +4999,7 @@ } julong os::physical_memory() { -@@ -160,6 +191,7 @@ +@@ -164,6 +195,7 @@ } @@ -4892,7 +5007,7 @@ #ifndef SYS_gettid // i386: 224, ia64: 1105, amd64: 186, sparc 143 #ifdef __ia64__ -@@ -174,6 +206,7 @@ +@@ -178,6 +210,7 @@ #error define gettid for the arch #endif #endif @@ -4900,7 +5015,7 @@ // Cpu architecture string #if defined(ZERO) -@@ -195,6 +228,7 @@ +@@ -199,6 +232,7 @@ #endif @@ -4908,7 +5023,7 @@ // pid_t gettid() // // Returns the kernel thread id of the currently running thread. Kernel -@@ -221,7 +255,48 @@ +@@ -225,7 +259,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."; @@ -4957,7 +5072,7 @@ void os::Bsd::initialize_system_info() { set_processor_count(sysconf(_SC_NPROCESSORS_CONF)); if (processor_count() == 1) { -@@ -238,6 +313,7 @@ +@@ -242,6 +317,7 @@ _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE); assert(processor_count() > 0, "bsd error"); } @@ -4965,7 +5080,7 @@ void os::init_system_properties_values() { // char arch[12]; -@@ -281,9 +357,7 @@ +@@ -285,9 +361,7 @@ * ... * 7: The default directories, normally /lib and /usr/lib. */ @@ -4976,7 +5091,7 @@ #define DEFAULT_LIBPATH "/lib:/usr/lib" #endif -@@ -362,7 +436,11 @@ +@@ -366,7 +440,11 @@ * should always exist (until the legacy problem cited above is * addressed). */ @@ -4988,7 +5103,7 @@ if (v != NULL) { char *t = ld_library_path; /* That's +1 for the colon and +1 for the trailing '\0' */ -@@ -521,6 +599,7 @@ +@@ -525,6 +603,7 @@ } } @@ -4996,7 +5111,7 @@ ////////////////////////////////////////////////////////////////////////////// // detecting pthread library -@@ -684,6 +763,7 @@ +@@ -688,6 +767,7 @@ } return false; } @@ -5004,7 +5119,7 @@ ////////////////////////////////////////////////////////////////////////////// // create new thread -@@ -692,6 +772,9 @@ +@@ -696,6 +776,9 @@ // check if it's safe to start a new thread static bool _thread_safety_check(Thread* thread) { @@ -5014,7 +5129,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 -@@ -725,6 +808,7 @@ +@@ -729,6 +812,7 @@ // here, that means enough space has been reserved for stack. return true; } @@ -5022,7 +5137,7 @@ } // Thread start routine for all newly created threads -@@ -752,6 +836,10 @@ +@@ -756,6 +840,10 @@ return NULL; } @@ -5033,7 +5148,7 @@ // thread_id is kernel thread id (similar to Solaris LWP id) osthread->set_thread_id(os::Bsd::gettid()); -@@ -761,6 +849,7 @@ +@@ -765,6 +853,7 @@ thread->set_lgrp_id(lgrp_id); } } @@ -5041,7 +5156,7 @@ // initialize signal mask for this thread os::Bsd::hotspot_sigmask(thread); -@@ -841,17 +930,22 @@ +@@ -845,17 +934,22 @@ // let pthread_create() pick the default value. } @@ -5064,7 +5179,7 @@ pthread_t tid; int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread); -@@ -865,7 +959,9 @@ +@@ -869,7 +963,9 @@ // Need to clean up stuff we've allocated so far thread->set_osthread(NULL); delete osthread; @@ -5074,7 +5189,7 @@ return false; } -@@ -881,9 +977,11 @@ +@@ -885,9 +981,11 @@ } } @@ -5086,7 +5201,7 @@ } // Aborted due to thread limit being reached -@@ -921,7 +1019,11 @@ +@@ -925,7 +1023,11 @@ } // Store pthread info into the OSThread @@ -5098,7 +5213,7 @@ osthread->set_pthread_id(::pthread_self()); // initialize floating point control register -@@ -932,6 +1034,7 @@ +@@ -936,6 +1038,7 @@ thread->set_osthread(osthread); @@ -5106,7 +5221,7 @@ if (UseNUMA) { int lgrp_id = os::numa_get_group_id(); if (lgrp_id != -1) { -@@ -958,6 +1061,7 @@ +@@ -962,6 +1065,7 @@ os::Bsd::manually_expand_stack(jt, addr); osthread->clear_expanding_stack(); } @@ -5114,7 +5229,7 @@ // initialize signal mask for this thread // and save the caller's signal mask -@@ -1016,6 +1120,7 @@ +@@ -1020,6 +1124,7 @@ ////////////////////////////////////////////////////////////////////////////// // initial thread @@ -5122,7 +5237,7 @@ // Check if current thread is the initial thread, similar to Solaris thr_main. bool os::Bsd::is_initial_thread(void) { char dummy; -@@ -1249,6 +1354,7 @@ +@@ -1253,6 +1358,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; } @@ -5130,7 +5245,7 @@ //////////////////////////////////////////////////////////////////////////////// // time support -@@ -1270,9 +1376,7 @@ +@@ -1274,9 +1380,7 @@ return (1000 * 1000); } @@ -5141,7 +5256,7 @@ bool os::supports_vtime() { return false; } bool os::enable_vtime() { return false; } bool os::vtime_enabled() { return false; } -@@ -1292,6 +1396,21 @@ +@@ -1296,6 +1400,21 @@ #define CLOCK_MONOTONIC (1) #endif @@ -5163,7 +5278,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 -@@ -1327,7 +1446,9 @@ +@@ -1331,7 +1450,9 @@ } } } @@ -5173,7 +5288,7 @@ #ifndef SYS_clock_getres #if defined(IA32) || defined(AMD64) -@@ -1366,6 +1487,7 @@ +@@ -1370,6 +1491,7 @@ _pthread_getcpuclockid = pthread_getcpuclockid_func; } } @@ -5181,7 +5296,7 @@ jlong os::javaTimeNanos() { if (Bsd::supports_monotonic_clock()) { -@@ -1516,7 +1638,14 @@ +@@ -1520,7 +1642,14 @@ // DLL functions @@ -5195,9 +5310,9 @@ + +const char* os::dll_file_extension() { return JNI_LIB_SUFFIX; } - const char* os::get_temp_directory() { return "/tmp/"; } - -@@ -1534,13 +1663,13 @@ + const char* os::get_temp_directory() { + const char *prop = Arguments::get_property("java.io.tmpdir"); +@@ -1541,13 +1670,13 @@ const size_t pnamelen = pname ? strlen(pname) : 0; // Quietly truncate on buffer overflow. Should be an error. @@ -5213,7 +5328,7 @@ } else if (strchr(pname, *os::path_separator()) != NULL) { int n; char** pelements = split_path(pname, &n); -@@ -1549,7 +1678,8 @@ +@@ -1556,7 +1685,8 @@ if (pelements[i] == NULL || strlen(pelements[i]) == 0) { continue; // skip the empty path values } @@ -5223,7 +5338,7 @@ if (file_exists(buffer)) { break; } -@@ -1564,7 +1694,7 @@ +@@ -1571,7 +1701,7 @@ FREE_C_HEAP_ARRAY(char*, pelements); } } else { @@ -5232,7 +5347,7 @@ } } -@@ -1605,6 +1735,23 @@ +@@ -1612,6 +1742,23 @@ } } @@ -5256,7 +5371,7 @@ struct _address_to_library_name { address addr; // input : memory address size_t buflen; // size of fname -@@ -1679,11 +1826,27 @@ +@@ -1686,11 +1833,27 @@ return false; } } @@ -5284,7 +5399,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { void * result= ::dlopen(filename, RTLD_LAZY); -@@ -1736,6 +1899,26 @@ +@@ -1743,6 +1906,26 @@ #define EM_486 6 /* Intel 80486 */ #endif @@ -5311,7 +5426,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"}, -@@ -1839,17 +2022,11 @@ +@@ -1846,17 +2029,11 @@ return NULL; } @@ -5332,7 +5447,7 @@ } -@@ -1872,7 +2049,51 @@ +@@ -1879,7 +2056,51 @@ void os::print_dll_info(outputStream *st) { st->print_cr("Dynamic libraries:"); @@ -5385,7 +5500,7 @@ char fname[32]; pid_t pid = os::Bsd::gettid(); -@@ -1881,6 +2102,7 @@ +@@ -1888,6 +2109,7 @@ if (!_print_ascii_file(fname, st)) { st->print("Can not get library information for pid = %d\n", pid); } @@ -5393,7 +5508,7 @@ } -@@ -1913,6 +2135,7 @@ +@@ -1920,6 +2142,7 @@ st->print(name.machine); st->cr(); @@ -5401,7 +5516,7 @@ // Print warning if unsafe chroot environment detected if (unsafe_chroot_detected) { st->print("WARNING!! "); -@@ -1927,6 +2150,7 @@ +@@ -1934,6 +2157,7 @@ st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed"); } st->cr(); @@ -5409,7 +5524,7 @@ // rlimit st->print("rlimit:"); -@@ -1952,6 +2176,7 @@ +@@ -1959,6 +2183,7 @@ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); else st->print("%d", rlim.rlim_cur); @@ -5417,7 +5532,7 @@ st->print(", AS "); getrlimit(RLIMIT_AS, &rlim); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); -@@ -1964,6 +2189,7 @@ +@@ -1971,6 +2196,7 @@ os::loadavg(loadavg, 3); st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]); st->cr(); @@ -5425,7 +5540,7 @@ } void os::print_memory_info(outputStream* st) { -@@ -1971,18 +2197,22 @@ +@@ -1978,18 +2204,22 @@ st->print("Memory:"); st->print(" %dk page", os::vm_page_size()>>10); @@ -5448,7 +5563,7 @@ st->cr(); } -@@ -2209,19 +2439,29 @@ +@@ -2216,19 +2446,29 @@ static volatile jint pending_signals[NSIG+1] = { 0 }; // Bsd(POSIX) specific hand shaking semaphore. @@ -5480,7 +5595,7 @@ } static int check_pending_signals(bool wait) { -@@ -2243,7 +2483,7 @@ +@@ -2250,7 +2490,7 @@ do { thread->set_suspend_equivalent(); // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self() @@ -5489,7 +5604,7 @@ // were we externally suspended while we were waiting? threadIsSuspended = thread->handle_special_suspend_equivalent_condition(); -@@ -2254,7 +2494,7 @@ +@@ -2261,7 +2501,7 @@ // while suspended because that would surprise the thread that // suspended us. // @@ -5498,7 +5613,20 @@ thread->java_suspend_self(); } -@@ -2326,9 +2566,14 @@ +@@ -2305,10 +2545,10 @@ + return; + } + +- char buf[PATH_MAX+1]; ++ char buf[PATH_MAX + 1]; + int num = Atomic::add(1, &cnt); + +- snprintf(buf, sizeof(buf), "%s/hs-vm-%d-%d", ++ snprintf(buf, PATH_MAX + 1, "%s/hs-vm-%d-%d", + os::get_temp_directory(), os::current_process_id(), num); + unlink(buf); + +@@ -2334,9 +2574,14 @@ // 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; @@ -5513,7 +5641,7 @@ } bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, -@@ -2344,36 +2589,27 @@ +@@ -2352,36 +2597,27 @@ } void os::numa_make_global(char *addr, size_t bytes) { @@ -5555,7 +5683,7 @@ } bool os::get_page_info(char *start, page_info* info) { -@@ -2384,6 +2620,7 @@ +@@ -2392,6 +2628,7 @@ return end; } @@ -5563,7 +5691,7 @@ extern "C" void numa_warn(int number, char *where, ...) { } extern "C" void numa_error(char *where) { } -@@ -2485,11 +2722,18 @@ +@@ -2493,95 +2730,27 @@ 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; @@ -5582,8 +5710,92 @@ +#endif } - static address _highest_vm_reserved_address = NULL; -@@ -2593,6 +2837,9 @@ +-// Bsd uses a growable mapping for the stack, and if the mapping for +-// the stack guard pages is not removed when we detach a thread the +-// stack cannot grow beyond the pages where the stack guard was +-// mapped. If at some point later in the process the stack expands to +-// that point, the Bsd kernel cannot expand the stack any further +-// because the guard pages are in the way, and a segfault occurs. +-// +-// However, it's essential not to split the stack region by unmapping +-// a region (leaving a hole) that's already part of the stack mapping, +-// so if the stack mapping has already grown beyond the guard pages at +-// the time we create them, we have to truncate the stack mapping. +-// So, we need to know the extent of the stack mapping when +-// create_stack_guard_pages() is called. +- +-// Find the bounds of the stack mapping. Return true for success. +-// +-// We only need this for stacks that are growable: at the time of +-// writing thread stacks don't use growable mappings (i.e. those +-// creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this +-// only applies to the main thread. +-static bool +-get_stack_bounds(uintptr_t *bottom, uintptr_t *top) +-{ +- FILE *f = fopen("/proc/self/maps", "r"); +- if (f == NULL) +- return false; +- +- while (!feof(f)) { +- size_t dummy; +- char *str = NULL; +- ssize_t len = getline(&str, &dummy, f); +- if (len == -1) { +- fclose(f); +- return false; +- } +- +- if (len > 0 && str[len-1] == '\n') { +- str[len-1] = 0; +- len--; +- } +- +- static const char *stack_str = "[stack]"; +- if (len > (ssize_t)strlen(stack_str) +- && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) { +- if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) { +- uintptr_t sp = (uintptr_t)__builtin_frame_address(0); +- if (sp >= *bottom && sp <= *top) { +- free(str); +- fclose(f); +- return true; +- } +- } +- } +- free(str); +- } +- fclose(f); +- return false; +-} +- +-// If the (growable) stack mapping already extends beyond the point +-// where we're going to put our guard pages, truncate the mapping at +-// that point by munmap()ping it. This ensures that when we later +-// munmap() the guard pages we don't leave a hole in the stack +-// mapping. + bool os::create_stack_guard_pages(char* addr, size_t size) { +- uintptr_t stack_extent, stack_base; +- if (get_stack_bounds(&stack_extent, &stack_base)) { +- if (stack_extent < (uintptr_t)addr) +- ::munmap((void*)stack_extent, (uintptr_t)addr - stack_extent); +- } +- + return os::commit_memory(addr, size); + } + + // If this is a growable mapping, remove the guard pages entirely by + // munmap()ping them. If not, just call uncommit_memory(). + bool os::remove_stack_guard_pages(char* addr, size_t size) { +- uintptr_t stack_extent, stack_base; +- if (get_stack_bounds(&stack_extent, &stack_base)) { +- return ::munmap(addr, size) == 0; +- } +- + return os::uncommit_memory(addr, size); + } + +@@ -2686,6 +2855,9 @@ static size_t _large_page_size = 0; bool os::large_page_init() { @@ -5593,7 +5805,7 @@ if (!UseLargePages) return false; if (LargePageSizeInBytes) { -@@ -2649,6 +2896,7 @@ +@@ -2742,6 +2914,7 @@ // We optimistically assume the support is available. If later it turns out // not true, VM will automatically switch to use regular page size. return true; @@ -5601,7 +5813,7 @@ } #ifndef SHM_HUGETLB -@@ -2825,7 +3073,7 @@ +@@ -2918,7 +3091,7 @@ } size_t os::read(int fd, void *buf, unsigned int nBytes) { @@ -5610,7 +5822,7 @@ } // TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation. -@@ -2961,6 +3209,44 @@ +@@ -3054,6 +3227,44 @@ // this reason, the code should not be used as default (ThreadPriorityPolicy=0). // It is only used when ThreadPriorityPolicy=1 and requires root privilege. @@ -5655,7 +5867,7 @@ int os::java_to_os_priority[MaxPriority + 1] = { 19, // 0 Entry should never be used -@@ -2978,6 +3264,7 @@ +@@ -3071,6 +3282,7 @@ -5 // 10 MaxPriority }; @@ -5663,7 +5875,7 @@ static int prio_init() { if (ThreadPriorityPolicy == 1) { -@@ -2997,8 +3284,28 @@ +@@ -3090,8 +3302,28 @@ OSReturn os::set_native_priority(Thread* thread, int newpri) { if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK; @@ -5692,7 +5904,7 @@ } OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) { -@@ -3008,7 +3315,17 @@ +@@ -3101,7 +3333,17 @@ } errno = 0; @@ -5710,7 +5922,7 @@ return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR); } -@@ -3118,7 +3435,7 @@ +@@ -3211,7 +3453,7 @@ /* Get signal number to use for suspend/resume */ if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) { int sig = ::strtol(s, 0, 10); @@ -5719,7 +5931,7 @@ SR_signum = sig; } } -@@ -3461,6 +3778,28 @@ +@@ -3555,6 +3797,28 @@ set_signal_handler(SIGFPE, true); set_signal_handler(SIGXFSZ, true); @@ -5748,7 +5960,7 @@ if (libjsig_is_loaded) { // Tell libjsig jvm finishes setting signal handlers (*end_signal_setting)(); -@@ -3481,6 +3820,7 @@ +@@ -3575,6 +3839,7 @@ } } @@ -5756,7 +5968,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+. -@@ -3495,6 +3835,7 @@ +@@ -3589,6 +3854,7 @@ return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec; } @@ -5764,7 +5976,7 @@ ///// // glibc on Bsd platform uses non-documented flag -@@ -3716,13 +4057,13 @@ +@@ -3810,13 +4076,13 @@ _initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid(); @@ -5778,9 +5990,9 @@ - Bsd::set_page_size(sysconf(_SC_PAGESIZE)); + Bsd::set_page_size(getpagesize()); if (Bsd::page_size() == -1) { - fatal1("os_bsd.cpp: os::init: sysconf failed (%s)", strerror(errno)); - } -@@ -3735,7 +4076,16 @@ + fatal(err_msg("os_bsd.cpp: os::init: sysconf failed (%s)", + strerror(errno))); +@@ -3830,7 +4096,16 @@ Bsd::clock_init(); initial_time_count = os::elapsed_counter(); @@ -5798,7 +6010,7 @@ } // To install functions for atexit system call -@@ -3748,7 +4098,9 @@ +@@ -3843,7 +4118,9 @@ // this is called _after_ the global arguments have been parsed jint os::init_2(void) { @@ -5808,7 +6020,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); -@@ -3797,6 +4149,7 @@ +@@ -3892,6 +4169,7 @@ JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes, vm_page_size())); @@ -5816,7 +6028,7 @@ Bsd::capture_initial_stack(JavaThread::stack_size_at_create()); Bsd::libpthread_init(); -@@ -3819,6 +4172,7 @@ +@@ -3914,6 +4192,7 @@ UseNUMA = true; } } @@ -5824,7 +6036,7 @@ if (MaxFDLimit) { // set the number of file descriptors to max. print out error -@@ -3830,6 +4184,14 @@ +@@ -3925,6 +4204,14 @@ perror("os::init_2 getrlimit failed"); } else { nbr_files.rlim_cur = nbr_files.rlim_max; @@ -5839,7 +6051,7 @@ status = setrlimit(RLIMIT_NOFILE, &nbr_files); if (status != 0) { if (PrintMiscellaneous && (Verbose || WizardMode)) -@@ -3838,8 +4200,10 @@ +@@ -3933,8 +4220,10 @@ } } @@ -5850,7 +6062,7 @@ // Initialize HPI. jint hpi_result = hpi::initialize(); -@@ -3887,11 +4251,15 @@ +@@ -3982,11 +4271,15 @@ }; int os::active_processor_count() { @@ -5866,7 +6078,7 @@ } bool os::distribute_processes(uint length, uint* distribution) { -@@ -3933,6 +4301,9 @@ +@@ -4028,6 +4321,9 @@ int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime) { @@ -5876,7 +6088,7 @@ if (is_NPTL()) { return pthread_cond_timedwait(_cond, _mutex, _abstime); } else { -@@ -3948,6 +4319,7 @@ +@@ -4043,6 +4339,7 @@ #endif // IA64 return status; } @@ -5884,7 +6096,7 @@ } //////////////////////////////////////////////////////////////////////////////// -@@ -4083,17 +4455,17 @@ +@@ -4178,17 +4475,17 @@ if (!rewrite_existing) { oflags |= O_EXCL; } @@ -5905,7 +6117,7 @@ } // Map a block of memory. -@@ -4143,6 +4515,7 @@ +@@ -4238,6 +4535,7 @@ return munmap(addr, bytes) == 0; } @@ -5913,7 +6125,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time); static clockid_t thread_cpu_clockid(Thread* thread) { -@@ -4154,6 +4527,7 @@ +@@ -4249,6 +4547,7 @@ assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code"); return clockid; } @@ -5921,7 +6133,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 -@@ -4163,39 +4537,71 @@ +@@ -4258,39 +4557,71 @@ // the fast estimate available on the platform. jlong os::current_thread_cpu_time() { @@ -5993,7 +6205,7 @@ // // -1 on error. // -@@ -4284,6 +4690,7 @@ +@@ -4379,6 +4710,7 @@ return (jlong)user_time * (1000000000 / clock_tics_per_sec); } } @@ -6001,21 +6213,21 @@ 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 -@@ -4300,7 +4707,13 @@ +@@ -4395,7 +4727,13 @@ } bool os::is_thread_cpu_time_supported() { +#ifdef __APPLE__ -+ return true; + return true; +#elif defined(_ALLBSD_SOURCE) + return false; +#else - return true; ++ return true; +#endif } // System loadavg support. Returns -1 if load average cannot be obtained. -@@ -4433,7 +4846,7 @@ +@@ -4528,7 +4866,7 @@ // abstime will be the absolute timeout time // TODO: replace compute_abstime() with unpackTime() @@ -6024,7 +6236,7 @@ if (millis < 0) millis = 0; struct timeval now; int status = gettimeofday(&now, NULL); -@@ -4485,7 +4898,7 @@ +@@ -4580,7 +4918,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 @@ -6033,7 +6245,7 @@ assert_status(status == 0 || status == EINTR, status, "cond_wait"); } -- _nParked ; -@@ -4543,10 +4956,10 @@ +@@ -4638,10 +4976,10 @@ pthread_cond_init (_cond, NULL) ; } assert_status(status == 0 || status == EINTR || @@ -6046,7 +6258,7 @@ // We consume and ignore EINTR and spurious wakeups. } --_nParked ; -@@ -4638,7 +5051,7 @@ +@@ -4733,7 +5071,7 @@ * years from "now". */ @@ -6055,7 +6267,7 @@ assert (time > 0, "convertTime"); struct timeval now; -@@ -4698,7 +5111,7 @@ +@@ -4793,7 +5131,7 @@ } // Next, demultiplex/decode time arguments @@ -6064,7 +6276,7 @@ if (time < 0) { // don't wait at all return; } -@@ -4752,7 +5165,7 @@ +@@ -4847,7 +5185,7 @@ } } assert_status(status == 0 || status == EINTR || @@ -6073,7 +6285,7 @@ status, "cond_timedwait"); #ifdef ASSERT -@@ -4795,14 +5208,12 @@ +@@ -4890,14 +5228,12 @@ } @@ -6093,7 +6305,7 @@ #endif // Run the specified command in a separate process. Return its exit value, -@@ -4817,8 +5228,7 @@ +@@ -4912,8 +5248,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... @@ -6103,7 +6315,7 @@ if (pid < 0) { // fork failed -@@ -4834,8 +5244,7 @@ +@@ -4929,8 +5264,7 @@ // in the new process, so make a system call directly. // IA64 should use normal execve() from glibc to match the glibc fork() // above. @@ -6113,8 +6325,8 @@ // execve failed _exit(-1); ---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2009-10-05 21:49:06.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-07-11 09:11:42.000000000 -0700 @@ -27,6 +27,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 *); @@ -6251,8 +6463,8 @@ // Stack repair handling ---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2009-06-28 17:53:14.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-07-11 09:11:42.000000000 -0700 @@ -61,7 +61,15 @@ inline bool os::allocate_stack_guard_pages() { @@ -6269,8 +6481,8 @@ } ---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-03-27 11:09:10.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 @@ -241,7 +241,7 @@ char* pwbuf = NEW_C_HEAP_ARRAY(char, bufsize); @@ -6280,11 +6492,11 @@ struct passwd* p; int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p); ---- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,45 +0,0 @@ -/* -- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -6301,9 +6513,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -6328,11 +6540,11 @@ -// 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 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,206 +0,0 @@ -/* -- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -6349,9 +6561,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -6537,11 +6749,11 @@ -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); -} ---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800 @@ -1,27 +0,0 @@ -// --// Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. +-// Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. -// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -// -// This code is free software; you can redistribute it and/or modify it @@ -6558,20 +6770,20 @@ -// 2 along with this work; if not, write to the Free Software Foundation, -// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -// --// Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, --// CA 95054 USA or visit www.sun.com if you need additional information or --// have any questions. +-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +-// or visit www.oracle.com if you need additional information or have any +-// questions. -// - -// -// - -// SPARC Bsd Architecture Description File ---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800 @@ -1,105 +0,0 @@ -# --# Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. +-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it @@ -6588,9 +6800,9 @@ -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# --# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, --# CA 95054 USA or visit www.sun.com if you need additional information or --# have any questions. +-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +-# or visit www.oracle.com if you need additional information or have any +-# questions. -# - - # Prototype: int SafeFetch32 (int * adr, int ErrValue) @@ -6675,11 +6887,11 @@ - ta 0x03 - retl - mov %fp, %o0 ---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,36 +0,0 @@ -/* -- * Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -6696,9 +6908,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -6714,11 +6926,11 @@ -define_pd_global(uintx, HeapBaseMinAddress, 4*G); -// Only used on 64 bit Windows platforms -define_pd_global(bool, UseVectoredExceptions, false); ---- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,102 +0,0 @@ -/* -- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -6735,9 +6947,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -6819,11 +7031,11 @@ - -inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); } -inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); } ---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,648 +0,0 @@ -/* -- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -6840,9 +7052,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -6977,7 +7189,7 @@ - if (rslt == ENOMEM) { - vm_exit_out_of_memory(0, "pthread_getattr_np"); - } else { -- fatal1("pthread_getattr_np failed with errno = %d", rslt); +- fatal(err_msg("pthread_getattr_np failed with errno = %d", rslt)); - } - } - @@ -7470,11 +7682,11 @@ - // 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 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,44 +0,0 @@ -/* -- * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -7491,9 +7703,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -7517,11 +7729,11 @@ - // Used to register dynamic code cache area with the OS - // Note: Currently only used in 64 bit Windows implementations - static bool register_code_area(char *low, char *high) { return true; } ---- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,40 +0,0 @@ -/* -- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -7538,9 +7750,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -7560,11 +7772,11 @@ -inline void Prefetch::write(void *loc, intx interval) {} - -#endif ---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,37 +0,0 @@ -/* -- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -7581,9 +7793,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -7600,11 +7812,11 @@ -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 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,28 +0,0 @@ -/* -- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -7621,9 +7833,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -7631,11 +7843,11 @@ - static Thread* thread() { - return (Thread*) os::thread_local_storage_at(thread_index()); - } ---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,107 +0,0 @@ -/* -- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -7652,9 +7864,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -7741,11 +7953,11 @@ - // nothing else to try - return false; -} ---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,98 +0,0 @@ -/* -- * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -7762,9 +7974,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -7842,11 +8054,11 @@ - static bool register_stack_overflow() { return false; } - static void enable_register_stack_guard() {} - static void disable_register_stack_guard() {} ---- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,69 +0,0 @@ -/* -- * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -7863,9 +8075,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -7914,11 +8126,11 @@ - \ - /* This must be the last entry, and must be present */ \ - last_entry() ---- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-07-11 09:19:11.000000000 -0700 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,61 +0,0 @@ -/* -- * Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -7935,9 +8147,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - * - */ - @@ -7978,14 +8190,11 @@ - - return features; -} ---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2009-06-06 16:54:01.000000000 -0700 -@@ -19,8 +19,19 @@ - # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - # CA 95054 USA or visit www.sun.com if you need additional information or - # have any questions. --# -+# +--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-07-11 09:11:43.000000000 -0700 +@@ -21,6 +21,17 @@ + # questions. + # + +#ifdef __APPLE__ @@ -8183,10 +8392,10 @@ # 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 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-07-11 09:11:43.000000000 -0700 @@ -21,6 +21,14 @@ - # have any questions. + # questions. # +#ifdef __APPLE__ @@ -8332,8 +8541,8 @@ 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 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-07-11 09:11:43.000000000 -0700 @@ -22,7 +22,33 @@ * */ @@ -8368,8 +8577,8 @@ // 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 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2009-10-05 21:49:06.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-07-11 09:19:11.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-07-11 09:11:43.000000000 -0700 @@ -22,9 +22,10 @@ * */ @@ -8396,8 +8605,8 @@ +define_pd_global(uintx, HeapBaseMinAddress, 2*G); // Only used on 64 bit Windows platforms define_pd_global(bool, UseVectoredExceptions, false); ---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-07-11 09:19:12.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-07-11 09:11:43.000000000 -0700 @@ -44,23 +44,202 @@ # include <sys/wait.h> # include <pwd.h> @@ -8819,7 +9028,7 @@ + int rslt = pthread_stackseg_np(pthread_self(), &ss); + + if (rslt != 0) -+ fatal1("pthread_stackseg_np failed with err = %d", rslt); ++ fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt)); + + *bottom = (address)((char *)ss.ss_sp - ss.ss_size); + *size = ss.ss_size; @@ -8830,12 +9039,12 @@ + + // JVM needs to know exact stack location, abort if it fails + if (rslt != 0) -+ fatal1("pthread_attr_init failed with err = %d", rslt); ++ fatal(err_msg("pthread_attr_init failed with err = %d", rslt)); + + rslt = pthread_attr_get_np(pthread_self(), &attr); + + if (rslt != 0) -+ fatal1("pthread_attr_get_np failed with err = %d", rslt); ++ fatal(err_msg("pthread_attr_get_np failed with err = %d", rslt)); + + if (pthread_attr_getstackaddr(&attr, (void **)bottom) != 0 || + pthread_attr_getstacksize(&attr, size) != 0) { @@ -8932,8 +9141,8 @@ #endif // AMD64 st->cr(); st->cr(); ---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-07-11 09:19:12.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-07-11 09:11:43.000000000 -0700 @@ -27,8 +27,10 @@ #ifndef AMD64 // map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp @@ -8945,8 +9154,8 @@ static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)]; #endif // !AMD64 ---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2009-06-06 16:54:01.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-07-11 09:19:12.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-07-11 09:11:43.000000000 -0700 @@ -31,7 +31,7 @@ /******************************/ \ /* Threads (NOTE: incomplete) */ \ @@ -8956,8 +9165,8 @@ 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 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2009-12-20 19:41:24.000000000 -0800 +--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-07-11 09:19:12.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-07-11 09:11:43.000000000 -0700 @@ -23,136 +23,441 @@ * */ @@ -9630,8 +9839,8 @@ - (intptr_t) compare_value); + return atomic_cas_ptr((volatile void *)dest, compare_value, exchange_value); } ---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2009-12-20 19:41:24.000000000 -0800 +--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-07-11 09:19:12.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-07-11 09:11:43.000000000 -0700 @@ -25,16 +25,23 @@ // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. @@ -9660,8 +9869,8 @@ - return bswap_64(x); + return bswap64(x); } ---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2009-12-20 19:41:24.000000000 -0800 +--- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-07-11 09:19:12.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-07-11 09:11:43.000000000 -0700 @@ -40,7 +40,12 @@ #else // ARM @@ -9675,8 +9884,8 @@ #ifdef PPC ---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-03-27 11:09:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-01-30 13:26:37.000000000 -0800 +--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-07-11 09:19:12.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-07-11 09:11:43.000000000 -0700 @@ -23,6 +23,10 @@ * */ @@ -9738,7 +9947,7 @@ + int rslt = pthread_stackseg_np(pthread_self(), &ss); + + if (rslt != 0) -+ fatal1("pthread_stackseg_np failed with err = %d", rslt); ++ fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt)); + + stack_top = (address) ss.ss_sp; + stack_bytes = ss.ss_size; @@ -9750,12 +9959,12 @@ + + // JVM needs to know exact stack location, abort if it fails + if (rslt != 0) -+ fatal1("pthread_attr_init failed with err = %d", rslt); ++ fatal(err_msg("pthread_attr_init failed with err = %d", rslt)); + + rslt = pthread_attr_get_np(pthread_self(), &attr); + + if (rslt != 0) -+ fatal1("pthread_attr_get_np failed with err = %d", rslt); ++ fatal(err_msg("pthread_attr_get_np failed with err = %d", rslt)); + + if (pthread_attr_getstackaddr(&attr, (void **) &stack_bottom) != 0 || + pthread_attr_getstacksize(&attr, &stack_bytes) != 0) { @@ -9777,7 +9986,7 @@ - size_t stack_bytes; res = pthread_attr_getstack(&attr, (void **) &stack_bottom, &stack_bytes); if (res != 0) { - fatal1("pthread_attr_getstack failed with errno = %d", res); + fatal(err_msg("pthread_attr_getstack failed with errno = %d", res)); } - address stack_top = stack_bottom + stack_bytes; + stack_top = stack_bottom + stack_bytes; @@ -9792,8 +10001,8 @@ 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 2010-03-18 01:41:40.000000000 -0700 -+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2009-09-07 10:57:21.000000000 -0700 +--- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-07-09 01:48:48.000000000 -0700 ++++ ./hotspot/src/share/vm/adlc/adlc.hpp 2010-07-11 09:11:47.000000000 -0700 @@ -69,9 +69,9 @@ #endif #endif // _WIN32 @@ -9806,8 +10015,8 @@ // Macros #define uint32 unsigned int ---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-03-18 01:41:41.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-03-08 21:37:50.000000000 -0800 +--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-07-09 01:48:48.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-07-11 09:11:48.000000000 -0700 @@ -952,7 +952,7 @@ } nmethod* nm = method->code(); @@ -9817,9 +10026,9 @@ } } ---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-03-18 01:41:42.000000000 -0700 -+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-01-22 10:54:50.000000000 -0800 -@@ -77,7 +77,7 @@ +--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-07-09 01:48:50.000000000 -0700 ++++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-07-11 09:11:51.000000000 -0700 +@@ -81,7 +81,7 @@ // the incoming method. We could lose a line of trace output. // This is acceptable in a debug-only feature. st->cr(); @@ -9828,18 +10037,18 @@ method->print_name(st); st->cr(); _current_method = method(); -@@ -90,7 +90,7 @@ - code = Bytecodes::code_at(bcp); +@@ -95,7 +95,7 @@ } - int bci = bcp - method->code_base(); + _code = code; + int bci = bcp - method->code_base(); - st->print("[%d] ", (int) Thread::current()->osthread()->thread_id()); + st->print("[%ld] ", (long) Thread::current()->osthread()->thread_id()); if (Verbose) { st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s", BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code)); ---- ./hotspot/src/share/vm/prims/forte.cpp 2010-03-18 01:41:43.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/forte.cpp 2009-06-06 16:54:08.000000000 -0700 -@@ -626,6 +626,11 @@ +--- ./hotspot/src/share/vm/prims/forte.cpp 2010-07-09 01:48:51.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/forte.cpp 2010-07-11 09:11:55.000000000 -0700 +@@ -629,6 +629,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. @@ -9851,7 +10060,7 @@ void collector_func_load(char* name, void* null_argument_1, void* null_argument_2, -@@ -636,6 +641,7 @@ +@@ -639,6 +644,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 ) @@ -9859,9 +10068,9 @@ #endif // !_WINDOWS } // end extern "C" ---- ./hotspot/src/share/vm/runtime/globals.hpp 2010-03-18 01:41:44.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-02-15 08:08:24.000000000 -0800 -@@ -324,7 +324,7 @@ +--- ./hotspot/src/share/vm/runtime/globals.hpp 2010-07-09 01:48:52.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-07-11 09:11:56.000000000 -0700 +@@ -327,7 +327,7 @@ /* UseMembar is theoretically a temp flag used for memory barrier \ * removal testing. It was supposed to be removed before FCS but has \ * been re-added (see 6401008) */ \ @@ -9869,9 +10078,9 @@ + product(bool, UseMembar, true, \ "(Unstable) Issues membars on thread state transitions") \ \ - diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug, \ ---- ./hotspot/src/share/vm/runtime/os.cpp 2010-03-18 01:41:44.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/os.cpp 2010-01-22 10:54:51.000000000 -0800 + /* Temporary: See 6948537 */ \ +--- ./hotspot/src/share/vm/runtime/os.cpp 2010-07-09 01:48:52.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/os.cpp 2010-07-11 09:11:56.000000000 -0700 @@ -79,7 +79,11 @@ assert(false, "Failed localtime_pd"); return NULL; @@ -9884,8 +10093,8 @@ // If daylight savings time is in effect, // we are 1 hour East of our time zone ---- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-03-18 01:41:44.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2009-10-31 08:51:25.000000000 -0700 +--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-07-09 01:48:52.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-07-11 09:11:57.000000000 -0700 @@ -144,7 +144,8 @@ #define OS LINUX_ONLY("linux") \ @@ -9896,8 +10105,8 @@ #ifdef ZERO #define CPU ZERO_LIBARCH ---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-03-18 01:41:44.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2009-06-06 16:54:10.000000000 -0700 +--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-07-09 01:48:53.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-07-11 09:11:58.000000000 -0700 @@ -71,12 +71,25 @@ # include <sys/procfs.h> # endif @@ -9964,8 +10173,8 @@ inline int g_isnan(float f) { return isnanf(f); } inline int g_isnan(double f) { return isnan(f); } #else ---- ./hotspot/src/share/vm/utilities/macros.hpp 2010-03-18 01:41:44.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/macros.hpp 2009-09-07 10:57:23.000000000 -0700 +--- ./hotspot/src/share/vm/utilities/macros.hpp 2010-07-09 01:48:53.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/macros.hpp 2010-07-11 09:11:58.000000000 -0700 @@ -148,6 +148,14 @@ #define NOT_WINDOWS(code) code #endif @@ -9981,9 +10190,9 @@ #if defined(IA32) || defined(AMD64) #define X86 #define X86_ONLY(code) code ---- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-03-18 01:41:44.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2009-06-06 16:54:10.000000000 -0700 -@@ -827,7 +827,7 @@ +--- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-07-09 01:48:53.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/ostream.cpp 2010-07-11 09:11:58.000000000 -0700 +@@ -848,7 +848,7 @@ #ifndef PRODUCT @@ -9992,8 +10201,8 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> ---- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-03-18 01:41:44.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-01-16 12:50:23.000000000 -0800 +--- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-07-09 01:48:53.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-07-11 09:11:58.000000000 -0700 @@ -31,13 +31,18 @@ "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH", "JAVA_COMPILER", "PATH", "USERNAME", @@ -10014,7 +10223,7 @@ // defined on Windows "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR", -@@ -851,7 +856,7 @@ +@@ -862,7 +867,7 @@ const char* ptr = OnError; while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){ out.print_raw ("# Executing "); @@ -10023,8 +10232,8 @@ out.print_raw ("/bin/sh -c "); #elif defined(SOLARIS) out.print_raw ("/usr/bin/sh -c "); ---- ./hotspot/test/Makefile 2010-03-18 01:41:44.000000000 -0700 -+++ ./hotspot/test/Makefile 2009-06-28 17:58:24.000000000 -0700 +--- ./hotspot/test/Makefile 2010-07-09 01:48:53.000000000 -0700 ++++ ./hotspot/test/Makefile 2010-07-11 09:11:58.000000000 -0700 @@ -44,6 +44,22 @@ ARCH = i586 endif @@ -10066,8 +10275,8 @@ ifdef TESTDIRS JTREG_TESTDIRS = $(TESTDIRS) endif ---- ./hotspot/test/jprt.config 2010-03-18 01:41:45.000000000 -0700 -+++ ./hotspot/test/jprt.config 2009-06-06 16:54:10.000000000 -0700 +--- ./hotspot/test/jprt.config 2010-07-09 01:48:53.000000000 -0700 ++++ ./hotspot/test/jprt.config 2010-07-11 09:11:59.000000000 -0700 @@ -75,8 +75,8 @@ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. @@ -10135,41 +10344,42 @@ # Export PATH setting PATH="${path4sdk}" ---- ./jaxp/.hgtags 2010-03-18 01:41:59.000000000 -0700 -+++ ./jaxp/.hgtags 2010-03-20 11:12:05.000000000 -0700 -@@ -60,3 +60,4 @@ - 309a0a7fc6ceb1c9fc3a85b3608e97ef8f7b0dfd jdk7-b83 - 32c0cf01d555747918529a6ff9e06b0090c7a474 jdk7-b84 - 6c0ccabb430dacdcd4479f8b197980d5da4eeb66 jdk7-b85 -+81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 ---- ./jaxp/.jcheck/conf 2010-03-18 01:41:59.000000000 -0700 +--- ./hotspot/test/runtime/6929067/Test6929067.sh 2010-07-09 01:48:53.000000000 -0700 ++++ ./hotspot/test/runtime/6929067/Test6929067.sh 2010-07-11 09:11:59.000000000 -0700 +@@ -29,7 +29,7 @@ + PS=":" + FS="/" + ;; +- SunOS | Windows_* ) ++ SunOS | Windows_* | *BSD) + NULL=NUL + PS=";" + FS="\\" +--- ./jaxp/.jcheck/conf 2010-07-09 01:49:05.000000000 -0700 +++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./jaxws/.hgtags 2010-03-18 01:42:17.000000000 -0700 -+++ ./jaxws/.hgtags 2010-03-20 11:12:13.000000000 -0700 -@@ -60,3 +60,4 @@ - 371e3ded591d09112a9f231e37cb072781c486ac jdk7-b83 - 8bc02839eee4ef02cd1b50e87638874368a26535 jdk7-b84 - 8424512588ff95362c1f1e5f11c6efd4e7f7db6e jdk7-b85 -+512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 ---- ./jaxws/.jcheck/conf 2010-03-18 01:42:17.000000000 -0700 +--- ./jaxp/jaxp.properties 2010-07-09 01:49:05.000000000 -0700 ++++ ./jaxp/jaxp.properties 2010-07-11 09:12:02.000000000 -0700 +@@ -28,7 +28,7 @@ + jaxp_src.bundle.name=jdk7-jaxp-m7.zip + jaxp_src.bundle.md5.checksum=22e95fbdb9fb7d8b6b6fc0a1d76d1fbd + jaxp_src.master.bundle.dir=${drops.master.copy.base} +-jaxp_src.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/147490 ++jaxp_src.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/150785 + + #jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip + #jaxp_tests.master.bundle.dir=${drops.master.copy.base} +--- ./jaxws/.jcheck/conf 2010-07-09 01:49:21.000000000 -0700 +++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./jdk/.hgtags 2010-03-18 01:44:55.000000000 -0700 -+++ ./jdk/.hgtags 2010-03-20 11:12:37.000000000 -0700 -@@ -60,3 +60,4 @@ - 9027c6b9d7e2c9ca04a1add691b5b50d0f22b1aa jdk7-b83 - 7cb9388bb1a16365fa5118c5efa38b1cd58be40d jdk7-b84 - b396584a3e64988839cca21ea1f7fbdcc9248783 jdk7-b85 -+eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86 ---- ./jdk/.jcheck/conf 2010-03-18 01:44:55.000000000 -0700 +--- ./jdk/.jcheck/conf 2010-07-09 01:51:49.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 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/com/sun/java/pack/Makefile 2010-01-30 09:39:59.000000000 -0800 +--- ./jdk/make/com/sun/java/pack/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/com/sun/java/pack/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -62,6 +62,7 @@ @@ -10201,8 +10411,8 @@ OTHER_LDLIBS += $(LIBCXX) # setup the list of libraries to link in... ifeq ($(PLATFORM), linux) ---- ./jdk/make/com/sun/nio/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/com/sun/nio/Makefile 2010-03-14 21:36:30.000000000 -0700 +--- ./jdk/make/com/sun/nio/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/com/sun/nio/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -30,7 +30,16 @@ BUILDDIR = ../../.. include $(BUILDDIR)/common/Defs.gmk @@ -10220,8 +10430,8 @@ include $(BUILDDIR)/common/Subdirs.gmk all build clean clobber:: ---- ./jdk/make/com/sun/nio/sctp/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/com/sun/nio/sctp/Makefile 2010-01-30 09:39:59.000000000 -0800 +--- ./jdk/make/com/sun/nio/sctp/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/com/sun/nio/sctp/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -69,6 +69,9 @@ #LIBSCTP = -lsctp OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio @@ -10232,8 +10442,8 @@ else # windows include $(BUILDDIR)/common/Classes.gmk ---- ./jdk/make/com/sun/security/auth/module/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-01-30 09:39:59.000000000 -0800 +--- ./jdk/make/com/sun/security/auth/module/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -68,7 +68,7 @@ include FILES_c_solaris.gmk endif # solaris @@ -10243,8 +10453,8 @@ LIBRARY = jaas_unix include FILES_export_unix.gmk include FILES_c_unix.gmk ---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-01-30 09:27:22.000000000 -0800 +--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -43,5 +43,7 @@ sun/tools/attach/LinuxVirtualMachine.java endif @@ -10255,8 +10465,8 @@ +FILES_export = \ + sun/tools/attach/BsdVirtualMachine.java +endif ---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-01-30 09:27:22.000000000 -0800 +--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -39,4 +39,7 @@ LinuxVirtualMachine.c endif @@ -10266,8 +10476,8 @@ +FILES_c = \ + BsdVirtualMachine.c +endif ---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-01-30 09:27:22.000000000 -0800 +--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -43,6 +43,11 @@ sun/tools/attach/LinuxAttachProvider.java endif @@ -10280,8 +10490,8 @@ # # Files that need to be copied # ---- ./jdk/make/com/sun/tools/attach/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/Makefile 2010-01-30 09:39:59.000000000 -0800 +--- ./jdk/make/com/sun/tools/attach/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -37,6 +37,9 @@ ifeq ($(PLATFORM), linux) FILES_m = mapfile-linux @@ -10292,8 +10502,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk # ---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-01-30 09:27:22.000000000 -0800 +--- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-07-11 09:12:40.000000000 -0700 @@ -30,14 +30,12 @@ Java_sun_tools_attach_BsdVirtualMachine_checkPermissions; Java_sun_tools_attach_BsdVirtualMachine_close; @@ -10310,8 +10520,8 @@ local: *; }; ---- ./jdk/make/common/Defs-bsd.gmk 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/make/common/Defs-bsd.gmk 2010-01-30 19:08:28.000000000 -0800 +--- ./jdk/make/common/Defs-bsd.gmk 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/make/common/Defs-bsd.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -25,7 +25,7 @@ # @@ -10369,16 +10579,17 @@ DEBUG_FLAG = -g ifeq ($(FASTDEBUG), true) ifeq ($(ARCH_DATA_MODEL), 64) -@@ -194,7 +200,7 @@ - CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) +@@ -202,8 +208,7 @@ + else + CPP_ARCH_FLAGS += -D_$(ARCH)_ endif - --CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DBSD $(VERSION_DEFINES) \ -+CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -D_ALLBSD_SOURCE $(VERSION_DEFINES) \ +- +-CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DBSD $(VERSION_DEFINES) \ ++CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D_ALLBSD_SOURCE $(VERSION_DEFINES) \ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT ifeq ($(ARCH_DATA_MODEL), 64) -@@ -207,33 +213,37 @@ +@@ -216,33 +221,37 @@ CPPFLAGS_DBG += -DLOGGING endif @@ -10434,7 +10645,7 @@ # # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always -@@ -255,9 +265,9 @@ +@@ -264,9 +273,9 @@ ifeq ($(VARIANT), OPT) ifneq ($(NO_STRIP), true) ifneq ($(DEBUG_BINARIES), true) @@ -10446,7 +10657,7 @@ endif endif endif -@@ -276,6 +286,11 @@ +@@ -285,6 +294,11 @@ LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS) endif @@ -10458,7 +10669,7 @@ # # 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 -@@ -302,7 +317,9 @@ +@@ -311,7 +325,9 @@ override HAVE_FILIOH = false override HAVE_GETHRTIME = false override HAVE_GETHRVTIME = false @@ -10468,8 +10679,11 @@ override LEX_LIBRARY = -lfl ifeq ($(STATIC_CXX),true) override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic -@@ -314,12 +331,8 @@ +@@ -322,14 +338,11 @@ + override LIBSOCKET = + override LIBNSL = override LIBTHREAD = ++override LIBDL = override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = true -override OPENWIN_HOME = /usr/X11R6 @@ -10482,7 +10696,7 @@ override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = override THREADS_FLAG = native -@@ -340,6 +353,14 @@ +@@ -350,6 +363,14 @@ # DPS (Displayable PostScript) is available on Solaris machines HAVE_DPS = no @@ -10497,7 +10711,7 @@ # # Japanese manpages # -@@ -351,7 +372,7 @@ +@@ -361,7 +382,7 @@ SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX) # The JDI - Serviceability Agent binding is not currently supported @@ -10506,10 +10720,13 @@ ifeq ($(ARCH), ia64) INCLUDE_SA = false else ---- ./jdk/make/common/Defs-linux.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/Defs-linux.gmk 2010-01-30 09:27:22.000000000 -0800 -@@ -314,7 +314,7 @@ +--- ./jdk/make/common/Defs-linux.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/Defs-linux.gmk 2010-07-11 09:12:40.000000000 -0700 +@@ -322,9 +322,10 @@ + override LIBSOCKET = + override LIBNSL = override LIBTHREAD = ++override LIBDL = -ldl override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = true -override OPENWIN_HOME = /usr/X11R6 @@ -10517,8 +10734,20 @@ ifeq ($(ARCH), amd64) override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 else ---- ./jdk/make/common/Defs.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/Defs.gmk 2010-03-08 21:38:21.000000000 -0800 +--- ./jdk/make/common/Defs-solaris.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/Defs-solaris.gmk 2010-07-11 09:12:40.000000000 -0700 +@@ -648,6 +648,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 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/Defs.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -181,6 +181,36 @@ endif endif # OPENJDK @@ -10575,8 +10804,8 @@ endif # PROGRAM LDLIBS_COMMON += $(EXTRA_LIBS) ---- ./jdk/make/common/Program.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/Program.gmk 2010-01-30 09:39:59.000000000 -0800 +--- ./jdk/make/common/Program.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/Program.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -65,11 +65,27 @@ # Create a dependency on libjli (Java Launcher Infrastructure) # @@ -10637,9 +10866,9 @@ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' ---- ./jdk/make/common/Release.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/Release.gmk 2010-01-30 09:27:22.000000000 -0800 -@@ -148,14 +148,13 @@ +--- ./jdk/make/common/Release.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/Release.gmk 2010-07-11 09:12:40.000000000 -0700 +@@ -154,14 +154,13 @@ tnameserv.1 \ unpack200.1 @@ -10655,7 +10884,7 @@ extcheck.1 \ idlj.1 \ jar.1 \ -@@ -194,6 +193,11 @@ +@@ -200,6 +199,11 @@ JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING) endif # linux @@ -10667,7 +10896,7 @@ define copy-man-pages $(MKDIR) -p $1/man/man1 for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \ -@@ -326,6 +330,12 @@ +@@ -332,6 +336,12 @@ SOURCE_DIRS += $(CLOSED_SRC)/share/classes endif @@ -10680,7 +10909,7 @@ # # Specific files and directories that will be filtered out from above areas. -@@ -984,7 +994,7 @@ +@@ -1017,7 +1027,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. @@ -10689,7 +10918,7 @@ for d in $(SOURCE_DIRS); do \ $(RM) $(ABS_TEMPDIR)/src-files.list; \ ($(CD) $$d && \ -@@ -997,7 +1007,7 @@ +@@ -1030,7 +1040,7 @@ done ; \ ) ; \ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ @@ -10698,8 +10927,8 @@ | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \ fi; \ done ---- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-01-30 09:39:59.000000000 -0800 +--- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -49,8 +49,6 @@ com/sun/jmx/snmp/SnmpDataTypeEnums.class \ com/sun/jmx/snmp/SnmpDefinitions.class \ @@ -10787,8 +11016,8 @@ import-binary-plug-jar \ import-binary-plugs-completed ---- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -72,6 +72,24 @@ endif @@ -10814,8 +11043,8 @@ ifeq ($(PLATFORM), solaris) # Settings specific to Solaris ---- ./jdk/make/common/shared/Defs-bsd.gmk 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/common/shared/Defs-bsd.gmk 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -54,7 +54,7 @@ endef @@ -10854,8 +11083,8 @@ # Import JDK images allow for partial builds, components not built are # imported (or copied from) these import areas when needed. ---- ./jdk/make/common/shared/Defs-utils.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/shared/Defs-utils.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/common/shared/Defs-utils.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/shared/Defs-utils.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -67,6 +67,13 @@ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH) endif @@ -10908,8 +11137,8 @@ + UNZIP = $(UTILS_DEVTOOL_PATH)unzip + endif +endif ---- ./jdk/make/common/shared/Defs.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/shared/Defs.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/common/shared/Defs.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/shared/Defs.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -589,8 +589,8 @@ override CC_VERSION = sun endif @@ -10921,8 +11150,8 @@ override CC_VERSION = gcc endif ---- ./jdk/make/common/shared/Platform.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/shared/Platform.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/common/shared/Platform.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/shared/Platform.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -82,7 +82,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: @@ -11034,7 +11263,7 @@ # Windows with and without CYGWIN will be slightly different ifeq ($(SYSTEM_UNAME), Windows_NT) PLATFORM = windows -@@ -379,6 +474,14 @@ +@@ -404,6 +499,14 @@ ARCH_VM_SUBDIR=jre/lib/$(LIBARCH) endif @@ -11049,7 +11278,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. -@@ -418,6 +521,18 @@ +@@ -443,6 +546,18 @@ export MIN_VM_MEMORY endif @@ -11068,8 +11297,8 @@ # 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-Settings.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -244,6 +244,7 @@ ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings) ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH) @@ -11078,8 +11307,8 @@ ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings) ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS) ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE) ---- ./jdk/make/common/shared/Sanity.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/common/shared/Sanity.gmk 2010-03-20 11:12:37.000000000 -0700 +--- ./jdk/make/common/shared/Sanity.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/common/shared/Sanity.gmk 2010-07-11 09:12:40.000000000 -0700 @@ -142,6 +142,11 @@ $(EGREP) "\#define" | $(NAWK) '{print $$3}') endif @@ -11111,8 +11340,8 @@ ###################################################### # Check for existence of MS_RUNTIME_LIBRARIES ---- ./jdk/make/docs/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/docs/Makefile 2010-02-06 10:17:32.000000000 -0800 +--- ./jdk/make/docs/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/docs/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -214,7 +214,7 @@ # you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR) # being interpreted as an end of command (newline) @@ -11122,8 +11351,8 @@ JAAS_DOCDIR = $(DOCSDIR)/jre/api/security/jaas/spec JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \ -encoding ascii \ ---- ./jdk/make/java/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/Makefile 2010-03-08 21:38:21.000000000 -0800 +--- ./jdk/make/java/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/java/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -53,7 +53,7 @@ endif endif # PLATFORM @@ -11133,20 +11362,17 @@ SUBDIRS += jexec endif # PLATFORM ---- ./jdk/make/java/hpi/hpi_common.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/hpi/hpi_common.gmk 2010-01-30 09:27:23.000000000 -0800 -@@ -86,5 +86,9 @@ +--- ./jdk/make/java/hpi/hpi_common.gmk 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/java/hpi/hpi_common.gmk 2010-07-11 09:12:40.000000000 -0700 +@@ -86,5 +86,5 @@ # Things that must be linked in. # ifneq ($(PLATFORM), windows) -+ifeq ($(PLATFORM), bsd) -+OTHER_LDLIBS += $(LIBM) -+else - OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl +-OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) -ldl ++OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) $(LIBDL) endif -+endif ---- ./jdk/make/java/hpi/native/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/hpi/native/Makefile 2010-01-30 09:39:59.000000000 -0800 +--- ./jdk/make/java/hpi/native/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/java/hpi/native/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -73,16 +73,25 @@ ifeq ($(MOOT_PRIORITIES),true) OTHER_CPPFLAGS += -DMOOT_PRIORITIES @@ -11173,8 +11399,8 @@ ifeq ($(HAVE_FILIOH),true) OTHER_CPPFLAGS += -DHAVE_FILIOH endif ---- ./jdk/make/java/instrument/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/instrument/Makefile 2010-01-30 09:39:59.000000000 -0800 +--- ./jdk/make/java/instrument/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/java/instrument/Makefile 2010-07-11 09:12:40.000000000 -0700 @@ -103,6 +103,26 @@ # equivalent of strcasecmp is stricmp on Windows CPPFLAGS_COMMON += -Dstrcasecmp=stricmp @@ -11210,8 +11436,8 @@ # # Library to compile. ---- ./jdk/make/java/java/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/java/Makefile 2010-03-08 21:38:21.000000000 -0800 +--- ./jdk/make/java/java/Makefile 2010-07-09 01:51:49.000000000 -0700 ++++ ./jdk/make/java/java/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -166,8 +166,10 @@ # Is the altzone extern documented in ctime(3C) available? # @@ -11223,23 +11449,17 @@ ifeq ($(HAVE_ALTZONE),true) OTHER_CPPFLAGS += -DHAVE_ALTZONE -@@ -204,9 +206,14 @@ +@@ -204,7 +206,7 @@ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \ -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib else -+ifeq ($(PLATFORM), bsd) -+OTHER_LDLIBS += $(JVMLIB) -lverify \ -+ -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) -+else - OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \ +-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) -ldl \ ++OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBDL) \ -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) endif -+endif - # - # Rules. ---- ./jdk/make/java/java/genlocales.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/java/genlocales.gmk 2010-03-08 21:38:21.000000000 -0800 +--- ./jdk/make/java/java/genlocales.gmk 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/java/genlocales.gmk 2010-07-11 09:12:41.000000000 -0700 @@ -76,10 +76,14 @@ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) @$(RM) $@.tmp.euro $@.tmp.noneuro; @@ -11259,8 +11479,8 @@ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ $@.tmp.noneuro $< $@ ---- ./jdk/make/java/java/localegen.sh 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/java/localegen.sh 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/java/java/localegen.sh 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/java/localegen.sh 2010-07-11 09:12:41.000000000 -0700 @@ -55,9 +55,9 @@ for FILE in $RESOURCE_NAMES do @@ -11273,21 +11493,19 @@ done sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE" ---- ./jdk/make/java/java_hprof_demo/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/java_hprof_demo/Makefile 2010-01-30 09:40:00.000000000 -0800 -@@ -84,8 +84,10 @@ +--- ./jdk/make/java/java_hprof_demo/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/java_hprof_demo/Makefile 2010-07-11 09:12:41.000000000 -0700 +@@ -84,7 +84,7 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS += wsock32.lib winmm.lib else -+ifneq ($(PLATFORM), bsd) - OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl +- OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl ++ OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBDL) endif -+endif # - # Tell library.gmk to copy the txt file first ---- ./jdk/make/java/jli/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/jli/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/java/jli/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/jli/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -45,7 +45,9 @@ include $(BUILDDIR)/common/Defs.gmk @@ -11380,8 +11598,8 @@ + vpath %.c $(ZIP_SRC) +endif + ---- ./jdk/make/java/management/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/management/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/java/management/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/management/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -86,6 +86,11 @@ OTHER_INCLUDES += \ -I$(SHARE_SRC)/native/sun/management @@ -11394,8 +11612,8 @@ ifeq ($(PLATFORM),windows) OTHER_LDLIBS += $(JVMLIB) endif ---- ./jdk/make/java/net/FILES_c.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/net/FILES_c.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/java/net/FILES_c.gmk 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/net/FILES_c.gmk 2010-07-11 09:12:41.000000000 -0700 @@ -47,6 +47,10 @@ FILES_c += linux_close.c endif @@ -11407,8 +11625,8 @@ ifeq ($(PLATFORM), windows) FILES_c += TwoStacksPlainSocketImpl.c FILES_c += DualStackPlainSocketImpl.c ---- ./jdk/make/java/net/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/net/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/java/net/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/net/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -93,6 +93,12 @@ include $(BUILDDIR)/common/Library.gmk @@ -11430,8 +11648,8 @@ CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl ---- ./jdk/make/java/nio/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/nio/Makefile 2010-03-08 21:38:21.000000000 -0800 +--- ./jdk/make/java/nio/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/nio/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -261,6 +261,69 @@ sun/nio/fs/UnixConstants.java endif # PLATFORM = linux @@ -11534,8 +11752,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk ---- ./jdk/make/java/nio/mapfile-bsd 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/make/java/nio/mapfile-bsd 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/java/nio/mapfile-bsd 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/make/java/nio/mapfile-bsd 2010-07-11 09:12:41.000000000 -0700 @@ -36,25 +36,6 @@ Java_sun_nio_ch_DatagramDispatcher_readv0; Java_sun_nio_ch_DatagramDispatcher_write0; @@ -11593,8 +11811,8 @@ Java_sun_nio_fs_UnixNativeDispatcher_init; Java_sun_nio_fs_UnixNativeDispatcher_getcwd; Java_sun_nio_fs_UnixNativeDispatcher_strerror; ---- ./jdk/make/java/npt/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/npt/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/java/npt/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/npt/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -68,6 +68,18 @@ OTHER_LCF += -export:nptInitialize -export:nptTerminate endif @@ -11614,8 +11832,8 @@ # # Add to ambient vpath so we pick up the library files # ---- ./jdk/make/java/redist/fonts/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/redist/fonts/Makefile 2010-01-30 13:42:52.000000000 -0800 +--- ./jdk/make/java/redist/fonts/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/redist/fonts/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -43,7 +43,7 @@ $(LIBDIR)/fonts/LucidaSansRegular.ttf \ $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \ @@ -11643,8 +11861,8 @@ all build : $(INTERNAL_IMPORT_LIST) ---- ./jdk/make/java/security/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/security/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/java/security/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/security/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -50,7 +50,15 @@ ifneq ($(ARCH_DATA_MODEL), 64) PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows @@ -11661,8 +11879,8 @@ endif # PLATFORM ---- ./jdk/make/java/zip/FILES_c.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/zip/FILES_c.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/java/zip/FILES_c.gmk 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/zip/FILES_c.gmk 2010-07-11 09:12:41.000000000 -0700 @@ -29,7 +29,10 @@ Deflater.c \ Inflater.c \ @@ -11682,8 +11900,8 @@ - zutil.c + zutil.c +endif ---- ./jdk/make/java/zip/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/java/zip/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/java/zip/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/java/zip/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -72,16 +72,28 @@ CPPFLAGS += -UDEBUG endif @@ -11714,8 +11932,8 @@ OTHER_LDLIBS = $(JVMLIB) +endif + ---- ./jdk/make/javax/sound/FILES_c.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/javax/sound/FILES_c.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/javax/sound/FILES_c.gmk 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/javax/sound/FILES_c.gmk 2010-07-11 09:12:41.000000000 -0700 @@ -34,6 +34,8 @@ FILES_linux = @@ -11725,8 +11943,8 @@ FILES_windows = \ PLATFORM_API_WinOS_MidiIn.c \ PLATFORM_API_WinOS_MidiOut.c \ ---- ./jdk/make/javax/sound/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/javax/sound/Makefile 2010-03-08 21:38:21.000000000 -0800 +--- ./jdk/make/javax/sound/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/javax/sound/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -108,6 +108,16 @@ #MXSPP_ADD = $(PLATFORM)-$(ARCH)/ endif # PLATFORM linux @@ -11744,8 +11962,8 @@ ifeq ($(PLATFORM), solaris) # build with ports and direct audio CPPFLAGS += -DUSE_PORTS=TRUE \ ---- ./jdk/make/javax/sound/SoundDefs.gmk 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-01-30 09:27:23.000000000 -0800 +--- ./jdk/make/javax/sound/SoundDefs.gmk 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-07-11 09:12:41.000000000 -0700 @@ -40,6 +40,10 @@ CPPFLAGS += -DX_PLATFORM=X_LINUX endif # PLATFORM linux @@ -11757,8 +11975,8 @@ ifeq ($(PLATFORM), solaris) CPPFLAGS += -DX_PLATFORM=X_SOLARIS ---- ./jdk/make/jpda/back/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/jpda/back/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/jpda/back/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/jpda/back/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -50,8 +50,10 @@ -I$(GENNATIVESRCDIR)/jdwp @@ -11770,10 +11988,10 @@ # # This controls the ability to do logging in the library. ---- ./jdk/make/jpda/transport/socket/Makefile 2010-03-18 01:44:56.000000000 -0700 -+++ ./jdk/make/jpda/transport/socket/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/jpda/transport/socket/Makefile 2010-07-09 01:51:50.000000000 -0700 ++++ ./jdk/make/jpda/transport/socket/Makefile 2010-07-11 09:12:41.000000000 -0700 @@ -41,6 +41,11 @@ - OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread + OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread endif +ifeq ($(PLATFORM), bsd) @@ -11782,10 +12000,10 @@ +endif + ifeq ($(PLATFORM), solaris) - OTHER_LDLIBS += -lnsl $(LIBSOCKET) + OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) endif ---- ./jdk/make/sun/awt/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/awt/Makefile 2010-02-19 08:02:41.000000000 -0800 +--- ./jdk/make/sun/awt/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/awt/Makefile 2010-07-11 09:12:43.000000000 -0700 @@ -124,6 +124,13 @@ OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl endif @@ -11854,9 +12072,9 @@ LDFLAGS += -L$(OPENWIN_LIB) endif ---- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-01-30 09:27:25.000000000 -0800 -@@ -532,11 +532,11 @@ +--- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-07-11 09:12:43.000000000 -0700 +@@ -533,11 +533,11 @@ X11SurfaceData_GetOps; getDefaultConfig; @@ -11873,8 +12091,8 @@ # CDE private entry point Java_sun_awt_motif_XsessionWMcommand; ---- ./jdk/make/sun/awt/mawt.gmk 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/awt/mawt.gmk 2010-01-30 09:27:25.000000000 -0800 +--- ./jdk/make/sun/awt/mawt.gmk 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/awt/mawt.gmk 2010-07-11 09:12:43.000000000 -0700 @@ -169,7 +169,7 @@ OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi endif @@ -11941,8 +12159,8 @@ LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ $(AWT_RUNPATH) ---- ./jdk/make/sun/font/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/font/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/sun/font/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/font/Makefile 2010-07-11 09:12:43.000000000 -0700 @@ -174,6 +174,15 @@ # Libraries to link, and other C flags. # @@ -11967,8 +12185,8 @@ endif # PLATFORM ---- ./jdk/make/sun/image/generic/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/image/generic/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/sun/image/generic/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/image/generic/Makefile 2010-07-11 09:12:43.000000000 -0700 @@ -69,5 +69,9 @@ -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib @@ -11980,8 +12198,8 @@ +endif + ---- ./jdk/make/sun/jawt/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/jawt/Makefile 2010-01-30 09:40:00.000000000 -0800 +--- ./jdk/make/sun/jawt/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/jawt/Makefile 2010-07-11 09:12:43.000000000 -0700 @@ -93,8 +93,7 @@ # # Other extra flags needed for compiling. @@ -12001,7 +12219,7 @@ # # Libraries to link in. @@ -116,7 +116,7 @@ - OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt + OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender endif # PLATFORM -ifeq ($(PLATFORM), linux) @@ -12009,8 +12227,8 @@ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt endif # PLATFORM ---- ./jdk/make/sun/security/ec/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/security/ec/Makefile 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/make/sun/security/ec/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/security/ec/Makefile 2010-07-11 09:12:43.000000000 -0700 @@ -193,7 +193,11 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS += $(JVMLIB) @@ -12024,8 +12242,8 @@ endif include $(BUILDDIR)/common/Mapfile-vers.gmk ---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-07-11 09:12:43.000000000 -0700 @@ -72,6 +72,10 @@ # # Libraries to link @@ -12038,9 +12256,9 @@ +ifeq ($(PLATFORM), bsd) + OTHER_LDLIBS = $(JVMLIB) +endif ---- ./jdk/make/sun/security/pkcs11/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/security/pkcs11/Makefile 2010-01-30 09:40:01.000000000 -0800 -@@ -156,7 +156,7 @@ +--- ./jdk/make/sun/security/pkcs11/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/security/pkcs11/Makefile 2010-07-11 09:12:43.000000000 -0700 +@@ -157,7 +157,7 @@ # # Libraries to link # @@ -12049,8 +12267,8 @@ OTHER_LDLIBS = $(JVMLIB) else OTHER_LDLIBS = -ldl $(JVMLIB) ---- ./jdk/make/sun/security/smartcardio/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/security/smartcardio/Makefile 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/make/sun/security/smartcardio/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/security/smartcardio/Makefile 2010-07-11 09:12:44.000000000 -0700 @@ -76,6 +76,10 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS = $(JVMLIB) winscard.lib @@ -12063,8 +12281,8 @@ + endif OTHER_CFLAGS = -D__sun_jdk endif ---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-01-30 09:27:26.000000000 -0800 +--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-07-11 09:12:44.000000000 -0700 @@ -49,18 +49,6 @@ dgif_lib.c \ gif_err.c \ @@ -12103,8 +12321,8 @@ + zcrc32.c \ + zutil.c +endif ---- ./jdk/make/sun/splashscreen/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/splashscreen/Makefile 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/make/sun/splashscreen/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/splashscreen/Makefile 2010-07-11 09:12:44.000000000 -0700 @@ -64,8 +64,24 @@ ifneq ($(PLATFORM), windows) @@ -12155,9 +12373,9 @@ # Shun the less than portable MMX assembly code in pnggccrd.c, # and use alternative implementations in C. ---- ./jdk/make/sun/xawt/Makefile 2010-03-18 01:44:57.000000000 -0700 -+++ ./jdk/make/sun/xawt/Makefile 2010-01-30 09:40:01.000000000 -0800 -@@ -48,12 +48,20 @@ +--- ./jdk/make/sun/xawt/Makefile 2010-07-09 01:51:51.000000000 -0700 ++++ ./jdk/make/sun/xawt/Makefile 2010-07-11 09:12:44.000000000 -0700 +@@ -48,6 +48,9 @@ AUTO_JAVA_PRUNE = WrapperGenerator.java LDFLAGS += -L$(OPENWIN_LIB) @@ -12165,8 +12383,9 @@ +LDFLAGS += -Wl,-R$(OPENWIN_LIB) +endif - ifeq ($(PLATFORM), linux) - LDFLAGS += -lpthread + # For Xrender extension. + ifeq ($(PLATFORM), solaris) +@@ -59,6 +62,11 @@ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) endif @@ -12178,21 +12397,16 @@ # Since this library will be living in a subdirectory below the other libraries # we need to add an extra runpath so that libraries in the upper directory # are found at runtime. -@@ -88,7 +96,12 @@ +@@ -93,7 +101,7 @@ vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 --OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ -+ifeq ($(PLATFORM), bsd) -+LIBDL= -+else -+LIBDL=-ldl -+endif -+OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 $(LIBDL) \ +-OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender -ldl \ ++OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) \ $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi ifeq ($(PLATFORM), solaris) -@@ -96,8 +109,6 @@ +@@ -101,8 +109,6 @@ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) endif @@ -12201,9 +12415,9 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \ -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ -I$(PLATFORM_SRC)/native/sun/awt \ -@@ -124,9 +135,11 @@ +@@ -129,9 +135,11 @@ -I$(SHARE_SRC)/native/sun/awt \ - -I$(PLATFORM_SRC)/native/sun/awt + -I$(PLATFORM_SRC)/native/sun/awt +CPPFLAGS += -I$(CUPS_HEADERS_PATH) + @@ -12214,7 +12428,7 @@ -I/usr/include/X11/extensions \ -I$(OPENWIN_HOME)/include endif -@@ -135,6 +148,14 @@ +@@ -140,6 +148,14 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions endif @@ -12229,8 +12443,8 @@ ifeq ($(MILESTONE), internal) CPPFLAGS += -DINTERNAL_BUILD endif ---- ./jdk/make/tools/freetypecheck/Makefile 2010-03-18 01:44:59.000000000 -0700 -+++ ./jdk/make/tools/freetypecheck/Makefile 2010-01-30 09:27:28.000000000 -0800 +--- ./jdk/make/tools/freetypecheck/Makefile 2010-07-09 01:51:53.000000000 -0700 ++++ ./jdk/make/tools/freetypecheck/Makefile 2010-07-11 09:12:46.000000000 -0700 @@ -49,8 +49,15 @@ # Add runtime lib search path to ensure test will be runnable ifeq ($(PLATFORM), solaris) @@ -12248,10 +12462,10 @@ endif endif FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH) ---- ./jdk/src/share/back/commonRef.c 2010-03-18 01:45:00.000000000 -0700 -+++ ./jdk/src/share/back/commonRef.c 2010-01-30 09:27:31.000000000 -0800 +--- ./jdk/src/share/back/commonRef.c 2010-07-09 01:51:55.000000000 -0700 ++++ ./jdk/src/share/back/commonRef.c 2010-07-11 09:12:49.000000000 -0700 @@ -23,6 +23,10 @@ - * have any questions. + * questions. */ +#if defined(_ALLBSD_SOURCE) @@ -12261,8 +12475,8 @@ #include "util.h" #include "commonRef.h" ---- ./jdk/src/share/bin/java.c 2010-03-18 01:45:00.000000000 -0700 -+++ ./jdk/src/share/bin/java.c 2010-01-30 09:27:31.000000000 -0800 +--- ./jdk/src/share/bin/java.c 2010-07-09 01:51:55.000000000 -0700 ++++ ./jdk/src/share/bin/java.c 2010-07-11 09:12:49.000000000 -0700 @@ -66,6 +66,10 @@ static jboolean printUsage = JNI_FALSE; /* print and exit*/ static jboolean printXUsage = JNI_FALSE; /* print and exit*/ @@ -12362,8 +12576,8 @@ static void DumpState() { ---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-03-18 01:45:01.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-01-30 09:27:33.000000000 -0800 +--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-07-09 01:51:56.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-07-11 09:12:51.000000000 -0700 @@ -477,6 +477,10 @@ String[] dirs = new String[] { userHome + sep + ".themes", @@ -12375,8 +12589,8 @@ "/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 2010-03-18 01:45:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-01-30 09:27:35.000000000 -0800 +--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-07-09 01:51:58.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-07-11 09:12:54.000000000 -0700 @@ -78,6 +78,9 @@ */ public long timeStamp ; @@ -12387,7 +12601,7 @@ /** ---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-03-27 11:09:12.000000000 -0700 +--- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-07-11 09:19:13.000000000 -0700 +++ ./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 @@ -12396,18 +12610,18 @@ -com.sun.media.sound.SimpleInputDeviceProvider -com.sun.media.sound.DirectAudioDeviceProvider -com.sun.media.sound.HeadspaceMixerProvider ---- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,193 +0,0 @@ -/* -- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -12419,9 +12633,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -package com.sun.servicetag; @@ -12592,8 +12806,8 @@ - } - -} ---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-03-18 01:45:06.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-02-19 08:02:41.000000000 -0800 +--- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-07-09 01:52:03.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-07-11 09:13:02.000000000 -0700 @@ -172,7 +172,12 @@ } else { String osName = System.getProperty("os.name"); @@ -12608,8 +12822,8 @@ (System.getenv("DISPLAY") == null)); } } else if (nm.equals("true")) { ---- ./jdk/src/share/classes/java/util/TimeZone.java 2010-03-18 01:45:11.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-01-30 09:27:51.000000000 -0800 +--- ./jdk/src/share/classes/java/util/TimeZone.java 2010-07-09 01:52:09.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-07-11 09:13:11.000000000 -0700 @@ -776,15 +776,13 @@ } int gmtOffset = (hours * 60 + num) * 60 * 1000; @@ -12627,8 +12841,8 @@ } return zi; } ---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-03-18 01:45:18.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-01-30 09:28:04.000000000 -0800 +--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-07-09 01:52:18.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-07-11 09:13:25.000000000 -0700 @@ -1122,7 +1122,7 @@ */ HashMap<String, Boolean> existsMap; @@ -12647,8 +12861,8 @@ errors++; } } ---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-03-18 01:45:18.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-01-30 09:28:04.000000000 -0800 +--- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-07-09 01:52:18.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-07-11 09:13:25.000000000 -0700 @@ -39,6 +39,7 @@ WINDOWS, LINUX, @@ -12672,8 +12886,8 @@ // determine another OS here } ---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-03-18 01:45:18.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-02-21 16:55:52.000000000 -0800 +--- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-07-09 01:52:19.000000000 -0700 ++++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-07-11 09:13:26.000000000 -0700 @@ -46,6 +46,8 @@ public static boolean isLinux; @@ -12695,9 +12909,9 @@ String t2kStr = System.getProperty("sun.java2d.font.scaler"); if (t2kStr != null) { useT2K = "t2k".equals(t2kStr); ---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-03-18 01:45:18.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-03-20 11:12:38.000000000 -0700 -@@ -409,7 +409,7 @@ +--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-07-09 01:52:19.000000000 -0700 ++++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-07-11 09:13:26.000000000 -0700 +@@ -413,7 +413,7 @@ * registerFonts method as on-screen these JRE fonts * always go through the T2K rasteriser. */ @@ -12706,18 +12920,18 @@ /* Linux font configuration uses these fonts */ registerFontDir(jreFontDirName); } ---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,190 +0,0 @@ -/* -- * Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -12729,9 +12943,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -package sun.io; @@ -12899,18 +13113,18 @@ - return charOff - outOff; - } -} ---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,193 +0,0 @@ -/* -- * Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -12922,9 +13136,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -package sun.io; @@ -13095,18 +13309,18 @@ - return 2; - } -} ---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800 -@@ -1,374 +0,0 @@ +@@ -1,370 +0,0 @@ -/* -- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -13118,9 +13332,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -/* @@ -13165,20 +13379,18 @@ - - private static class Decoder extends CharsetDecoder { - JIS_X_0201.Decoder decoderJ0201; -- JIS_X_0208_Decoder decodeMappingJ0208; - protected final char REPLACE_CHAR='\uFFFD'; - -- short[] jis0208Index1; -- String[] jis0208Index2; +- private static final int start = 0xa1; +- private static final int end = 0xfe; +- private static final short[] jis0208Index1 = +- JIS_X_0208_Decoder.getIndex1(); +- private static final String[] jis0208Index2 = +- JIS_X_0208_Decoder.getIndex2(); - - private Decoder(Charset cs) { - super(cs, 1.0f, 1.0f); - decoderJ0201 = new JIS_X_0201.Decoder(cs); -- decodeMappingJ0208 = new JIS_X_0208_Decoder(cs); -- decodeMappingJ0208.start = 0xa1; -- decodeMappingJ0208.end = 0xfe; -- jis0208Index1 = decodeMappingJ0208.getIndex1(); -- jis0208Index2 = decodeMappingJ0208.getIndex2(); - } - - protected char convSingleByte(int b) { @@ -13193,11 +13405,11 @@ - } - - if (((byte1 < 0) || (byte1 > jis0208Index1.length)) -- || ((byte2 < decodeMappingJ0208.start) || (byte2 > decodeMappingJ0208.end))) +- || ((byte2 < start) || (byte2 > end))) - return REPLACE_CHAR; - -- int n = (jis0208Index1[byte1 - 0x80] & 0xf) * (decodeMappingJ0208.end - decodeMappingJ0208.start + 1) -- + (byte2 - decodeMappingJ0208.start); +- int n = (jis0208Index1[byte1 - 0x80] & 0xf) * (end - start + 1) +- + (byte2 - start); - return jis0208Index2[jis0208Index1[byte1 - 0x80] >> 4].charAt(n); - } - @@ -13313,18 +13525,16 @@ - private static class Encoder extends CharsetEncoder { - - JIS_X_0201.Encoder encoderJ0201; -- JIS_X_0208_Encoder encoderJ0208; - - private final Surrogate.Parser sgp = new Surrogate.Parser(); -- short[] jis0208Index1; -- String[] jis0208Index2; +- private static final short[] jis0208Index1 = +- JIS_X_0208_Encoder.getIndex1(); +- private static final String[] jis0208Index2 = +- JIS_X_0208_Encoder.getIndex2(); - - private Encoder(Charset cs) { - super(cs, 2.0f, 2.0f); - encoderJ0201 = new JIS_X_0201.Encoder(cs); -- encoderJ0208 = new JIS_X_0208_Encoder(cs); -- jis0208Index1 = encoderJ0208.getIndex1(); -- jis0208Index2 = encoderJ0208.getIndex2(); - } - - public boolean canEncode(char c) { @@ -13472,8 +13682,8 @@ - } - } -} ---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-03-18 01:45:22.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-01-30 09:28:12.000000000 -0800 +--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-07-09 01:52:25.000000000 -0700 ++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-07-11 09:13:33.000000000 -0700 @@ -1534,7 +1534,9 @@ pFlags |= NOSHEET; ncomps+=1; @@ -13485,15 +13695,28 @@ execCmd = new String[ncomps]; execCmd[n++] = "/usr/bin/lpr"; if ((pFlags & PRINTER) != 0) { ---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-03-18 01:45:27.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-01-30 09:28:18.000000000 -0800 +--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-07-09 01:52:26.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-07-11 09:13:35.000000000 -0700 +@@ -83,7 +83,9 @@ + String osname = System.getProperty("os.name"); + if (osname.startsWith("SunOS")) { + gssLibs = new String[]{ "libgss.so" }; +- } else if (osname.startsWith("Linux")) { ++ } else if (osname.startsWith("Linux") || ++ osname.startsWith("Darwin") || ++ osname.endsWith("BSD")) { + gssLibs = new String[]{ + "libgssapi.so", + "libgssapi_krb5.so", +--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-07-09 01:52:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-07-11 09:13:40.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 2010-03-18 01:45:27.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-01-30 09:28:18.000000000 -0800 +--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-07-09 01:52:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-07-11 09:13:40.000000000 -0700 @@ -50,6 +50,7 @@ String zname = ""; String[] files; @@ -13502,7 +13725,7 @@ // An entryName(path)->File map generated during "expand", it helps to // decide whether or not an existing entry in a jar file needs to be -@@ -862,6 +863,19 @@ +@@ -866,6 +867,19 @@ * Extracts specified entries from JAR file. */ void extract(InputStream in, String files[]) throws IOException { @@ -13522,7 +13745,7 @@ ZipInputStream zis = new ZipInputStream(in); ZipEntry e; // Set of all directory entries specified in archive. Disallows -@@ -892,6 +906,19 @@ +@@ -896,6 +910,19 @@ * Extracts specified entries from JAR file, via ZipFile. */ void extract(String fname, String files[]) throws IOException { @@ -13542,7 +13765,7 @@ ZipFile zf = new ZipFile(fname); Set<ZipEntry> dirs = newDirSet(); Enumeration<? extends ZipEntry> zes = zf.entries(); -@@ -923,6 +950,10 @@ +@@ -927,6 +954,10 @@ ZipEntry rc = null; String name = e.getName(); File f = new File(e.getName().replace('/', File.separatorChar)); @@ -13553,7 +13776,7 @@ if (e.isDirectory()) { if (f.exists()) { if (!f.isDirectory()) { -@@ -944,6 +975,10 @@ +@@ -948,6 +979,10 @@ } else { if (f.getParent() != null) { File d = new File(f.getParent()); @@ -13564,8 +13787,8 @@ 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 2010-03-18 01:45:27.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-01-30 09:28:18.000000000 -0800 +--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-07-09 01:52:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-07-11 09:13:40.000000000 -0700 @@ -44,6 +44,8 @@ {0} : could not create directory error.incorrect.length=\ @@ -13575,8 +13798,8 @@ out.added.manifest=\ added manifest out.update.manifest=\ ---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-03-18 01:45:29.000000000 -0700 -+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-02-21 17:29:35.000000000 -0800 +--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-07-09 01:52:33.000000000 -0700 ++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-07-11 09:13:45.000000000 -0700 @@ -38,6 +38,7 @@ # gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9] # gnumake JDK=<java_home> OSNAME=linux [OPT=true] @@ -13615,8 +13838,8 @@ # Common -I options CFLAGS += -I. CFLAGS += -I../agent_util ---- ./jdk/src/share/hpi/include/hpi_impl.h 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-01-30 09:28:24.000000000 -0800 +--- ./jdk/src/share/hpi/include/hpi_impl.h 2010-07-09 01:52:34.000000000 -0700 ++++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-07-11 09:13:46.000000000 -0700 @@ -138,7 +138,11 @@ int sysBind(int fd, struct sockaddr *him, int len); int sysAccept(int fd, struct sockaddr *him, int *len); @@ -13631,7 +13854,7 @@ int tolen); ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags, --- ./jdk/src/share/lib/security/java.security-openbsd 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/lib/security/java.security-openbsd 2010-01-30 09:28:24.000000000 -0800 ++++ ./jdk/src/share/lib/security/java.security-openbsd 2010-07-11 09:13:47.000000000 -0700 @@ -0,0 +1,269 @@ +# +# This is the "master security properties file". @@ -13902,8 +14125,8 @@ +# Example, +# ocsp.responderCertSerialNumber=2A:FF:00 + ---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-01-30 09:28:24.000000000 -0800 +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-07-09 01:52:34.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-07-11 09:13:47.000000000 -0700 @@ -32,6 +32,10 @@ #include <unistd.h> #endif @@ -13929,11 +14152,11 @@ #ifdef _MSC_VER typedef LONGLONG jlong; typedef DWORDLONG julong; ---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-01-30 09:28:24.000000000 -0800 +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-07-09 01:52:34.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-07-11 09:13:47.000000000 -0700 @@ -22,6 +22,9 @@ - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * or visit www.oracle.com if you need additional information or have any + * questions. */ +#ifdef _ALLBSD_SOURCE +#include <stdint.h> @@ -13971,8 +14194,8 @@ true)); } ---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-01-30 09:28:24.000000000 -0800 +--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-07-09 01:52:34.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-07-11 09:13:47.000000000 -0700 @@ -33,7 +33,11 @@ #include <jni.h> @@ -13985,8 +14208,8 @@ #include "SoundDefs.h" #include "DirectAudio.h" #include "Utilities.h" ---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-01-30 09:28:24.000000000 -0800 +--- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-07-09 01:52:34.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-07-11 09:13:47.000000000 -0700 @@ -99,5 +99,17 @@ return com_sun_media_sound_Platform_LIB_ALSA; } @@ -14005,8 +14228,8 @@ +#endif return 0; } ---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-01-30 09:28:24.000000000 -0800 +--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-07-09 01:52:34.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-07-11 09:13:47.000000000 -0700 @@ -31,6 +31,7 @@ #define X_WINDOWS 1 #define X_SOLARIS 2 @@ -14034,9 +14257,9 @@ + + #endif // __SOUNDDEFS_INCLUDED__ ---- ./jdk/src/share/native/common/check_code.c 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/common/check_code.c 2010-01-30 09:28:25.000000000 -0800 -@@ -1065,7 +1065,7 @@ +--- ./jdk/src/share/native/common/check_code.c 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/common/check_code.c 2010-07-11 09:13:47.000000000 -0700 +@@ -1067,7 +1067,7 @@ * Make sure that branches don't go into the middle of nowhere. */ @@ -14045,7 +14268,7 @@ { unsigned char *p = (unsigned char *)&n; return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; -@@ -1144,26 +1144,26 @@ +@@ -1146,26 +1146,26 @@ } } if (opcode == JVM_OPC_tableswitch) { @@ -14079,7 +14302,7 @@ if (!isLegalTarget(context, target)) CCerror(context, "Illegal branch in tableswitch"); saved_operand[k + 1] = code_data[target]; -@@ -1624,7 +1624,7 @@ +@@ -1634,7 +1634,7 @@ if (lpc + 2 >= (int *)end) { return -1; /* do not read pass the end */ } @@ -14088,7 +14311,7 @@ if ((index < 0) || (index > 65535)) { return -1; /* illegal */ } else { -@@ -1637,7 +1637,7 @@ +@@ -1647,7 +1647,7 @@ int npairs; if (lpc + 1 >= (int *)end) return -1; /* do not read pass the end */ @@ -14097,8 +14320,8 @@ /* 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 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/java/io/io_util.h 2010-01-30 09:28:25.000000000 -0800 +--- ./jdk/src/share/native/java/io/io_util.h 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/java/io/io_util.h 2010-07-11 09:13:47.000000000 -0700 @@ -29,7 +29,15 @@ extern jfieldID IO_fd_fdID; extern jfieldID IO_handle_fdID; @@ -14116,10 +14339,10 @@ #define O_SYNC (0x0800) #define O_DSYNC (0x2000) #endif ---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-01-30 09:28:25.000000000 -0800 +--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-07-11 09:13:47.000000000 -0700 @@ -24,6 +24,15 @@ - * have any questions. + * questions. */ +#ifdef __OpenBSD__ @@ -14158,8 +14381,8 @@ /* * ANSI/POSIX ---- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-01-30 09:28:25.000000000 -0800 +--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-07-11 09:13:47.000000000 -0700 @@ -61,7 +61,7 @@ #define log1p jlog1p #define expm1 jexpm1 @@ -14169,9 +14392,9 @@ #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 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-01-30 09:28:25.000000000 -0800 -@@ -67,6 +67,10 @@ +--- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-07-11 09:13:48.000000000 -0700 +@@ -65,6 +65,10 @@ return jlong_zero; } else { char *msg; @@ -14182,8 +14405,8 @@ switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) { case Z_OK: return ptr_to_jlong(strm); -@@ -204,6 +208,10 @@ - if (inflateReset(jlong_to_ptr(strm)) != Z_OK) { +@@ -197,6 +201,10 @@ + if (inflateReset(jlong_to_ptr(addr)) != Z_OK) { JNU_ThrowInternalError(env, 0); } +// BSDXXX needed for FreeBSD 5.4 and below with system zlib @@ -14193,8 +14416,8 @@ } JNIEXPORT void JNICALL ---- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-01-30 09:28:25.000000000 -0800 +--- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-07-11 09:13:48.000000000 -0700 @@ -46,6 +46,10 @@ #include "zip_util.h" #include "zlib.h" @@ -14206,8 +14429,8 @@ /* 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 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-01-30 09:28:25.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-07-11 09:13:48.000000000 -0700 @@ -50,7 +50,9 @@ #include <stdio.h> #include <string.h> @@ -14218,8 +14441,8 @@ #include <limits.h> /* keep these after the other headers */ ---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-07-11 09:13:48.000000000 -0700 @@ -24,7 +24,11 @@ */ @@ -14232,10 +14455,10 @@ #include "sun_awt_image_BufImgSurfaceData.h" ---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-03-18 01:45:30.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-07-09 01:52:35.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-07-11 09:13:48.000000000 -0700 @@ -23,7 +23,11 @@ - * have any questions. + * questions. */ +#ifdef _ALLBSD_SOURCE @@ -14246,8 +14469,8 @@ #include "SurfaceData.h" #include "sun_awt_image_DataBufferNative.h" ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-07-09 01:52:36.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-07-11 09:13:49.000000000 -0700 @@ -86,7 +86,7 @@ #endif /* MLIB_USE_FTOI_CLAMPING */ @@ -14287,8 +14510,8 @@ #endif /* _NO_LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-07-09 01:52:36.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-07-11 09:13:49.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14328,8 +14551,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-07-09 01:52:36.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-07-11 09:13:49.000000000 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14369,8 +14592,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-07-09 01:52:36.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-07-11 09:13:49.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14410,8 +14633,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-07-09 01:52:36.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-07-11 09:13:49.000000000 -0700 @@ -95,7 +95,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14451,8 +14674,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-07-09 01:52:36.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-07-11 09:13:49.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14492,8 +14715,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-07-11 09:13:49.000000000 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14533,8 +14756,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-01-30 09:28:26.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-07-11 09:13:49.000000000 -0700 @@ -95,7 +95,7 @@ dst = dp[0]; if (ld_offset + size < 32) { @@ -14754,8 +14977,8 @@ } #else /* _LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-07-11 09:13:49.000000000 -0700 @@ -168,7 +168,7 @@ } @@ -15036,8 +15259,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-07-11 09:13:49.000000000 -0700 @@ -88,7 +88,7 @@ } d64_2_f32; @@ -15189,8 +15412,8 @@ ((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 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-07-11 09:13:49.000000000 -0700 @@ -30,7 +30,7 @@ typedef union { mlib_d64 db; @@ -15200,8 +15423,8 @@ mlib_s32 int1, int0; #else mlib_s32 int0, int1; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-07-11 09:13:49.000000000 -0700 @@ -275,11 +275,11 @@ for (i = 0; j <= (b_size - 4); j += 4, i++) { src0 = src1; @@ -15300,8 +15523,8 @@ s0 = s1; dp += SIZE; sp += SIZE; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-07-11 09:13:49.000000000 -0700 @@ -120,7 +120,7 @@ } \ } @@ -16534,8 +16757,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-07-11 09:13:49.000000000 -0700 @@ -27,6 +27,16 @@ #ifndef MLIB_IMAGE_H #define MLIB_IMAGE_H @@ -16553,8 +16776,8 @@ #include <mlib_types.h> #include <mlib_status.h> #include <mlib_sys.h> ---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-07-11 09:13:49.000000000 -0700 @@ -26,9 +26,15 @@ #include <stdlib.h> @@ -16585,8 +16808,8 @@ return (void *) memalign(8, size); #endif /* _MSC_VER */ } ---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-07-11 09:13:49.000000000 -0700 @@ -59,7 +59,10 @@ #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__) @@ -16599,10 +16822,10 @@ #include <stdint.h> /* for uintptr_t */ #include <malloc.h> /* for ptrdiff_t */ #else ---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-07-11 09:13:49.000000000 -0700 @@ -23,7 +23,11 @@ - * have any questions. + * questions. */ +#ifdef _ALLBSD_SOURCE @@ -16613,8 +16836,8 @@ #include "jni.h" #include "AccelGlyphCache.h" #include "Trace.h" ---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-03-18 01:45:31.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-01-30 09:28:27.000000000 -0800 +--- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-07-11 09:13:49.000000000 -0700 @@ -26,7 +26,11 @@ #include "jlong.h" #include "math.h" @@ -16627,8 +16850,8 @@ #include "sunfontids.h" #include "fontscalerdefs.h" #include "glyphblitting.h" ---- ./jdk/src/share/native/sun/font/sunFont.c 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/sunFont.c 2010-01-30 09:28:28.000000000 -0800 +--- ./jdk/src/share/native/sun/font/sunFont.c 2010-07-09 01:52:37.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/sunFont.c 2010-07-11 09:13:50.000000000 -0700 @@ -24,7 +24,9 @@ */ @@ -16639,8 +16862,8 @@ #include "string.h" #include "gdefs.h" #include "jlong.h" ---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-01-30 09:28:28.000000000 -0800 +--- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-07-09 01:52:38.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-07-11 09:13:50.000000000 -0700 @@ -28,7 +28,11 @@ #include "jni_util.h" #include "Disposer.h" @@ -16653,8 +16876,8 @@ #include "string.h" /** ---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-01-30 09:28:28.000000000 -0800 +--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-07-09 01:52:38.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-07-11 09:13:51.000000000 -0700 @@ -26,6 +26,9 @@ #ifndef OGLFuncs_h_Included #define OGLFuncs_h_Included @@ -16665,8 +16888,8 @@ #include "jni.h" #include "J2D_GL/gl.h" #include "J2D_GL/glext.h" ---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-01-30 09:28:28.000000000 -0800 +--- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-07-09 01:52:38.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-07-11 09:13:51.000000000 -0700 @@ -25,7 +25,11 @@ #ifndef HEADLESS @@ -16679,8 +16902,8 @@ #include "sun_java2d_pipe_BufferedOpCodes.h" ---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-01-30 09:28:28.000000000 -0800 +--- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-07-09 01:52:38.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-07-11 09:13:51.000000000 -0700 @@ -25,7 +25,11 @@ #ifndef HEADLESS @@ -16693,8 +16916,8 @@ #include <math.h> #include <jlong.h> ---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-01-30 09:28:29.000000000 -0800 +--- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-07-09 01:52:38.000000000 -0700 ++++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-07-11 09:13:51.000000000 -0700 @@ -28,6 +28,7 @@ #include <winsock2.h> #include <ws2tcpip.h> @@ -16703,8 +16926,8 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> ---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-01-30 09:28:29.000000000 -0800 +--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-07-09 01:52:38.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-07-11 09:13:51.000000000 -0700 @@ -78,6 +78,14 @@ typedef enum { B_FALSE, B_TRUE } boolean_t; #endif /* __linux__ */ @@ -16720,8 +16943,8 @@ #ifdef _WIN32 typedef unsigned char uint8_t; typedef unsigned long ulong_t; ---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-01-30 09:28:29.000000000 -0800 +--- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-07-09 01:52:38.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-07-11 09:13:51.000000000 -0700 @@ -60,9 +60,9 @@ #include <sys/types.h> @@ -16734,8 +16957,8 @@ #include <sys/param.h> #endif /* _WIN32 */ ---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-01-30 09:28:29.000000000 -0800 +--- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-07-11 09:13:52.000000000 -0700 @@ -59,9 +59,9 @@ #include <sys/types.h> @@ -16748,8 +16971,8 @@ #include <sys/param.h> #endif /* _WIN32 */ ---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-03-18 01:45:32.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-01-30 09:28:29.000000000 -0800 +--- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-07-11 09:13:52.000000000 -0700 @@ -64,9 +64,9 @@ #include <sys/types.h> @@ -16762,8 +16985,8 @@ #include <sys/param.h> #endif /* _WIN32 */ ---- ./jdk/src/share/transport/socket/socketTransport.c 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/share/transport/socket/socketTransport.c 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/share/transport/socket/socketTransport.c 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/share/transport/socket/socketTransport.c 2010-07-11 09:13:53.000000000 -0700 @@ -65,6 +65,9 @@ #define HEADER_SIZE 11 #define MAX_DATA_SIZE 1000 @@ -16851,8 +17074,8 @@ return res; } else if (res == 0) { break; /* eof, return nbytes which is less than len */ ---- ./jdk/src/solaris/back/exec_md.c 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/solaris/back/exec_md.c 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/solaris/back/exec_md.c 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/solaris/back/exec_md.c 2010-07-11 09:13:53.000000000 -0700 @@ -30,7 +30,7 @@ #include "sys.h" #include "util.h" @@ -16862,8 +17085,8 @@ /* Linux */ #define FORK() fork() #else ---- ./jdk/src/solaris/back/linker_md.c 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/solaris/back/linker_md.c 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/solaris/back/linker_md.c 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/solaris/back/linker_md.c 2010-07-11 09:13:53.000000000 -0700 @@ -48,6 +48,12 @@ #include "threads_md.h" #endif @@ -16889,8 +17112,8 @@ } } ---- ./jdk/src/solaris/back/util_md.h 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/solaris/back/util_md.h 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/solaris/back/util_md.h 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/solaris/back/util_md.h 2010-07-11 09:13:53.000000000 -0700 @@ -31,6 +31,11 @@ #include <limits.h> @@ -16912,8 +17135,8 @@ #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 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo.c 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/solaris/bin/ergo.c 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo.c 2010-07-11 09:13:53.000000000 -0700 @@ -71,14 +71,39 @@ /* Compute physical memory by asking the OS */ uint64_t @@ -16956,8 +17179,8 @@ return result; +#endif /* _ALLBSD_SOURCE */ } ---- ./jdk/src/solaris/bin/ergo.h 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo.h 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/solaris/bin/ergo.h 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo.h 2010-07-11 09:13:53.000000000 -0700 @@ -33,6 +33,10 @@ #include <sys/stat.h> #include <unistd.h> @@ -16969,8 +17192,8 @@ #include "java.h" ---- ./jdk/src/solaris/bin/ergo_i586.c 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo_i586.c 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/solaris/bin/ergo_i586.c 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo_i586.c 2010-07-11 09:13:53.000000000 -0700 @@ -106,7 +106,7 @@ #endif /* __solaris__ */ @@ -17051,8 +17274,8 @@ JLI_TraceLauncher("physical processors: %lu\n", result); return result; } ---- ./jdk/src/solaris/bin/java_md.c 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/solaris/bin/java_md.c 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/solaris/bin/java_md.c 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/solaris/bin/java_md.c 2010-07-11 09:13:53.000000000 -0700 @@ -24,6 +24,7 @@ */ @@ -17161,8 +17384,8 @@ pthread_t tid; pthread_attr_t attr; pthread_attr_init(&attr); ---- ./jdk/src/solaris/bin/java_md.h 2010-03-18 01:45:33.000000000 -0700 -+++ ./jdk/src/solaris/bin/java_md.h 2010-01-30 09:28:30.000000000 -0800 +--- ./jdk/src/solaris/bin/java_md.h 2010-07-09 01:52:39.000000000 -0700 ++++ ./jdk/src/solaris/bin/java_md.h 2010-07-11 09:13:53.000000000 -0700 @@ -47,10 +47,14 @@ #include <sys/time.h> #define CounterGet() (gethrtime()/1000) @@ -17179,8 +17402,8 @@ /* * Function prototypes. ---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-03-18 01:45:34.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-01-30 09:28:31.000000000 -0800 +--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-07-09 01:52:40.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-07-11 09:13:54.000000000 -0700 @@ -213,7 +213,7 @@ if (fontID != null) { fileName = (String)fontNameMap.get(fontID); @@ -17208,19 +17431,19 @@ (!mFontConfig.foundOsSpecificFile() || !mFontConfig.fontFilesArePresent()) || (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { ---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 1969-12-31 16:00:00.000000000 -0800 -@@ -1,189 +0,0 @@ +@@ -1,377 +0,0 @@ -# -# --# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. +-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Sun designates this +-# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided --# by Sun in the LICENSE file that accompanied this code. +-# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -17232,141 +17455,317 @@ -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# --# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, --# CA 95054 USA or visit www.sun.com if you need additional information or --# have any questions. +-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +-# or visit www.oracle.com if you need additional information or have any +-# questions. -# - -# Version - --# Uses Fedora Core 6 fonts and file paths. +-# Uses Fedora 9 fonts and file paths. -version=1 - -# Component Font Mappings - --dialog.plain.latin-1=DejaVu LGC Sans +-dialog.plain.latin-1=DejaVu Sans -dialog.plain.japanese-x0208=Sazanami Gothic -dialog.plain.korean=Baekmuk Gulim -dialog.plain.chinese-big5=AR PL ShanHeiSun Uni -dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni +-dialog.plain.bengali=Lohit Bengali +-dialog.plain.gujarati=Lohit Gujarati +-dialog.plain.hindi=Lohit Hindi +-dialog.plain.malayalam=Lohit Malayalam +-dialog.plain.oriya=Lohit Oriya +-dialog.plain.punjabi=Lohit Punjabi +-dialog.plain.tamil=Lohit Tamil +-dialog.plain.telugu=Lohit Telugu +-dialog.plain.sinhala=LKLUG - --dialog.bold.latin-1=DejaVu LGC Sans Bold +-dialog.bold.latin-1=DejaVu Sans Bold -dialog.bold.japanese-x0208=Sazanami Gothic -dialog.bold.korean=Baekmuk Gulim -dialog.bold.chinese-big5=AR PL ShanHeiSun Uni -dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni +-dialog.bold.bengali=Lohit Bengali +-dialog.bold.gujarati=Lohit Gujarati +-dialog.bold.hindi=Lohit Hindi +-dialog.bold.malayalam=Lohit Malayalam +-dialog.bold.oriya=Lohit Oriya +-dialog.bold.punjabi=Lohit Punjabi +-dialog.bold.tamil=Lohit Tamil +-dialog.bold.telugu=Lohit Telugu +-dialog.bold.sinhala=LKLUG - --dialog.italic.latin-1=DejaVu LGC Sans Oblique +-dialog.italic.latin-1=DejaVu Sans Oblique -dialog.italic.japanese-x0208=Sazanami Gothic -dialog.italic.korean=Baekmuk Gulim -dialog.italic.chinese-big5=AR PL ShanHeiSun Uni -dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni +-dialog.italic.bengali=Lohit Bengali +-dialog.italic.gujarati=Lohit Gujarati +-dialog.italic.hindi=Lohit Hindi +-dialog.italic.malayalam=Lohit Malayalam +-dialog.italic.oriya=Lohit Oriya +-dialog.italic.punjabi=Lohit Punjabi +-dialog.italic.tamil=Lohit Tamil +-dialog.italic.telugu=Lohit Telugu +-dialog.italic.sinhala=LKLUG - --dialog.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique +-dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique -dialog.bolditalic.japanese-x0208=Sazanami Gothic -dialog.bolditalic.korean=Baekmuk Gulim -dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni -dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +-dialog.bolditalic.bengali=Lohit Bengali +-dialog.bolditalic.gujarati=Lohit Gujarati +-dialog.bolditalic.hindi=Lohit Hindi +-dialog.bolditalic.malayalam=Lohit Malayalam +-dialog.bolditalic.oriya=Lohit Oriya +-dialog.bolditalic.punjabi=Lohit Punjabi +-dialog.bolditalic.tamil=Lohit Tamil +-dialog.bolditalic.telugu=Lohit Telugu +-dialog.bolditalic.sinhala=LKLUG - -- --sansserif.plain.latin-1=DejaVu LGC Sans +-sansserif.plain.latin-1=DejaVu Sans -sansserif.plain.japanese-x0208=Sazanami Gothic -sansserif.plain.korean=Baekmuk Gulim -sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni -sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni +-sansserif.plain.bengali=Lohit Bengali +-sansserif.plain.gujarati=Lohit Gujarati +-sansserif.plain.hindi=Lohit Hindi +-sansserif.plain.malayalam=Lohit Malayalam +-sansserif.plain.oriya=Lohit Oriya +-sansserif.plain.punjabi=Lohit Punjabi +-sansserif.plain.tamil=Lohit Tamil +-sansserif.plain.telugu=Lohit Telugu +-sansserif.plain.sinhala=LKLUG - --sansserif.bold.latin-1=DejaVu LGC Sans Bold +-sansserif.bold.latin-1=DejaVu Sans Bold -sansserif.bold.japanese-x0208=Sazanami Gothic -sansserif.bold.korean=Baekmuk Gulim -sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni -sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni +-sansserif.bold.bengali=Lohit Bengali +-sansserif.bold.gujarati=Lohit Gujarati +-sansserif.bold.hindi=Lohit Hindi +-sansserif.bold.malayalam=Lohit Malayalam +-sansserif.bold.oriya=Lohit Oriya +-sansserif.bold.punjabi=Lohit Punjabi +-sansserif.bold.tamil=Lohit Tamil +-sansserif.bold.telugu=Lohit Telugu +-sansserif.bold.sinhala=LKLUG - --sansserif.italic.latin-1=DejaVu LGC Sans Oblique +-sansserif.italic.latin-1=DejaVu Sans Oblique -sansserif.italic.japanese-x0208=Sazanami Gothic -sansserif.italic.korean=Baekmuk Gulim -sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni -sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni +-sansserif.italic.bengali=Lohit Bengali +-sansserif.italic.gujarati=Lohit Gujarati +-sansserif.italic.hindi=Lohit Hindi +-sansserif.italic.malayalam=Lohit Malayalam +-sansserif.italic.oriya=Lohit Oriya +-sansserif.italic.punjabi=Lohit Punjabi +-sansserif.italic.tamil=Lohit Tamil +-sansserif.italic.telugu=Lohit Telugu +-sansserif.italic.sinhala=LKLUG - --sansserif.bolditalic.latin-1=DejaVu LGC Sans Bold Oblique +-sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique -sansserif.bolditalic.japanese-x0208=Sazanami Gothic -sansserif.bolditalic.korean=Baekmuk Gulim -sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni -sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +-sansserif.bolditalic.bengali=Lohit Bengali +-sansserif.bolditalic.gujarati=Lohit Gujarati +-sansserif.bolditalic.hindi=Lohit Hindi +-sansserif.bolditalic.malayalam=Lohit Malayalam +-sansserif.bolditalic.oriya=Lohit Oriya +-sansserif.bolditalic.punjabi=Lohit Punjabi +-sansserif.bolditalic.tamil=Lohit Tamil +-sansserif.bolditalic.telugu=Lohit Telugu +-sansserif.bolditalic.sinhala=LKLUG - -- --serif.plain.latin-1=DejaVu LGC Serif +-serif.plain.latin-1=DejaVu Serif -serif.plain.japanese-x0208=Sazanami Mincho -serif.plain.korean=Baekmuk Batang -serif.plain.chinese-big5=AR PL ZenKai Uni -serif.plain.chinese-gb18030=AR PL ZenKai Uni +-serif.plain.bengali=Lohit Bengali +-serif.plain.gujarati=Lohit Gujarati +-serif.plain.hindi=Lohit Hindi +-serif.plain.malayalam=Lohit Malayalam +-serif.plain.oriya=Lohit Oriya +-serif.plain.punjabi=Lohit Punjabi +-serif.plain.tamil=Lohit Tamil +-serif.plain.telugu=Lohit Telugu +-serif.plain.sinhala=LKLUG - --serif.bold.latin-1=DejaVu LGC Serif Bold +-serif.bold.latin-1=DejaVu Serif Bold -serif.bold.japanese-x0208=Sazanami Mincho -serif.bold.korean=Baekmuk Batang -serif.bold.chinese-big5=AR PL ZenKai Uni -serif.bold.chinese-gb18030=AR PL ZenKai Uni +-serif.bold.bengali=Lohit Bengali +-serif.bold.gujarati=Lohit Gujarati +-serif.bold.hindi=Lohit Hindi +-serif.bold.malayalam=Lohit Malayalam +-serif.bold.oriya=Lohit Oriya +-serif.bold.punjabi=Lohit Punjabi +-serif.bold.tamil=Lohit Tamil +-serif.bold.telugu=Lohit Telugu +-serif.bold.sinhala=LKLUG - --serif.italic.latin-1=DejaVu LGC Serif Oblique +-serif.italic.latin-1=DejaVu Serif Oblique -serif.italic.japanese-x0208=Sazanami Mincho -serif.italic.korean=Baekmuk Batang -serif.italic.chinese-big5=AR PL ZenKai Uni -serif.italic.chinese-gb18030=AR PL ZenKai Uni +-serif.italic.bengali=Lohit Bengali +-serif.italic.gujarati=Lohit Gujarati +-serif.italic.hindi=Lohit Hindi +-serif.italic.malayalam=Lohit Malayalam +-serif.italic.oriya=Lohit Oriya +-serif.italic.punjabi=Lohit Punjabi +-serif.italic.tamil=Lohit Tamil +-serif.italic.telugu=Lohit Telugu +-serif.italic.sinhala=LKLUG - --serif.bolditalic.latin-1=DejaVu LGC Serif Bold Oblique +-serif.bolditalic.latin-1=DejaVu Serif Bold Oblique -serif.bolditalic.japanese-x0208=Sazanami Mincho -serif.bolditalic.korean=Baekmuk Batang -serif.bolditalic.chinese-big5=AR PL ZenKai Uni -serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni +-serif.bolditalic.bengali=Lohit Bengali +-serif.bolditalic.gujarati=Lohit Gujarati +-serif.bolditalic.hindi=Lohit Hindi +-serif.bolditalic.malayalam=Lohit Malayalam +-serif.bolditalic.oriya=Lohit Oriya +-serif.bolditalic.punjabi=Lohit Punjabi +-serif.bolditalic.tamil=Lohit Tamil +-serif.bolditalic.telugu=Lohit Telugu +-serif.bolditalic.sinhala=LKLUG - -- --monospaced.plain.latin-1=DejaVu LGC Sans Mono +-monospaced.plain.latin-1=DejaVu Sans Mono -monospaced.plain.japanese-x0208=Sazanami Gothic -monospaced.plain.korean=Baekmuk Gulim -monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni -monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni +-monospaced.plain.bengali=Lohit Bengali +-monospaced.plain.gujarati=Lohit Gujarati +-monospaced.plain.hindi=Lohit Hindi +-monospaced.plain.malayalam=Lohit Malayalam +-monospaced.plain.oriya=Lohit Oriya +-monospaced.plain.punjabi=Lohit Punjabi +-monospaced.plain.tamil=Lohit Tamil +-monospaced.plain.telugu=Lohit Telugu +-monospaced.plain.sinhala=LKLUG - --monospaced.bold.latin-1=DejaVu LGC Sans Mono Bold +-monospaced.bold.latin-1=DejaVu Sans Mono Bold -monospaced.bold.japanese-x0208=Sazanami Gothic -monospaced.bold.korean=Baekmuk Gulim -monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni -monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni +-monospaced.bold.bengali=Lohit Bengali +-monospaced.bold.gujarati=Lohit Gujarati +-monospaced.bold.hindi=Lohit Hindi +-monospaced.bold.malayalam=Lohit Malayalam +-monospaced.bold.oriya=Lohit Oriya +-monospaced.bold.punjabi=Lohit Punjabi +-monospaced.bold.tamil=Lohit Tamil +-monospaced.bold.telugu=Lohit Telugu +-monospaced.bold.sinhala=LKLUG - --monospaced.italic.latin-1=DejaVu LGC Sans Mono Oblique +-monospaced.italic.latin-1=DejaVu Sans Mono Oblique -monospaced.italic.japanese-x0208=Sazanami Gothic -monospaced.italic.korean=Baekmuk Gulim -monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni -monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni +-monospaced.italic.bengali=Lohit Bengali +-monospaced.italic.gujarati=Lohit Gujarati +-monospaced.italic.hindi=Lohit Hindi +-monospaced.italic.malayalam=Lohit Malayalam +-monospaced.italic.oriya=Lohit Oriya +-monospaced.italic.punjabi=Lohit Punjabi +-monospaced.italic.tamil=Lohit Tamil +-monospaced.italic.telugu=Lohit Telugu +-monospaced.italic.sinhala=LKLUG - --monospaced.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique +-monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique -monospaced.bolditalic.japanese-x0208=Sazanami Gothic -monospaced.bolditalic.korean=Baekmuk Gulim -monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni -monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +-monospaced.bolditalic.bengali=Lohit Bengali +-monospaced.bolditalic.gujarati=Lohit Gujarati +-monospaced.bolditalic.hindi=Lohit Hindi +-monospaced.bolditalic.malayalam=Lohit Malayalam +-monospaced.bolditalic.oriya=Lohit Oriya +-monospaced.bolditalic.punjabi=Lohit Punjabi +-monospaced.bolditalic.tamil=Lohit Tamil +-monospaced.bolditalic.telugu=Lohit Telugu +-monospaced.bolditalic.sinhala=LKLUG - -- --dialoginput.plain.latin-1=DejaVu LGC Sans Mono +-dialoginput.plain.latin-1=DejaVu Sans Mono -dialoginput.plain.japanese-x0208=Sazanami Gothic -dialoginput.plain.korean=Baekmuk Gulim -dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni -dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni +-dialoginput.plain.bengali=Lohit Bengali +-dialoginput.plain.gujarati=Lohit Gujarati +-dialoginput.plain.hindi=Lohit Hindi +-dialoginput.plain.malayalam=Lohit Malayalam +-dialoginput.plain.oriya=Lohit Oriya +-dialoginput.plain.punjabi=Lohit Punjabi +-dialoginput.plain.tamil=Lohit Tamil +-dialoginput.plain.telugu=Lohit Telugu +-dialoginput.plain.sinhala=LKLUG - --dialoginput.bold.latin-1=DejaVu LGC Sans Mono Bold +-dialoginput.bold.latin-1=DejaVu Sans Mono Bold -dialoginput.bold.japanese-x0208=Sazanami Gothic -dialoginput.bold.korean=Baekmuk Gulim -dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni -dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni +-dialoginput.bold.bengali=Lohit Bengali +-dialoginput.bold.gujarati=Lohit Gujarati +-dialoginput.bold.hindi=Lohit Hindi +-dialoginput.bold.malayalam=Lohit Malayalam +-dialoginput.bold.oriya=Lohit Oriya +-dialoginput.bold.punjabi=Lohit Punjabi +-dialoginput.bold.tamil=Lohit Tamil +-dialoginput.bold.telugu=Lohit Telugu +-dialoginput.bold.sinhala=LKLUG - --dialoginput.italic.latin-1=DejaVu LGC Sans Mono Oblique +-dialoginput.italic.latin-1=DejaVu Sans Mono Oblique -dialoginput.italic.japanese-x0208=Sazanami Gothic -dialoginput.italic.korean=Baekmuk Gulim -dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni -dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni +-dialoginput.italic.bengali=Lohit Bengali +-dialoginput.italic.gujarati=Lohit Gujarati +-dialoginput.italic.hindi=Lohit Hindi +-dialoginput.italic.malayalam=Lohit Malayalam +-dialoginput.italic.oriya=Lohit Oriya +-dialoginput.italic.punjabi=Lohit Punjabi +-dialoginput.italic.tamil=Lohit Tamil +-dialoginput.italic.telugu=Lohit Telugu +-dialoginput.italic.sinhala=LKLUG - --dialoginput.bolditalic.latin-1=DejaVu LGC Sans Mono Bold Oblique +-dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique -dialoginput.bolditalic.japanese-x0208=Sazanami Gothic -dialoginput.bolditalic.korean=Baekmuk Gulim -dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni -dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni +-dialoginput.bolditalic.bengali=Lohit Bengali +-dialoginput.bolditalic.gujarati=Lohit Gujarati +-dialoginput.bolditalic.hindi=Lohit Hindi +-dialoginput.bolditalic.malayalam=Lohit Malayalam +-dialoginput.bolditalic.oriya=Lohit Oriya +-dialoginput.bolditalic.punjabi=Lohit Punjabi +-dialoginput.bolditalic.tamil=Lohit Tamil +-dialoginput.bolditalic.telugu=Lohit Telugu +-dialoginput.bolditalic.sinhala=LKLUG - -# Search Sequences - @@ -17375,44 +17774,56 @@ -sequence.allfonts.x-euc-jp-bsd=japanese-x0208,latin-1 -sequence.allfonts.EUC-KR=korean,latin-1 -sequence.allfonts.GB18030=chinese-gb18030,latin-1 --sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean +-sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala - -# Font File Names - --filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf --filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf --filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf --filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf -- --filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf --filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf --filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf --filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf -- --filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf --filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf --filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf --filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf -- --filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf --filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf --filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/chinese/TrueType/uming.ttf --filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf --filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf --filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf ---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-03-27 11:09:14.000000000 -0700 +-filename.DejaVu_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf +-filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf +-filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf +-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf +- +-filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf +-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf +-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf +-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf +- +-filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf +-filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf +-filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf +-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf +- +-filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc +-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc +-filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf +- +-filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf +-filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf +-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 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 1969-12-31 16:00:00.000000000 -0800 @@ -1,154 +0,0 @@ -# -# --# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. +-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Sun designates this +-# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided --# by Sun in the LICENSE file that accompanied this code. +-# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -17424,9 +17835,9 @@ -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# --# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, --# CA 95054 USA or visit www.sun.com if you need additional information or --# have any questions. +-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +-# or visit www.oracle.com if you need additional information or have any +-# questions. -# - -# Version @@ -17557,19 +17968,19 @@ -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 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 1969-12-31 16:00:00.000000000 -0800 -@@ -1,151 +0,0 @@ +@@ -1,348 +0,0 @@ -# -# --# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved. +-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Sun designates this +-# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided --# by Sun in the LICENSE file that accompanied this code. +-# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -17581,113 +17992,260 @@ -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# --# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, --# CA 95054 USA or visit www.sun.com if you need additional information or --# have any questions. +-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +-# or visit www.oracle.com if you need additional information or have any +-# questions. -# - -# Version - --# Uses Ubuntu 6.10 (Edgy) fonts and file paths. +-# Uses Ubuntu 8.04 (hardy), Debian 6.0 (Squeeze) (and more recent releases) fonts and file paths. -version=1 - -# Component Font Mappings - --dialog.plain.latin-1=DejaVu Sans --dialog.plain.japanese-x0208=Kochi Gothic --dialog.plain.korean=Baekmuk Dotum +-# Chinese fonts +-allfonts.umingcn=AR PL UMing CN +-#allfonts.umingcn.motif=AR PL UMing CN +-allfonts.uminghk=AR PL UMing HK +-#allfonts.uminghk.motif=AR PL UMing HK +-allfonts.umingtw=AR PL UMing TW +-#allfonts.umingtw.motif=AR PL UMing TW +-allfonts.wqy-zenhei=WenQuanYi Zen Hei +-#allfonts.wqy-zenhei.motif=WenQuanYi Zen Hei +-allfonts.shanheisun=AR PL ShanHeiSun Uni +-#allfonts.shanheisun.motif=AR PL ShanHeiSun Uni +- +-# Indic scripts +-allfonts.bengali=Lohit Bengali +-allfonts.gujarati=Lohit Gujarati +-allfonts.hindi=Lohit Hindi +-#allfonts.malayalam=Lohit Malayalam +-allfonts.oriya=Lohit Oriya +-allfonts.punjabi=Lohit Punjabi +-allfonts.tamil=Lohit Tamil +-allfonts.telugu=Lohit Telugu +-allfonts.sinhala=LKLUG - --dialog.bold.latin-1=DejaVu Sans Bold --dialog.bold.japanese-x0208=Kochi Gothic --dialog.bold.korean=Baekmuk Dotum - --dialog.italic.latin-1=DejaVu Sans Oblique --dialog.italic.japanese-x0208=Kochi Gothic --dialog.italic.korean=Baekmuk Dotum +-serif.plain.latin-1=DejaVu Serif +-#serif.plain.latin-1.motif=LuxiSerif-Regular +-serif.plain.japanese-kochi=Kochi Mincho +-serif.plain.japanese-sazanami=Sazanami Mincho +-serif.plain.japanese-vlgothic=Sazanami Mincho +-serif.plain.korean-baekmuk=Baekmuk Batang +-#serif.plain.korean-baekmuk.motif=Baekmuk Batang +-serif.plain.korean-un=UnBatang +-#serif.plain.korean-un.motif=UnBatang - --dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique --dialog.bolditalic.japanese-x0208=Kochi Gothic --dialog.bolditalic.korean=Baekmuk Dotum +-serif.bold.latin-1=DejaVu Serif Bold +-#serif.bold.latin-1.motif=LuxiSerif-Bold +-serif.bold.japanese-kochi=Kochi Mincho +-serif.bold.japanese-sazanami=Sazanami Mincho +-serif.bold.japanese-vlgothic=Sazanami Mincho +-serif.bold.korean-baekmuk=Baekmuk Batang +-#serif.bold.korean-baekmuk.motif=Baekmuk Batang +-serif.bold.korean-un=UnBatang Bold +-#serif.bold.korean-un.motif=UnBatang Bold +- +-serif.italic.latin-1=DejaVu Serif Oblique +-#serif.italic.latin-1.motif=LuxiSerif-Oblique +-serif.italic.japanese-kochi=Kochi Mincho +-serif.italic.japanese-sazanami=Sazanami Mincho +-serif.italic.japanese-vlgothic=Sazanami Mincho +-serif.italic.korean-baekmuk=Baekmuk Batang +-#serif.italic.korean-baekmuk.motif=Baekmuk Batang +-serif.italic.korean-un=UnBatang +-#serif.italic.korean-un.motif=UnBatang - +-serif.bolditalic.latin-1=DejaVu Serif Bold Oblique +-#serif.bolditalic.latin-1.motif=LuxiSerif-BoldOblique +-serif.bolditalic.japanese-kochi=Kochi Mincho +-serif.bolditalic.japanese-sazanami=Sazanami Mincho +-serif.bolditalic.japanese-vlgothic=Sazanami Mincho +-serif.bolditalic.korean-baekmuk=Baekmuk Batang +-#serif.bolditalic.korean-baekmuk.motif=Baekmuk Batang +-serif.bolditalic.korean-un=UnBatang Bold +-#serif.bolditalic.korean-un.motif=UnBatang Bold - -sansserif.plain.latin-1=DejaVu Sans --sansserif.plain.japanese-x0208=Kochi Gothic --sansserif.plain.korean=Baekmuk Dotum +-#sansserif.plain.latin-1.motif=LuxiSans-Regular +-sansserif.plain.japanese-kochi=Kochi Gothic +-sansserif.plain.japanese-sazanami=Sazanami Gothic +-sansserif.plain.japanese-vlgothic=VL PGothic +-sansserif.plain.korean-baekmuk=Baekmuk Gulim +-#sansserif.plain.korean-baekmuk.motif=Baekmuk Gulim +-sansserif.plain.korean-un=UnDotum +-#sansserif.plain.korean-un.motif=UnDotum - -sansserif.bold.latin-1=DejaVu Sans Bold --sansserif.bold.japanese-x0208=Kochi Gothic --sansserif.bold.korean=Baekmuk Dotum +-#sansserif.bold.latin-1.motif=LuxiSans-Bold +-sansserif.bold.japanese-kochi=Kochi Gothic +-sansserif.bold.japanese-sazanami=Sazanami Gothic +-sansserif.bold.japanese-vlgothic=VL PGothic +-sansserif.bold.korean-baekmuk=Baekmuk Gulim +-#sansserif.bold.korean-baekmuk.motif=Baekmuk Gulim +-sansserif.bold.korean-un=UnDotum Bold +-#sansserif.bold.korean-un.motif=UnDotum Bold - -sansserif.italic.latin-1=DejaVu Sans Oblique --sansserif.italic.japanese-x0208=Kochi Gothic --sansserif.italic.korean=Baekmuk Dotum +-#sansserif.italic.latin-1.motif=LuxiSans-Oblique +-sansserif.italic.japanese-kochi=Kochi Gothic +-sansserif.italic.japanese-sazanami=Sazanami Gothic +-sansserif.italic.japanese-vlgothic=VL PGothic +-sansserif.italic.korean-baekmuk=Baekmuk Gulim +-#sansserif.italic.korean-baekmuk.motif=Baekmuk Gulim +-sansserif.italic.korean-un=UnDotum +-#sansserif.italic.korean-un.motif=UnDotum - -sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique --sansserif.bolditalic.japanese-x0208=Kochi Gothic --sansserif.bolditalic.korean=Baekmuk Dotum -- -- --serif.plain.latin-1=DejaVu Serif --serif.plain.japanese-x0208=Kochi Mincho --serif.plain.korean=Baekmuk Batang -- --serif.bold.latin-1=DejaVu Serif Bold --serif.bold.japanese-x0208=Kochi Mincho --serif.bold.korean=Baekmuk Batang -- --serif.italic.latin-1=DejaVu Serif Oblique --serif.italic.japanese-x0208=Kochi Mincho --serif.italic.korean=Baekmuk Batang -- --serif.bolditalic.latin-1=DejaVu Serif Bold Oblique --serif.bolditalic.japanese-x0208=Kochi Mincho --serif.bolditalic.korean=Baekmuk Batang -- +-#sansserif.bolditalic.latin-1.motif=LuxiSans-BoldOblique +-sansserif.bolditalic.japanese-kochi=Kochi Gothic +-sansserif.bolditalic.japanese-sazanami=Sazanami Gothic +-sansserif.bolditalic.japanese-vlgothic=VL PGothic +-sansserif.bolditalic.korean-baekmuk=Baekmuk Gulim +-#sansserif.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +-sansserif.bolditalic.korean-un=UnDotum Bold +-#sansserif.bolditalic.korean-un.motif=UnDotum Bold - -monospaced.plain.latin-1=DejaVu Sans Mono --monospaced.plain.japanese-x0208=Kochi Gothic --monospaced.plain.korean=Baekmuk Dotum +-#monospaced.plain.latin-1.motif=LuxiMono-Regular +-monospaced.plain.japanese-kochi=Kochi Gothic +-monospaced.plain.japanese-sazanami=Sazanami Gothic +-monospaced.plain.japanese-vlgothic=VL Gothic +-monospaced.plain.korean-baekmuk=Baekmuk Gulim +-#monospaced.plain.korean-baekmuk.motif=Baekmuk Gulim +-monospaced.plain.korean-un=UnDotum +-#monospaced.plain.korean-un.motif=UnDotum - -monospaced.bold.latin-1=DejaVu Sans Mono Bold --monospaced.bold.japanese-x0208=Kochi Gothic --monospaced.bold.korean=Baekmuk Dotum +-#monospaced.bold.latin-1.motif=LuxiMono-Bold +-monospaced.bold.japanese-kochi=Kochi Gothic +-monospaced.bold.japanese-sazanami=Sazanami Gothic +-monospaced.bold.japanese-vlgothic=VL Gothic +-monospaced.bold.korean-baekmuk=Baekmuk Gulim +-#monospaced.bold.korean-baekmuk.motif=Baekmuk Gulim +-monospaced.bold.korean-un=UnDotum Bold +-#monospaced.bold.korean-un.motif=UnDotum Bold - -monospaced.italic.latin-1=DejaVu Sans Mono Oblique --monospaced.italic.japanese-x0208=Kochi Gothic --monospaced.italic.korean=Baekmuk Dotum +-#monospaced.italic.latin-1.motif=LuxiMono-Oblique +-monospaced.italic.japanese-kochi=Kochi Gothic +-monospaced.italic.japanese-sazanami=Sazanami Gothic +-monospaced.italic.japanese-vlgothic=VL Gothic +-monospaced.italic.korean-baekmuk=Baekmuk Gulim +-#monospaced.italic.korean-baekmuk.motif=Baekmuk Gulim +-monospaced.italic.korean-un=UnDotum +-#monospaced.italic.korean-un.motif=UnDotum - -monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique --monospaced.bolditalic.japanese-x0208=Kochi Gothic --monospaced.bolditalic.korean=Baekmuk Dotum +-#monospaced.bolditalic.latin-1.motif=LuxiMono-BoldOblique +-monospaced.bolditalic.japanese-kochi=Kochi Gothic +-monospaced.bolditalic.japanese-sazanami=Sazanami Gothic +-monospaced.bolditalic.japanese-vlgothic=VL Gothic +-monospaced.bolditalic.korean-baekmuk=Baekmuk Gulim +-#monospaced.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +-monospaced.bolditalic.korean-un=UnDotum Bold +-#monospaced.bolditalic.korean-un.motif=UnDotum Bold +- +-dialog.plain.latin-1=DejaVu Sans +-#dialog.plain.latin-1.motif=LuxiSans-Regular +-dialog.plain.japanese-kochi=Kochi Gothic +-dialog.plain.japanese-sazanami=Sazanami Gothic +-dialog.plain.japanese-vlgothic=VL PGothic +-dialog.plain.korean-baekmuk=Baekmuk Gulim +-#dialog.plain.korean-baekmuk.motif=Baekmuk Gulim +-dialog.plain.korean-un=UnDotum +-#dialog.plain.korean-un.motif=UnDotum - +-dialog.bold.latin-1=DejaVu Sans Bold +-#dialog.bold.latin-1.motif=LuxiSans-Bold +-dialog.bold.japanese-kochi=Kochi Gothic +-dialog.bold.japanese-sazanami=Sazanami Gothic +-dialog.bold.japanese-vlgothic=VL PGothic +-dialog.bold.korean-baekmuk=Baekmuk Gulim +-#dialog.bold.korean-baekmuk.motif=Baekmuk Gulim +-dialog.bold.korean-un=UnDotum Bold +-#dialog.bold.korean-un.motif=UnDotum Bold +- +-dialog.italic.latin-1=DejaVu Sans Oblique +-#dialog.italic.latin-1.motif=LuxiSans-Oblique +-dialog.italic.japanese-kochi=Kochi Gothic +-dialog.italic.japanese-sazanami=Sazanami Gothic +-dialog.italic.japanese-vlgothic=VL PGothic +-dialog.italic.korean-baekmuk=Baekmuk Gulim +-#dialog.italic.korean-baekmuk.motif=Baekmuk Gulim +-dialog.italic.korean-un=UnDotum +-#dialog.italic.korean-un.motif=UnDotum +- +-dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique +-#dialog.bolditalic.latin-1.motif=LuxiSans-BoldOblique +-dialog.bolditalic.japanese-kochi=Kochi Gothic +-dialog.bolditalic.japanese-sazanami=Sazanami Gothic +-dialog.bolditalic.japanese-vlgothic=VL PGothic +-dialog.bolditalic.korean-baekmuk=Baekmuk Gulim +-#dialog.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +-dialog.bolditalic.korean-un=UnDotum Bold +-#dialog.bolditalic.korean-un.motif=UnDotum Bold - -dialoginput.plain.latin-1=DejaVu Sans Mono --dialoginput.plain.japanese-x0208=Kochi Gothic --dialoginput.plain.korean=Baekmuk Dotum +-#dialoginput.plain.latin-1.motif=LuxiMono-Regular +-dialoginput.plain.japanese-kochi=Kochi Gothic +-dialoginput.plain.japanese-sazanami=Sazanami Gothic +-dialoginput.plain.japanese-vlgothic=VL Gothic +-dialoginput.plain.korean-baekmuk=Baekmuk Gulim +-#dialoginput.plain.korean-baekmuk.motif=Baekmuk Gulim +-dialoginput.plain.korean-un=UnDotum +-#dialoginput.plain.korean-un.motif=UnDotum - -dialoginput.bold.latin-1=DejaVu Sans Mono Bold --dialoginput.bold.japanese-x0208=Kochi Gothic --dialoginput.bold.korean=Baekmuk Dotum +-#dialoginput.bold.latin-1.motif=LuxiMono-Bold +-dialoginput.bold.japanese-kochi=Kochi Gothic +-dialoginput.bold.japanese-sazanami=Sazanami Gothic +-dialoginput.bold.japanese-vlgothic=VL Gothic +-dialoginput.bold.korean-baekmuk=Baekmuk Gulim +-#dialoginput.bold.korean-baekmuk.motif=Baekmuk Gulim +-dialoginput.bold.korean-un=UnDotum Bold +-#dialoginput.bold.korean-un.motif=UnDotum Bold - -dialoginput.italic.latin-1=DejaVu Sans Mono Oblique --dialoginput.italic.japanese-x0208=Kochi Gothic --dialoginput.italic.korean=Baekmuk Dotum +-#dialoginput.italic.latin-1.motif=LuxiMono-Oblique +-dialoginput.italic.japanese-kochi=Kochi Gothic +-dialoginput.italic.japanese-sazanami=Sazanami Gothic +-dialoginput.italic.japanese-vlgothic=VL Gothic +-dialoginput.italic.korean-baekmuk=Baekmuk Gulim +-#dialoginput.italic.korean-baekmuk.motif=Baekmuk Gulim +-dialoginput.italic.korean-un=UnDotum +-#dialoginput.italic.korean-un.motif=UnDotum - -dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique --dialoginput.bolditalic.japanese-x0208=Kochi Gothic --dialoginput.bolditalic.korean=Baekmuk Dotum -- --allfonts.chinese-big5=AR PL ZenKai Uni --allfonts.chinese-gb18030=AR PL ZenKai Uni +-#dialoginput.bolditalic.latin-1.motif=LuxiMono-BoldOblique +-dialoginput.bolditalic.japanese-kochi=Kochi Gothic +-dialoginput.bolditalic.japanese-sazanami=Sazanami Gothic +-dialoginput.bolditalic.japanese-vlgothic=VL Gothic +-dialoginput.bolditalic.korean-baekmuk=Baekmuk Gulim +-#dialoginput.bolditalic.korean-baekmuk.motif=Baekmuk Gulim +-dialoginput.bolditalic.korean-un=UnDotum Bold +-#dialoginput.bolditalic.korean-un.motif=UnDotum Bold - -# Search Sequences - -sequence.allfonts=latin-1 --sequence.allfonts.Big5=chinese-big5,latin-1 --sequence.allfonts.x-euc-jp-bsd=japanese-x0208,latin-1 --sequence.allfonts.EUC-KR=korean,latin-1 --sequence.allfonts.GB18030=chinese-gb18030,latin-1 --sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean +-sequence.allfonts.GB18030=latin-1,umingcn,shanheisun,wqy-zenhei +-sequence.allfonts.GB2312=latin-1,umingcn,shanheisun,wqy-zenhei +-sequence.allfonts.GBK=latin-1,umingcn,shanheisun,wqy-zenhei +-sequence.allfonts.x-euc-jp-bsd=latin-1,japanese-vlgothic,japanese-sazanami,japanese-kochi +-sequence.allfonts.EUC-KR=latin-1,korean-un,korean-baekmuk +-sequence.allfonts.Big5=latin-1,umingtw,shanheisun,wqy-zenhei +-sequence.allfonts.Big5-HKSCS=latin-1,uminghk,shanheisun,wqy-zenhei +-#sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-kochi,japanese-sazanami,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala +-sequence.fallback=uminghk,shanheisun,wqy-zenhei,japanese-vlgothic,japanese-sazanami,japanese-kochi,korean-un,korean-baekmuk,bengali,gujarati,hindi,oriya,punjabi,tamil,telugu +- +-# Exclusion Ranges +- +-exclusion.japanese-kochi=0390-03d6,2200-22ef,2701-27be +-exclusion.japanese-sazanami=0390-03d6,2200-22ef,2701-27be +-exclusion.japanese-vlgothic=0390-03d6,2200-22ef,2701-27be - -# Font File Names - @@ -17706,23 +18264,73 @@ -filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf -filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf - --filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf --filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf --filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf --filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf +-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf +- +-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf -filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf ---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-03-27 11:09:14.000000000 -0700 +-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf +-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf +-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf +-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf +-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf +-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf +-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf +- +-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf +-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf +-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf +- +-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf +-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf +-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf +-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf +-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf +-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf +-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf +-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf +-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf +-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf +-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf +-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf +- +-# AWT X11 font paths +-awtfontpath.latin-1=/usr/share/fonts/X11/Type1 +-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic +-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic +-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic +-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic +-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy +-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi +-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami +-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 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,99 +0,0 @@ -/* -- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -17734,9 +18342,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -package sun.nio.ch; @@ -17813,18 +18421,18 @@ - return new SimpleAsynchronousDatagramChannelImpl(family, toPort(group)); - } -} ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,288 +0,0 @@ -/* -- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -17836,9 +18444,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -package sun.nio.fs; @@ -18104,8 +18712,8 @@ - } - } -} ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-01-30 09:28:32.000000000 -0800 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-07-11 09:13:55.000000000 -0700 @@ -36,10 +36,6 @@ class BsdFileStore extends UnixFileStore @@ -18184,8 +18792,8 @@ return super.supportsFileAttributeView(name); } ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-01-30 09:28:32.000000000 -0800 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-07-11 09:13:55.000000000 -0700 @@ -31,49 +31,23 @@ import java.util.*; import java.security.AccessController; @@ -18318,15 +18926,8 @@ @Override FileStore getFileStore(UnixPath path) throws IOException { return new BsdFileStore(path); ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-01-30 09:28:32.000000000 -0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-07-11 09:13:55.000000000 -0700 @@ -36,84 +36,23 @@ private BsdNativeDispatcher() { } @@ -18430,18 +19031,18 @@ + initIDs(); } } ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,350 +0,0 @@ -/* -- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18453,9 +19054,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -package sun.nio.fs; @@ -18783,18 +19384,18 @@ - } - } -} ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,466 +0,0 @@ -/* -- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -18806,9 +19407,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -package sun.nio.fs; @@ -19252,8 +19853,8 @@ - init(); - } -} ---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-03-18 01:45:34.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-01-30 09:28:32.000000000 -0800 +--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-07-09 01:52:41.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-07-11 09:13:55.000000000 -0700 @@ -68,6 +68,8 @@ return createProvider("sun.nio.fs.SolarisFileSystemProvider"); if (osname.equals("Linux")) @@ -19263,8 +19864,8 @@ throw new AssertionError("Platform not recognized"); } } ---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-03-18 01:45:34.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-01-30 09:28:32.000000000 -0800 +--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-07-09 01:52:41.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-07-11 09:13:56.000000000 -0700 @@ -119,7 +119,11 @@ } @@ -19298,11 +19899,11 @@ String[] names = execCmd(command); if ((names == null) || (names.length == 0)) { ---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-01-30 09:28:32.000000000 -0800 -@@ -38,9 +38,6 @@ - */ - public class BsdVirtualMachine extends HotSpotVirtualMachine { +--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-07-11 09:13:56.000000000 -0700 +@@ -40,9 +40,6 @@ + // temp directory for socket file + private static final String tmpdir = System.getProperty("java.io.tmpdir"); - // Indicates if this machine uses the old BsdThreads - static boolean isBsdThreads; @@ -19310,12 +19911,12 @@ // The patch to the socket file created by the target VM String path; -@@ -65,25 +62,10 @@ +@@ -67,25 +64,10 @@ // Then we attempt to find the socket file again. path = findSocketFile(pid); if (path == null) { - File f = createAttachFile(pid); -+ File f = new File("/tmp/.attach_pid" + pid); ++ File f = new File(tmpdir, ".attach_pid" + pid); + createAttachFile(f.getPath()); try { - // On BsdThreads each thread is a process and we don't have the @@ -19339,29 +19940,24 @@ // give the target VM time to start the attach mechanism int i = 0; -@@ -265,37 +247,14 @@ +@@ -267,31 +249,8 @@ // First check for a .java_pid<pid> file in the working directory // of the target process String fn = ".java_pid" + pid; - String path = "/proc/" + pid + "/cwd/" + fn; -+ String path = "/tmp/" + fn; - File f = new File(path); - if (!f.exists()) { -- // Not found, so try /tmp -- path = "/tmp/" + fn; -- f = new File(path); -- if (!f.exists()) { -- return null; // not found -- } -+ return null; // not found - } - return path; - } - +- File f = new File(path); +- if (!f.exists()) { +- // Not found, so try temp directory +- f = new File(tmpdir, fn); +- path = f.exists() ? f.getPath() : null; +- } +- return path; +- } +- - // On Solaris/Bsd a simple handshake is used to start the attach mechanism - // if not already started. The client creates a .attach_pid<pid> file in the -- // target VM's working directory (or /tmp), and the SIGQUIT handler checks -- // for the file. +- // target VM's working directory (or temp directory), and the SIGQUIT handler +- // checks for the file. - private File createAttachFile(int pid) throws IOException { - String fn = ".attach_pid" + pid; - String path = "/proc/" + pid + "/cwd/" + fn; @@ -19369,17 +19965,16 @@ - try { - f.createNewFile(); - } catch (IOException x) { -- path = "/tmp/" + fn; -- f = new File(path); +- f = new File(tmpdir, fn); - f.createNewFile(); - } - return f; -- } -- ++ File f = new File(tmpdir, path); ++ return f.exists() ? f.getPath() : null; + } + /* - * Write/sends the given to the target VM. String is transmitted in - * UTF-8 encoding. -@@ -318,12 +277,6 @@ +@@ -316,12 +275,6 @@ //-- native methods @@ -19392,7 +19987,7 @@ static native void sendQuitTo(int pid) throws IOException; static native void checkPermissions(String path) throws IOException; -@@ -338,8 +291,9 @@ +@@ -336,8 +289,9 @@ static native void write(int fd, byte buf[], int off, int bufLen) throws IOException; @@ -19403,8 +19998,8 @@ - isBsdThreads = isBsdThreads(); } } ---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-03-18 01:45:34.000000000 -0700 -+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-01-30 09:28:32.000000000 -0800 +--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-07-09 01:52:41.000000000 -0700 ++++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -33,7 +33,7 @@ #include <sys/stat.h> #include <fcntl.h> @@ -19470,8 +20065,8 @@ } } ---- ./jdk/src/solaris/hpi/include/interrupt.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/include/interrupt.h 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-07-11 09:13:56.000000000 -0700 @@ -75,7 +75,7 @@ * N_INTERRUPTS - The number of interrupt channels. These * are numbered from 0 to (N_INTERRUPTS - 1). @@ -19492,8 +20087,8 @@ #ifdef SA_SIGINFO /* Thread implementation dependent interrupt dispatcher. */ void intrDispatchMD(int sig, siginfo_t *info, void *uc); ---- ./jdk/src/solaris/hpi/include/largefile.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/include/largefile.h 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/include/largefile.h 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/include/largefile.h 2010-07-11 09:13:56.000000000 -0700 @@ -34,6 +34,10 @@ #include "largefile_linux.h" #endif @@ -19505,8 +20100,8 @@ /* * Prototypes for wrappers that we define. These wrapper functions * are low-level I/O routines that will use 64 bit versions if ---- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-07-11 09:13:56.000000000 -0700 @@ -26,11 +26,29 @@ #ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ #define _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ @@ -19541,8 +20136,8 @@ +#define pwrite64 pwrite + #endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */ ---- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-07-11 09:13:56.000000000 -0700 @@ -36,6 +36,8 @@ #define N_TRACED_REGS 12 #elif i386 @@ -19589,8 +20184,8 @@ #ifdef __linux__ extern thread_key_t intrJmpbufkey; ---- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -58,7 +58,7 @@ { int err; @@ -19600,8 +20195,8 @@ err = pthread_cond_destroy((cond_t *) &condvar->cond); #else err = cond_destroy((cond_t *) condvar); ---- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -147,7 +147,7 @@ mid->monitor_owner = self; mid->entry_count = 1; @@ -19611,17 +20206,10 @@ if (mid->monitor_owner == self) { mid->entry_count++; return SYS_OK; ---- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-03-27 11:09:14.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-01-30 09:28:33.000000000 -0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it +--- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-07-11 09:13:56.000000000 -0700 @@ -23,389 +23,381 @@ - * have any questions. + * questions. */ -/* @@ -20076,9 +20664,7 @@ + break; + } + } - -- *addr = (void *)(((unsigned long)sp | (STACK_SIZE-1))+1) - 1; -- *size = STACK_SIZE; ++ + /* If the thread wasn't previously suspended, suspend it now and set the change flag */ + if (found) { + /* Don't suspend ourselves! */ @@ -20102,7 +20688,9 @@ + /* Deallocate the last-allocated list. */ + for (i = 0; i < prev_count; i++) + mach_port_deallocate(self, prev_list[i]); -+ + +- *addr = (void *)(((unsigned long)sp | (STACK_SIZE-1))+1) - 1; +- *size = STACK_SIZE; + vm_deallocate(self, (vm_address_t)prev_list, sizeof(thread_t) * prev_count); + /* Record registers and return */ @@ -20183,7 +20771,7 @@ + mach_port_t self; + + self = pthread_mach_thread_np(pthread_self()); -+ + + /* Get a list of all threads. This has to succeed! */ + if (task_threads(self, &thr_list, &thr_count) != KERN_SUCCESS) + abort(); @@ -20192,7 +20780,7 @@ + for (i = 0; i < thr_count; i++) { + // XXXDARWIN: Assumes that the current thread was the thread used + // to call np_single. Is that true? - ++ + if (thr_list[i] != self) + thread_resume(thr_list[i]); + @@ -20305,8 +20893,8 @@ + pthread_attr_destroy(&attr); +#endif } ---- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -54,6 +54,10 @@ #error That can NOT possibly be right. #endif @@ -20388,8 +20976,8 @@ info.isMP = (cpus < 0) ? 1 : (cpus > 1); info.name = "native threads"; ---- ./jdk/src/solaris/hpi/src/linker_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/src/linker_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -44,11 +44,19 @@ #include "threads_md.h" #endif @@ -20456,8 +21044,8 @@ #endif /* * This is a bit of bulletproofing to catch the commonly occurring ---- ./jdk/src/solaris/hpi/src/memory_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/src/memory_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -50,12 +50,24 @@ #include <stdlib.h> #include <stdio.h> /* For perror() */ @@ -20547,8 +21135,8 @@ ret = committedAddr; #else ret = requestedAddr; ---- ./jdk/src/solaris/hpi/src/system_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/hpi/src/system_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/hpi/src/system_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/hpi/src/system_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -41,6 +41,7 @@ #include <dlfcn.h> @@ -20602,8 +21190,8 @@ fd = open64_w(path, oflag, mode); if (delete != 0) { unlink(path); ---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -28,7 +28,10 @@ #include <string.h> #include <ctype.h> @@ -20633,8 +21221,8 @@ /* Open conversion descriptors */ iconvToPlatform = iconv_open(codeset, "UTF-8"); ---- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-07-11 09:13:56.000000000 -0700 @@ -41,7 +41,14 @@ #define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"} @@ -20659,8 +21247,8 @@ /* Signals */ ---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-07-11 09:13:56.000000000 -0700 @@ -32,10 +32,16 @@ #include <sys/types.h> @@ -20823,18 +21411,18 @@ } JNIEXPORT jlong JNICALL ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,180 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -20846,9 +21434,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -//#define USE_ERROR @@ -21006,18 +21594,18 @@ - - -/* end */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,82 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21029,9 +21617,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -#include <alsa/asoundlib.h> @@ -21091,18 +21679,18 @@ - - -#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,322 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21114,9 +21702,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -#define USE_ERROR @@ -21416,18 +22004,18 @@ -} - -#endif /* USE_PLATFORM_MIDI_IN */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,179 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21439,9 +22027,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -#define USE_ERROR @@ -21598,18 +22186,18 @@ - - -#endif /* USE_PLATFORM_MIDI_OUT */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,480 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21621,9 +22209,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -#define USE_ERROR @@ -22081,18 +22669,18 @@ - - -/* end */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,85 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -22104,9 +22692,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -#include <alsa/asoundlib.h> @@ -22169,18 +22757,18 @@ -INT64 getMidiTimestamp(MidiDeviceHandle* handle); - -#endif // PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,938 +0,0 @@ -/* -- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -22192,9 +22780,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -#define USE_ERROR @@ -23110,18 +23698,18 @@ - - -#endif // USE_DAUDIO ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-03-27 11:09:14.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,291 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -23133,9 +23721,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -//#define USE_ERROR @@ -23404,18 +23992,18 @@ - - -/* end */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-03-27 11:09:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,72 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -23427,9 +24015,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -// define this with a later version of ALSA than 0.9.0rc3 @@ -23479,18 +24067,18 @@ - int isSigned, int isBigEndian, int enc); - -#endif // PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-03-27 11:09:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,723 +0,0 @@ -/* -- * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -23502,9 +24090,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -#define USE_ERROR @@ -24205,8 +24793,8 @@ - - -#endif // USE_PORTS ---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-03-20 17:09:44.000000000 -0700 +--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-07-11 09:13:57.000000000 -0700 @@ -41,6 +41,12 @@ #include "java_io_FileSystem.h" #include "java_io_UnixFileSystem.h" @@ -24228,8 +24816,8 @@ JNIEXPORT jboolean JNICALL Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this, jobject file, ---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-07-11 09:13:57.000000000 -0700 @@ -33,7 +33,9 @@ #include <sys/stat.h> #include <errno.h> @@ -24240,8 +24828,8 @@ /* Note: The comments in this file use the terminology ---- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-07-11 09:13:57.000000000 -0700 @@ -36,7 +36,7 @@ WITH_PLATFORM_STRING(env, path, ps) { FD fd; @@ -24251,8 +24839,8 @@ /* 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 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-07-11 09:13:57.000000000 -0700 @@ -28,6 +28,11 @@ #include "jni.h" #include "jni_util.h" @@ -24293,8 +24881,8 @@ jbyteArray var, val; const char * valBeg = varEnd + 1; jsize varLength = varEnd - environ[i]; ---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-07-11 09:13:57.000000000 -0700 @@ -40,7 +40,11 @@ #include <stdlib.h> #include <sys/types.h> @@ -24397,10 +24985,10 @@ if (envp == NULL || (char **) envp == environ) { execvp(file, (char **) argv); return; ---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-07-11 09:13:57.000000000 -0700 @@ -23,7 +23,7 @@ - * have any questions. + * questions. */ -#ifdef __linux__ @@ -24498,8 +25086,8 @@ #ifdef __linux__ /* * Remap the encoding string to a different value for japanese -@@ -355,11 +380,19 @@ - std_encoding = "Big5_Solaris"; +@@ -357,11 +382,19 @@ + std_encoding = "Big5-HKSCS-2001"; } #endif +#endif /* !_ALLBSD_SOURCE */ @@ -24518,7 +25106,7 @@ #ifdef __linux__ #if __BYTE_ORDER == __LITTLE_ENDIAN sprops.unicode_encoding = "UnicodeLittle"; -@@ -369,6 +402,7 @@ +@@ -371,6 +404,7 @@ #else sprops.unicode_encoding = "UnicodeBig"; #endif @@ -24526,7 +25114,7 @@ /* user properties */ { -@@ -405,12 +439,14 @@ +@@ -407,12 +441,14 @@ sprops.path_separator = ":"; sprops.line_separator = "\n"; @@ -24541,8 +25129,8 @@ return &sprops; } ---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-02-21 16:57:14.000000000 -0800 +--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-07-11 09:13:57.000000000 -0700 @@ -36,12 +36,288 @@ #include <stdlib.h> #include <ctype.h> @@ -24893,8 +25481,8 @@ #define SET_NONBLOCKING(fd) { \ int flags = fcntl(fd, F_GETFL); \ flags |= O_NONBLOCK; \ ---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-02-21 16:57:25.000000000 -0800 +--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-07-11 09:13:57.000000000 -0700 @@ -33,6 +33,9 @@ #include <strings.h> #include <stdlib.h> @@ -24935,10 +25523,10 @@ } return (*env)->NewStringUTF(env, hostname); } ---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-02-19 08:02:42.000000000 -0800 +--- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-07-11 09:13:57.000000000 -0700 @@ -23,13 +23,13 @@ - * have any questions. + * questions. */ +#include <sys/types.h> @@ -25215,10 +25803,10 @@ memset((char *) &if2, 0, sizeof(if2)); strcpy(if2.ifr_name, name_utf); ---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-02-21 16:57:45.000000000 -0800 +--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-07-11 09:13:57.000000000 -0700 @@ -23,12 +23,12 @@ - * have any questions. + * questions. */ +#include <sys/types.h> @@ -25332,8 +25920,8 @@ } } } ---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-07-11 09:13:57.000000000 -0700 @@ -467,9 +467,11 @@ if (connect_rv == JVM_IO_INTR) { JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException", @@ -25355,8 +25943,8 @@ int port; jobject iaObj; jclass iaCntrClass; ---- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-03-27 11:09:15.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-01-30 09:28:33.000000000 -0800 +--- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-07-11 09:13:57.000000000 -0700 @@ -57,7 +57,7 @@ /* * Signal to unblock thread @@ -25392,8 +25980,8 @@ } int NET_Connect(int s, struct sockaddr *addr, int addrlen) { ---- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-02-19 08:02:42.000000000 -0800 +--- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-07-11 09:13:57.000000000 -0700 @@ -34,6 +34,15 @@ #include <stdlib.h> #include <dlfcn.h> @@ -25593,8 +26181,8 @@ len = sizeof(arg); if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg, ---- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-02-19 08:02:42.000000000 -0800 +--- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-07-11 09:13:57.000000000 -0700 @@ -37,7 +37,7 @@ #endif @@ -25604,8 +26192,8 @@ 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/nio/MappedByteBuffer.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-07-11 09:13:57.000000000 -0700 @@ -38,7 +38,11 @@ jlong address, jlong len) { @@ -25630,8 +26218,8 @@ unsigned long lAddress = address; jlong offset = lAddress % pageSize; ---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-07-11 09:13:57.000000000 -0700 @@ -47,8 +47,11 @@ return (jint) result; } @@ -25669,8 +26257,8 @@ if (rc < 0) { close(fd); ---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-07-11 09:13:57.000000000 -0700 @@ -31,7 +31,7 @@ #include <errno.h> #include <stddef.h> @@ -25807,8 +26395,8 @@ 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 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-07-11 09:13:57.000000000 -0700 @@ -25,6 +25,7 @@ #include <jni.h> @@ -25831,8 +26419,8 @@ if (handle == NULL) { return JNI_FALSE; } ---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-07-11 09:13:57.000000000 -0700 @@ -31,7 +31,11 @@ #endif /* !HEADLESS */ @@ -25845,8 +26433,8 @@ #ifdef __linux__ /* XXX: Shouldn't be necessary. */ ---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-07-11 09:13:57.000000000 -0700 @@ -33,7 +33,9 @@ #include <math.h> #include <sys/time.h> @@ -25857,8 +26445,8 @@ #ifndef HEADLESS #include <X11/Xlib.h> #include <X11/Xatom.h> ---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-07-11 09:13:57.000000000 -0700 @@ -31,7 +31,11 @@ #include <Xm/XmP.h> @@ -25871,8 +26459,8 @@ #ifdef DEBUG #include <jvm.h> /* To get jio_fprintf() */ ---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-07-11 09:13:57.000000000 -0700 @@ -334,7 +334,7 @@ if (strcmp(style, "regular") == 0) { altstyle = "roman"; @@ -25882,8 +26470,8 @@ if (!strcmp(family, "lucidasans")) { family = "lucida"; } ---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-07-11 09:13:57.000000000 -0700 @@ -40,6 +40,7 @@ #include <jni.h> #include <jni_util.h> @@ -26011,8 +26599,8 @@ if (pLibRandR == NULL) { J2dRlsTraceLn(J2D_TRACE_ERROR, "X11GD_InitXrandrFuncs: Could not open libXrandr.so.2"); ---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-07-11 09:13:57.000000000 -0700 @@ -69,7 +69,7 @@ XIMPreeditDrawCallbackStruct *); static void PreeditCaretCallback(XIC, XPointer, @@ -26252,8 +26840,8 @@ AWT_LOCK(); adjustStatusWindow(window); AWT_UNLOCK(); ---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-07-11 09:13:57.000000000 -0700 @@ -143,7 +143,11 @@ (*env)->DeleteLocalRef(env, propname); } @@ -26266,8 +26854,8 @@ JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load", "(Ljava/lang/String;)V", ---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-07-11 09:13:57.000000000 -0700 @@ -63,8 +63,9 @@ extern JavaVM *jvm; @@ -26288,8 +26876,8 @@ statusWindowEventHandler(xev); #endif xembed_eventHandler(&xev); ---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-07-11 09:13:57.000000000 -0700 @@ -32,6 +32,7 @@ #include <dlfcn.h> #include "jni.h" @@ -26312,8 +26900,8 @@ } if (handle == NULL) { ---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-07-11 09:13:57.000000000 -0700 @@ -45,7 +45,7 @@ #include "wsutils.h" #include "list.h" @@ -26323,8 +26911,8 @@ #include <sys/socket.h> #endif ---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-07-11 09:13:57.000000000 -0700 @@ -187,15 +187,20 @@ #ifdef __solaris__ extern Widget awt_util_getXICStatusAreaWindow(Widget w); @@ -26347,8 +26935,8 @@ 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 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-07-11 09:13:57.000000000 -0700 @@ -121,12 +121,19 @@ static Atom XA_KWM_WIN_MAXIMIZED; @@ -26446,8 +27034,8 @@ awt_wmgr = OPENLOOK_WM; } else { ---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-07-11 09:13:57.000000000 -0700 @@ -45,7 +45,10 @@ KDE2_WM, SAWFISH_WM, @@ -26460,8 +27048,8 @@ }; extern void awt_wm_init(void); ---- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-07-11 09:13:57.000000000 -0700 @@ -58,7 +58,7 @@ */ /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ @@ -26477,10 +27065,10 @@ -#endif /* __linux__ */ +#endif /* __linux__ || _ALLBSD_SOURCE */ ---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-07-11 09:13:57.000000000 -0700 @@ -23,7 +23,7 @@ - * have any questions. + * questions. */ -#ifdef __linux__ @@ -26636,21 +27224,24 @@ if (libfontconfig == NULL) { return NULL; } ---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-01-30 09:28:34.000000000 -0800 -@@ -30,8 +30,10 @@ +--- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-07-11 09:13:57.000000000 -0700 +@@ -30,9 +30,12 @@ #include <string.h> #include "gtk2_interface.h" #include "java_awt_Transparency.h" +#include "jvm_md.h" -#define GTK2_LIB "libgtk-x11-2.0.so.0" +-#define GTHREAD_LIB "libgthread-2.0.so.0" +#define GTK2_LIB_VERSIONED VERSIONED_JNI_LIB_NAME("gtk-x11-2.0", "0") +#define GTK2_LIB JNI_LIB_NAME("gtk-x11-2.0") ++#define GTHREAD_LIB_VERSIONED VERSIONED_JNI_LIB_NAME("gthread-2.0", "0") ++#define GTHREAD_LIB JNI_LIB_NAME("gthread-2.0") #define G_TYPE_INVALID G_TYPE_MAKE_FUNDAMENTAL (0) #define G_TYPE_NONE G_TYPE_MAKE_FUNDAMENTAL (1) -@@ -397,9 +399,12 @@ +@@ -404,9 +407,12 @@ void *lib = NULL; gboolean result = FALSE; @@ -26665,13 +27256,12 @@ } fp_gtk_check_version = dlsym(lib, "gtk_check_version"); -@@ -422,9 +427,12 @@ +@@ -458,11 +464,19 @@ int (*io_handler)(); char *gtk_modules_env; - gtk2_libhandle = dlopen(GTK2_LIB, RTLD_LAZY | RTLD_LOCAL); -- if (gtk2_libhandle == NULL) -- return FALSE; +- gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL); + gtk2_libhandle = dlopen(GTK2_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL); + if (gtk2_libhandle == NULL) { + gtk2_libhandle = dlopen(GTK2_LIB, RTLD_LAZY | RTLD_LOCAL); @@ -26679,10 +27269,19 @@ + return FALSE; + } +- if (gtk2_libhandle == NULL || gthread_libhandle == NULL) +- return FALSE; ++ gthread_libhandle = dlopen(GTHREAD_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL); ++ if (gthread_libhandle == NULL) { ++ gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL); ++ if (gthread_libhandle == NULL) ++ return FALSE; ++ } + if (setjmp(j) == 0) { ---- ./jdk/src/solaris/native/sun/awt/list.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/list.c 2010-01-30 09:28:34.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/list.c 2010-07-09 01:52:42.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/list.c 2010-07-11 09:13:57.000000000 -0700 @@ -66,7 +66,11 @@ ----------------------------------------------------------------------- **/ @@ -26695,8 +27294,8 @@ #include "list.h" ---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-07-11 09:13:58.000000000 -0700 @@ -27,6 +27,9 @@ #error This file should not be included in headless library #endif @@ -26707,8 +27306,8 @@ #include "robot_common.h" /* ---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-07-11 09:13:58.000000000 -0700 @@ -32,7 +32,11 @@ * into X11FontScaler_md.c, which is compiled into another library. */ @@ -26721,8 +27320,8 @@ #include <ctype.h> #include <sys/utsname.h> ---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-07-11 09:13:58.000000000 -0700 @@ -39,7 +39,11 @@ #include "GraphicsPrimitiveMgr.h" #include "glyphblitting.h" @@ -26735,8 +27334,8 @@ JNIEXPORT void JNICALL AWTDrawGlyphList ---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-07-11 09:13:58.000000000 -0700 @@ -28,11 +28,11 @@ #include <sys/types.h> @@ -26752,8 +27351,8 @@ typedef unsigned char jubyte; typedef unsigned short jushort; ---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-07-11 09:13:58.000000000 -0700 @@ -63,6 +63,10 @@ * MLIB_EDGE_SRC_PADDED */ @@ -26859,8 +27458,8 @@ LOGIC(da[0], dtmp, dtmp1, |); } else { /* aligned */ ---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-03-18 01:45:35.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-07-11 09:13:58.000000000 -0700 @@ -794,7 +794,7 @@ static int initialized; static int usevis = JNI_TRUE; @@ -26870,8 +27469,8 @@ # define ULTRA_CHIP "sparc64" #else # define ULTRA_CHIP "sun4u" ---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-07-11 09:13:58.000000000 -0700 @@ -27,7 +27,10 @@ #define OGLFuncs_md_h_Included @@ -26892,8 +27491,8 @@ } \ OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \ } \ ---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-07-11 09:13:58.000000000 -0700 @@ -32,6 +32,7 @@ #include "gdefs.h" @@ -26902,17 +27501,17 @@ #include "awt_Component.h" #include "awt_GraphicsEnv.h" -@@ -128,7 +129,7 @@ +@@ -163,7 +164,7 @@ if (tryDGA && (getenv("NO_J2D_DGA") == NULL)) { /* we use RTLD_NOW because of bug 4032715 */ - lib = dlopen("libsunwjdga.so", RTLD_NOW); + lib = dlopen(JNI_LIB_NAME("sunwjdga"), RTLD_NOW); } - dgaAvailable = JNI_FALSE; + if (lib != NULL) { ---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-07-11 09:13:58.000000000 -0700 @@ -44,6 +44,7 @@ #include <X11/Xlib.h> @@ -26935,8 +27534,8 @@ void *sym = dlsym(handle, "IsXineramaOn"); IsXineramaOn = (IsXineramaOnFunc *)sym; if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) { ---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-07-11 09:13:58.000000000 -0700 @@ -26,6 +26,10 @@ #include <sys/types.h> #include <sys/stat.h> @@ -26948,8 +27547,8 @@ #include "jni.h" #include "jni_util.h" #include "sun_management_FileSystemImpl.h" ---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-07-11 09:13:58.000000000 -0700 @@ -33,7 +33,7 @@ #include <strings.h> #endif @@ -26959,8 +27558,8 @@ #include <string.h> #endif ---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-03-08 21:38:22.000000000 -0800 +--- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-07-11 09:13:58.000000000 -0700 @@ -26,11 +26,12 @@ #include "jni.h" #include "jni_util.h" @@ -26987,8 +27586,8 @@ gconf_ver = 2; } if (gconf_ver > 0) { ---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-07-11 09:13:58.000000000 -0700 @@ -35,7 +35,7 @@ #include <string.h> #include <errno.h> @@ -27038,8 +27637,8 @@ } #endif ---- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-02-06 09:58:52.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-07-11 09:13:58.000000000 -0700 @@ -73,7 +73,7 @@ m.msg_accrightslen = 0; #endif @@ -27058,8 +27657,8 @@ m.msg_control = NULL; m.msg_controllen = 0; #endif ---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-03-25 23:55:51.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-07-11 09:13:58.000000000 -0700 @@ -26,15 +26,21 @@ #include "jni.h" #include "jni_util.h" @@ -27175,8 +27774,8 @@ +#endif +#endif } ---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-07-11 09:13:58.000000000 -0700 @@ -33,9 +33,13 @@ #include <sys/socket.h> #include <fcntl.h> @@ -27215,8 +27814,8 @@ if (lockResult < 0) { JNU_ThrowIOExceptionWithLastError(env, "Release failed"); } ---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-07-11 09:13:58.000000000 -0700 @@ -30,6 +30,10 @@ #include "nio_util.h" #include "sun_nio_ch_FileKey.h" @@ -27228,8 +27827,8 @@ 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 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-02-19 08:02:42.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-07-11 09:13:58.000000000 -0700 @@ -116,6 +116,47 @@ #endif /* __linux__ */ @@ -27408,8 +28007,8 @@ case ECONNREFUSED: xn = JNU_JAVANETPKG "ConnectException"; break; ---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-07-11 09:13:58.000000000 -0700 @@ -67,7 +67,7 @@ @@ -27458,8 +28057,8 @@ jboolean loadSocketExtensionFuncs(JNIEnv* env); #endif /* !SUN_NIO_CH_SCTP_H */ ---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-07-11 09:13:58.000000000 -0700 @@ -337,11 +337,11 @@ break; case SCTP_ADDR_MADE_PRIM : @@ -27474,8 +28073,8 @@ } addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr); ---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-02-19 08:02:42.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-07-11 09:13:58.000000000 -0700 @@ -58,6 +58,7 @@ */ jboolean loadSocketExtensionFuncs @@ -27492,15 +28091,8 @@ funcsLoaded = JNI_TRUE; return JNI_TRUE; ---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-03-27 11:09:15.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-01-30 09:28:35.000000000 -0800 -@@ -1,5 +1,5 @@ - /* -- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it +--- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-07-11 09:13:58.000000000 -0700 @@ -28,23 +28,35 @@ #include "jvm.h" #include "jlong.h" @@ -27781,18 +28373,18 @@ + free(iter); + } } ---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-03-27 11:09:15.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,195 +0,0 @@ -/* -- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as -- * published by the Free Software Foundation. Sun designates this +- * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided -- * by Sun in the LICENSE file that accompanied this code. +- * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -27804,9 +28396,9 @@ - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -#include "jni.h" @@ -27979,8 +28571,8 @@ - - -} ---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-07-11 09:13:58.000000000 -0700 @@ -30,7 +30,9 @@ #include <stdlib.h> @@ -27991,8 +28583,8 @@ #ifdef __solaris__ #include <strings.h> ---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-07-11 09:13:59.000000000 -0700 @@ -49,6 +49,11 @@ #include <mntent.h> #endif @@ -28051,8 +28643,8 @@ #else m = getmntent_r(fp, &ent, (char*)&buf, buflen); if (m == NULL) ---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-07-11 09:13:59.000000000 -0700 @@ -63,7 +63,12 @@ DEFX(O_EXCL); DEFX(O_TRUNC); @@ -28079,8 +28671,8 @@ DEF(ERANGE); // flags used with openat/unlinkat/etc. ---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-07-11 09:13:59.000000000 -0700 @@ -26,7 +26,9 @@ #include <stdio.h> #include <stdlib.h> @@ -28091,8 +28683,8 @@ #include "NativeFunc.h" /* standard GSS method names (ordering is from mapfile) */ ---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-07-11 09:13:59.000000000 -0700 @@ -28,12 +28,19 @@ #include <string.h> @@ -28135,8 +28727,8 @@ (*env)->ReleaseStringUTFChars(env, jLibName, libName); dprintf2("-handle: %u (0X%X)\n", hModule, hModule); ---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-07-11 09:13:59.000000000 -0700 @@ -64,7 +64,9 @@ #include <assert.h> @@ -28147,8 +28739,8 @@ #include <jni.h> ---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-01-30 09:28:35.000000000 -0800 +--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-07-11 09:13:59.000000000 -0700 @@ -29,7 +29,9 @@ #include <assert.h> @@ -28159,8 +28751,8 @@ #include <winscard.h> ---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-03-27 11:09:15.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-01-30 09:28:36.000000000 -0800 +--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-07-11 09:19:15.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-07-11 09:13:59.000000000 -0700 @@ -35,10 +35,10 @@ #include <dirent.h> #include <ctype.h> @@ -28465,8 +29057,8 @@ + JNU_ReleaseStringPlatformChars(env, path, _path); + } +} ---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-01-30 09:28:36.000000000 -0800 +--- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-07-11 09:13:59.000000000 -0700 @@ -228,10 +228,10 @@ {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD}, @@ -28491,8 +29083,8 @@ /* 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 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-01-30 09:28:36.000000000 -0800 +--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-07-11 09:13:59.000000000 -0700 @@ -24,6 +24,7 @@ */ @@ -28539,8 +29131,8 @@ } dlerror(); /* Clear errors */ gnome_url_show = dlsym(gnome_handle, "gnome_url_show"); ---- ./jdk/src/solaris/npt/npt_md.h 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/npt/npt_md.h 2010-01-30 09:28:36.000000000 -0800 +--- ./jdk/src/solaris/npt/npt_md.h 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/npt/npt_md.h 2010-07-11 09:13:59.000000000 -0700 @@ -32,9 +32,10 @@ #include <string.h> #include <errno.h> @@ -28563,8 +29155,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 2010-03-18 01:45:36.000000000 -0700 -+++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-01-30 09:28:36.000000000 -0800 +--- ./jdk/src/solaris/transport/socket/socket_md.c 2010-07-09 01:52:43.000000000 -0700 ++++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-07-11 09:13:59.000000000 -0700 @@ -36,7 +36,7 @@ #ifdef __solaris__ #include <thread.h> @@ -28583,27 +29175,27 @@ int dbgsysTlsAlloc() { pthread_key_t key; ---- ./jdk/test/Makefile 2010-03-18 01:45:38.000000000 -0700 -+++ ./jdk/test/Makefile 2010-03-20 11:12:38.000000000 -0700 -@@ -72,6 +72,16 @@ - OS_ARCH := $(shell $(UNAME) -m) +--- ./jdk/test/Makefile 2010-07-09 01:52:46.000000000 -0700 ++++ ./jdk/test/Makefile 2010-07-11 09:14:03.000000000 -0700 +@@ -79,6 +79,16 @@ + endif OS_VERSION := $(shell $(UNAME) -r) endif +ifeq ($(UNAME_S), Darwin) + OS_NAME = bsd + OS_ARCH := $(shell $(UNAME) -m) + OS_VERSION := $(shell $(UNAME) -r) -+endif ++endif +ifeq ($(findstring BSD,$(UNAME_S)), BSD) + OS_NAME = bsd + OS_ARCH := $(shell $(UNAME) -m) + OS_VERSION := $(shell $(UNAME) -r) -+endif - ifndef OS_NAME - ifneq ($(PROCESSOR_IDENTIFIER), ) - OS_NAME = windows ---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-03-18 01:45:38.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-01-30 09:28:42.000000000 -0800 ++endif + ifeq ($(OS_NAME),) + OS_NAME = windows + # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always +--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-07-11 09:14:04.000000000 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -28613,8 +29205,8 @@ PATHSEP=":" ;; ---- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-03-18 01:45:38.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-01-30 09:28:42.000000000 -0800 +--- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-07-11 09:14:04.000000000 -0700 @@ -63,7 +63,7 @@ OS=`uname -s` export TRANSPORT_METHOD @@ -28624,8 +29216,8 @@ PATHSEP=":" TRANSPORT_METHOD=dt_socket ;; ---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-03-18 01:45:38.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-01-30 09:28:42.000000000 -0800 +--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-07-11 09:14:04.000000000 -0700 @@ -121,10 +121,14 @@ esac libloc=${jreloc}/lib/${libarch} @@ -28642,8 +29234,8 @@ Windows*) libloc=${jreloc}/bin sep=';' ---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-03-18 01:45:39.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-01-30 09:28:42.000000000 -0800 +--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-07-11 09:14:04.000000000 -0700 @@ -289,7 +289,7 @@ psCmd=ps jstack=jstack.exe @@ -28653,8 +29245,8 @@ transport=dt_socket address= devnull=/dev/null ---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-03-18 01:45:39.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-01-30 09:28:42.000000000 -0800 +--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-07-11 09:14:04.000000000 -0700 @@ -112,7 +112,7 @@ fi ;; @@ -28664,8 +29256,8 @@ pass "This test always passes on $OS" ;; ---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-03-18 01:45:39.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-07-11 09:14:05.000000000 -0700 @@ -45,10 +45,7 @@ OS=`uname -s` @@ -28678,8 +29270,8 @@ PS=":" ;; Windows* | CYGWIN*) ---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-03-18 01:45:39.000000000 -0700 -+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-01-30 09:28:43.000000000 -0800 +--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-07-11 09:14:05.000000000 -0700 @@ -83,6 +83,10 @@ total_swap=`free -b | grep -i swap | awk '{print $2}'` runOne GetTotalSwapSpaceSize $total_swap @@ -28691,8 +29283,8 @@ * ) runOne GetTotalSwapSpaceSize "sanity-only" ;; ---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-03-18 01:45:39.000000000 -0700 -+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-01-30 09:28:43.000000000 -0800 +--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-07-11 09:14:05.000000000 -0700 @@ -48,7 +48,7 @@ # Test GetMaxFileDescriptorCount if we are running on Unix @@ -28702,8 +29294,8 @@ runOne GetMaxFileDescriptorCount ;; * ) ---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-03-18 01:45:39.000000000 -0700 -+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-01-30 09:28:43.000000000 -0800 +--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-07-09 01:52:47.000000000 -0700 ++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-07-11 09:14:05.000000000 -0700 @@ -48,7 +48,7 @@ # Test GetOpenFileDescriptorCount if we are running on Unix @@ -28713,8 +29305,8 @@ runOne GetOpenFileDescriptorCount ;; * ) ---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-03-18 01:45:39.000000000 -0700 -+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-07-09 01:52:48.000000000 -0700 ++++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-07-11 09:14:06.000000000 -0700 @@ -36,11 +36,7 @@ OS=`uname -s` @@ -28728,8 +29320,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-03-18 01:45:40.000000000 -0700 -+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-30 09:28:46.000000000 -0800 +--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-07-09 01:52:49.000000000 -0700 ++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-07-11 09:14:08.000000000 -0700 @@ -25,10 +25,11 @@ fi @@ -28746,8 +29338,8 @@ # Windows if [ -z "${TESTJAVA}" ] ; then ---- ./jdk/test/java/io/File/GetXSpace.sh 2010-03-18 01:45:41.000000000 -0700 -+++ ./jdk/test/java/io/File/GetXSpace.sh 2010-01-30 09:28:48.000000000 -0800 +--- ./jdk/test/java/io/File/GetXSpace.sh 2010-07-09 01:52:52.000000000 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.sh 2010-07-11 09:14:12.000000000 -0700 @@ -26,7 +26,7 @@ # set platform-dependent variable OS=`uname -s` @@ -28757,8 +29349,8 @@ Windows_98 ) return ;; Windows* ) SID=`sid`; TMP="c:/temp" ;; * ) ---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-03-18 01:45:42.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-07-09 01:52:53.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-07-11 09:14:13.000000000 -0700 @@ -41,7 +41,7 @@ # Need to determine the classpath separator and filepath separator based on the # operating system. @@ -28768,8 +29360,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-03-18 01:45:42.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-07-09 01:52:53.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-07-11 09:14:14.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -28779,8 +29371,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-03-18 01:45:42.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-01-30 09:40:01.000000000 -0800 +--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-07-09 01:52:53.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-07-11 09:14:14.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -28790,8 +29382,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-03-18 01:45:43.000000000 -0700 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-01-30 13:44:36.000000000 -0800 +--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-07-09 01:52:54.000000000 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-07-11 09:14:15.000000000 -0700 @@ -49,10 +49,7 @@ # set platform-specific variables OS=`uname -s` @@ -28804,8 +29396,8 @@ FS="/" ;; Windows* | CYGWIN* ) ---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-03-18 01:45:43.000000000 -0700 -+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-01-30 12:39:25.000000000 -0800 +--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-07-09 01:52:54.000000000 -0700 ++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-07-11 09:14:16.000000000 -0700 @@ -30,7 +30,7 @@ # set platform-dependent variables OS=`uname -s` @@ -28815,8 +29407,8 @@ Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; * ) echo "Unrecognized system!" ; exit 1 ;; ---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-03-18 01:45:43.000000000 -0700 -+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-07-09 01:52:55.000000000 -0700 ++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-07-11 09:14:16.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -28826,8 +29418,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-03-18 01:45:43.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-01-30 09:28:51.000000000 -0800 +--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-07-09 01:52:55.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-07-11 09:14:16.000000000 -0700 @@ -49,7 +49,7 @@ OS=`uname -s` @@ -28837,8 +29429,8 @@ PATHSEP=":" ;; ---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-03-18 01:45:43.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-07-09 01:52:55.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-07-11 09:14:17.000000000 -0700 @@ -35,11 +35,7 @@ OS=`uname -s` @@ -28852,8 +29444,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-03-18 01:45:43.000000000 -0700 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-01-30 09:28:52.000000000 -0800 +--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-07-09 01:52:55.000000000 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-07-11 09:14:17.000000000 -0700 @@ -61,10 +61,7 @@ while true; do echo "Run $i: TestSystemLoadAvg" @@ -28866,8 +29458,8 @@ runOne GetSystemLoadAverage ;; * ) ---- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-03-18 01:45:44.000000000 -0700 -+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-01-30 09:28:53.000000000 -0800 +--- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-07-09 01:52:56.000000000 -0700 ++++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-07-11 09:14:18.000000000 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -28877,8 +29469,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-03-18 01:45:44.000000000 -0700 -+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-01-30 09:28:53.000000000 -0800 +--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-07-09 01:52:56.000000000 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-07-11 09:14:18.000000000 -0700 @@ -27,11 +27,7 @@ # set platform-dependent variables OS=`uname -s` @@ -28892,8 +29484,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-03-18 01:45:44.000000000 -0700 -+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-01-30 09:28:53.000000000 -0800 +--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-07-09 01:52:56.000000000 -0700 ++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-07-11 09:14:19.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -28903,8 +29495,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URL/B5086147.sh 2010-03-18 01:45:44.000000000 -0700 -+++ ./jdk/test/java/net/URL/B5086147.sh 2010-01-30 09:28:53.000000000 -0800 +--- ./jdk/test/java/net/URL/B5086147.sh 2010-07-09 01:52:56.000000000 -0700 ++++ ./jdk/test/java/net/URL/B5086147.sh 2010-07-11 09:14:19.000000000 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -28914,8 +29506,8 @@ exit 0 ;; CYGWIN* ) ---- ./jdk/test/java/net/URL/runconstructor.sh 2010-03-18 01:45:44.000000000 -0700 -+++ ./jdk/test/java/net/URL/runconstructor.sh 2010-01-30 09:28:53.000000000 -0800 +--- ./jdk/test/java/net/URL/runconstructor.sh 2010-07-09 01:52:56.000000000 -0700 ++++ ./jdk/test/java/net/URL/runconstructor.sh 2010-07-11 09:14:19.000000000 -0700 @@ -27,7 +27,7 @@ # OS=`uname -s` @@ -28925,8 +29517,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-03-18 01:45:44.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-01-30 09:28:53.000000000 -0800 +--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-07-09 01:52:57.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-07-11 09:14:19.000000000 -0700 @@ -34,11 +34,7 @@ OS=`uname -s` @@ -28940,8 +29532,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-03-18 01:45:44.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-01-30 09:28:54.000000000 -0800 +--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-07-09 01:52:57.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-07-11 09:14:20.000000000 -0700 @@ -27,11 +27,7 @@ OS=`uname -s` @@ -28955,8 +29547,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-03-18 01:45:44.000000000 -0700 -+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-01-30 09:28:54.000000000 -0800 +--- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-07-09 01:52:57.000000000 -0700 ++++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-07-11 09:14:20.000000000 -0700 @@ -33,11 +33,7 @@ OS=`uname -s` @@ -28970,8 +29562,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-03-18 01:45:45.000000000 -0700 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-01-30 09:28:55.000000000 -0800 +--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-07-09 01:52:58.000000000 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-07-11 09:14:21.000000000 -0700 @@ -71,6 +71,48 @@ EXTRA_LIBS = -lc endif @@ -29021,9 +29613,9 @@ LIBDIR=lib/$(PLATFORM)-$(ARCH) LAUNCHERLIB=$(LIBDIR)/libLauncher.so -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/merge/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 2010-03-18 01:45:45.000000000 -0700 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-01-30 09:28:55.000000000 -0800 +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/merge/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 2010-07-09 01:52:58.000000000 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-07-11 09:14:21.000000000 -0700 @@ -33,11 +33,14 @@ # @run shell run_tests.sh @@ -29092,8 +29684,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select LIBDIR=lib/${PLATFORM}-${ARCH} LAUNCHERLIB=${LIBDIR}/libLauncher.so ---- ./jdk/test/java/nio/charset/Charset/default.sh 2010-03-18 01:45:45.000000000 -0700 -+++ ./jdk/test/java/nio/charset/Charset/default.sh 2010-02-21 17:36:42.000000000 -0800 +--- ./jdk/test/java/nio/charset/Charset/default.sh 2010-07-09 01:52:58.000000000 -0700 ++++ ./jdk/test/java/nio/charset/Charset/default.sh 2010-07-11 09:14:21.000000000 -0700 @@ -41,10 +41,14 @@ fi @@ -29113,8 +29705,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select JAVA=$TESTJAVA/bin/java ---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-03-18 01:45:45.000000000 -0700 -+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-02-21 17:37:41.000000000 -0800 +--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-07-09 01:52:58.000000000 -0700 ++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-07-11 09:14:21.000000000 -0700 @@ -34,7 +34,7 @@ OS=`uname -s` @@ -29124,8 +29716,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/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 2010-03-18 01:45:45.000000000 -0700 -+++ ./jdk/test/java/nio/charset/spi/basic.sh 2010-02-21 17:39:12.000000000 -0800 +--- ./jdk/test/java/nio/charset/spi/basic.sh 2010-07-09 01:52:58.000000000 -0700 ++++ ./jdk/test/java/nio/charset/spi/basic.sh 2010-07-11 09:14:22.000000000 -0700 @@ -70,10 +70,14 @@ L="$1" shift @@ -29154,8 +29746,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select Windows* ) CPS=';' ;; *) echo "Unknown platform: `uname`"; exit 1 ;; esac ---- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-03-18 01:45:45.000000000 -0700 -+++ ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-01-30 13:47:40.000000000 -0800 +--- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-07-09 01:52:58.000000000 -0700 ++++ ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-07-11 09:14:22.000000000 -0700 @@ -147,7 +147,8 @@ // get file attributes of source file @@ -29166,8 +29758,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select posixAttributes = Attributes.readPosixFileAttributes(source, NOFOLLOW_LINKS); basicAttributes = posixAttributes; } ---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-03-18 01:45:46.000000000 -0700 -+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-01-30 09:28:57.000000000 -0800 +--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-07-09 01:52:59.000000000 -0700 ++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-07-11 09:14:24.000000000 -0700 @@ -84,14 +84,12 @@ @@ -29187,8 +29779,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select export PATH_SEP mainpid=$$ ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-03-18 01:45:46.000000000 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-01-30 09:28:58.000000000 -0800 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-07-09 01:53:00.000000000 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-07-11 09:14:26.000000000 -0700 @@ -46,11 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29202,8 +29794,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-03-18 01:45:47.000000000 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-01-30 09:28:58.000000000 -0800 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-07-09 01:53:00.000000000 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-07-11 09:14:26.000000000 -0700 @@ -34,11 +34,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29217,8 +29809,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-03-18 01:45:47.000000000 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-01-30 09:28:58.000000000 -0800 +--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-07-09 01:53:00.000000000 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-07-11 09:14:26.000000000 -0700 @@ -46,11 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29232,8 +29824,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-03-18 01:45:47.000000000 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-01-30 09:28:58.000000000 -0800 +--- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-07-09 01:53:01.000000000 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-07-11 09:14:26.000000000 -0700 @@ -46,11 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29247,8 +29839,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-03-18 01:45:47.000000000 -0700 -+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-07-09 01:53:01.000000000 -0700 ++++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-07-11 09:14:27.000000000 -0700 @@ -30,7 +30,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29258,8 +29850,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PS=":" FS="/" ;; ---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-03-18 01:45:47.000000000 -0700 -+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-07-09 01:53:02.000000000 -0700 ++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-07-11 09:14:28.000000000 -0700 @@ -58,7 +58,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29269,8 +29861,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PS=":" FS="/" ;; ---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-03-18 01:45:48.000000000 -0700 -+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-07-09 01:53:02.000000000 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-07-11 09:14:28.000000000 -0700 @@ -31,7 +31,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29280,8 +29872,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-03-18 01:45:48.000000000 -0700 -+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-07-09 01:53:02.000000000 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-07-11 09:14:28.000000000 -0700 @@ -75,7 +75,7 @@ SunOS) DEL=":" @@ -29291,8 +29883,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select DEL=":" HAS_S=YES ;; ---- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-03-18 01:45:48.000000000 -0700 -+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-07-09 01:53:02.000000000 -0700 ++++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-07-11 09:14:29.000000000 -0700 @@ -42,9 +42,7 @@ OS=`uname -s` @@ -29304,8 +29896,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select SEP=':' ;; * ) SEP='\;' ;; ---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-03-18 01:45:48.000000000 -0700 -+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-01-30 09:29:03.000000000 -0800 +--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-07-09 01:53:03.000000000 -0700 ++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-07-11 09:14:30.000000000 -0700 @@ -51,7 +51,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29315,8 +29907,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/javax/script/CommonSetup.sh 2010-03-18 01:45:49.000000000 -0700 -+++ ./jdk/test/javax/script/CommonSetup.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/javax/script/CommonSetup.sh 2010-07-09 01:53:05.000000000 -0700 ++++ ./jdk/test/javax/script/CommonSetup.sh 2010-07-11 09:14:33.000000000 -0700 @@ -36,11 +36,7 @@ OS=`uname -s` @@ -29330,8 +29922,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PS=":" FS="/" ;; ---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-03-18 01:45:49.000000000 -0700 -+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-01-30 09:29:05.000000000 -0800 +--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-07-09 01:53:05.000000000 -0700 ++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-07-11 09:14:33.000000000 -0700 @@ -33,12 +33,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29346,8 +29938,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PS=":" FS="/" RM="/bin/rm -f" ---- ./jdk/test/jprt.config 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/jprt.config 2010-01-30 09:29:08.000000000 -0800 +--- ./jdk/test/jprt.config 2010-07-09 01:53:07.000000000 -0700 ++++ ./jdk/test/jprt.config 2010-07-11 09:14:37.000000000 -0700 @@ -71,8 +71,8 @@ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. @@ -29415,8 +30007,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select # Export PATH setting PATH="${path4sdk}" ---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-01-30 09:29:08.000000000 -0800 +--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-07-09 01:53:07.000000000 -0700 ++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-07-11 09:14:37.000000000 -0700 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29426,8 +30018,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-01-30 09:29:08.000000000 -0800 +--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-07-11 09:14:37.000000000 -0700 @@ -45,37 +45,50 @@ # has to locate libjvm.so. Also $! is not reliable on some releases of MKS. #{ @@ -29504,8 +30096,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select # ---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-01-30 09:40:02.000000000 -0800 +--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-07-11 09:14:37.000000000 -0700 @@ -35,7 +35,7 @@ UMASK=`umask` @@ -29515,8 +30107,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" DFILESEP=$FILESEP ---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-01-30 09:29:08.000000000 -0800 +--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-07-11 09:14:37.000000000 -0700 @@ -86,10 +86,12 @@ # on Windows 98. @@ -29534,8 +30126,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select JAVA=${TESTJAVA}/bin/java CLASSPATH=${TESTCLASSES} ---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-01-30 09:29:08.000000000 -0800 +--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-07-11 09:14:37.000000000 -0700 @@ -70,10 +70,12 @@ # security the password file. @@ -29553,8 +30145,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select # Create configuration file and dummy password file ---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-01-30 09:29:08.000000000 -0800 +--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-07-11 09:14:37.000000000 -0700 @@ -69,10 +69,12 @@ # security the password file. @@ -29572,9 +30164,9 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/java/nio/channels/spi/Select # Create management and SSL configuration files -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ ---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-01-30 09:40:02.000000000 -0800 +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ +--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-07-11 09:14:38.000000000 -0700 @@ -36,11 +36,7 @@ OS=`uname -s` @@ -29588,8 +30180,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-01-30 09:29:09.000000000 -0800 +--- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-07-11 09:14:38.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -29599,8 +30191,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-01-30 09:29:09.000000000 -0800 +--- ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-07-11 09:14:38.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -29610,8 +30202,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-01-30 09:29:09.000000000 -0800 +--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-07-09 01:53:08.000000000 -0700 ++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-07-11 09:14:38.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -29621,8 +30213,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-01-30 09:29:09.000000000 -0800 +--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-07-09 01:53:09.000000000 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-07-11 09:14:39.000000000 -0700 @@ -31,11 +31,7 @@ OS=`uname -s` @@ -29636,8 +30228,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-03-18 01:45:51.000000000 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-01-30 09:29:10.000000000 -0800 +--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-07-09 01:53:09.000000000 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-07-11 09:14:39.000000000 -0700 @@ -31,11 +31,7 @@ OS=`uname -s` @@ -29651,11 +30243,11 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-03-27 11:09:15.000000000 -0700 +--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,79 +0,0 @@ -/* -- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -29672,9 +30264,9 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -/* @@ -29733,11 +30325,11 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/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 2010-03-27 11:09:15.000000000 -0700 +--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-07-11 09:19:15.000000000 -0700 +++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,70 +0,0 @@ -/* -- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. +- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -29754,9 +30346,9 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * -- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -- * CA 95054 USA or visit www.sun.com if you need additional information or -- * have any questions. +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. - */ - -/* @test @@ -29806,8 +30398,22 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo - } - } -} ---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-03-18 01:45:53.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-01-30 09:29:12.000000000 -0800 +--- ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-07-09 01:53:11.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-07-11 09:14:41.000000000 -0700 +@@ -58,6 +58,11 @@ + FILESEP="/" + NATIVE=true + ;; ++ Darwin | *BSD ) ++ PATHSEP=":" ++ FILESEP="/" ++ NATIVE=true ++ ;; + CYGWIN* ) + PATHSEP=";" + FILESEP="/" +--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-07-09 01:53:11.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-07-11 09:14:41.000000000 -0700 @@ -131,6 +131,27 @@ ;; esac @@ -29836,8 +30442,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo Windows* ) FS="\\" PS=";" ---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-03-18 01:45:53.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-01-30 09:29:12.000000000 -0800 +--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-07-09 01:53:11.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-07-11 09:14:41.000000000 -0700 @@ -92,6 +92,27 @@ ;; esac @@ -29866,8 +30472,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo Windows* ) FS="\\" PS=";" ---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-03-18 01:45:53.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-01-30 09:29:13.000000000 -0800 +--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-07-09 01:53:11.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-07-11 09:14:42.000000000 -0700 @@ -50,13 +50,7 @@ OS=`uname -s` @@ -29883,8 +30489,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo FS="/" PS=":" CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-03-18 01:45:53.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-01-30 09:29:13.000000000 -0800 +--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-07-09 01:53:11.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-07-11 09:14:42.000000000 -0700 @@ -51,13 +51,7 @@ OS=`uname -s` @@ -29900,23 +30506,23 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/management/jmxremote/boo FS="/" PS=":" CP="${FS}bin${FS}cp" -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ -Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ ---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-03-18 01:45:54.000000000 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-01-30 09:29:16.000000000 -0800 +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ +Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ +--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-07-09 01:53:13.000000000 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-07-11 09:14:43.000000000 -0700 @@ -44,11 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29930,8 +30536,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-03-18 01:45:54.000000000 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-01-30 09:29:16.000000000 -0800 +--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-07-09 01:53:13.000000000 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-07-11 09:14:44.000000000 -0700 @@ -47,11 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29945,8 +30551,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-07-09 01:53:14.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-07-11 09:14:45.000000000 -0700 @@ -42,7 +42,7 @@ OS=`uname -s` @@ -29956,8 +30562,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FILESEP="/" PATHSEP=":" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-07-09 01:53:14.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-07-11 09:14:46.000000000 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -29967,8 +30573,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-07-09 01:53:14.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-07-11 09:14:46.000000000 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -29978,8 +30584,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-07-09 01:53:14.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29989,8 +30595,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-07-09 01:53:14.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30000,8 +30606,19 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-07-09 01:53:14.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-07-11 09:14:46.000000000 -0700 +@@ -41,7 +41,7 @@ + # set platform-dependent variables + OS=`uname -s` + case "$OS" in +- SunOS | Linux ) ++ SunOS | Linux | *BSD | Darwin) + NULL=/dev/null + PS=":" + FS="/" +--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-07-11 09:14:46.000000000 -0700 @@ -42,7 +42,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30011,8 +30628,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30022,8 +30639,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-07-11 09:14:46.000000000 -0700 @@ -47,11 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30037,8 +30654,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-07-11 09:14:46.000000000 -0700 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30048,8 +30665,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-01-30 09:29:17.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30059,8 +30676,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-07-11 09:14:46.000000000 -0700 @@ -72,6 +72,27 @@ ;; esac @@ -30089,8 +30706,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/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 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30100,8 +30717,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-07-11 09:14:46.000000000 -0700 @@ -37,7 +37,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30111,8 +30728,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; CYGWIN* ) ---- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/resource.sh 2010-07-11 09:14:46.000000000 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30122,8 +30739,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null FS="/" TMP=/tmp ---- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/standard.sh 2010-07-11 09:14:46.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30133,8 +30750,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows_* ) ---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-07-11 09:14:46.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30144,8 +30761,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30155,8 +30772,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30166,8 +30783,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-07-11 09:14:46.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30177,8 +30794,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30188,8 +30805,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30199,8 +30816,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-07-11 09:14:46.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30210,8 +30827,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-07-11 09:14:46.000000000 -0700 @@ -53,7 +53,7 @@ OS=`uname -s` @@ -30221,8 +30838,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" ;; ---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-03-18 01:45:55.000000000 -0700 -+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-01-30 09:29:18.000000000 -0800 +--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-07-09 01:53:15.000000000 -0700 ++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-07-11 09:14:47.000000000 -0700 @@ -54,7 +54,7 @@ OS=`uname -s` @@ -30232,8 +30849,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" ;; ---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-03-18 01:45:56.000000000 -0700 -+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-01-30 12:39:04.000000000 -0800 +--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-07-09 01:53:16.000000000 -0700 ++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-07-11 09:14:47.000000000 -0700 @@ -33,7 +33,7 @@ case `uname -s` in @@ -30243,8 +30860,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ esac N2A=$TESTJAVA/bin/native2ascii ---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-03-18 01:45:56.000000000 -0700 -+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-01-30 09:29:19.000000000 -0800 +--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-07-09 01:53:16.000000000 -0700 ++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-07-11 09:14:47.000000000 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -30254,8 +30871,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" ;; ---- ./jdk/test/tools/pack200/Pack200Simple.sh 2010-03-18 01:45:56.000000000 -0700 -+++ ./jdk/test/tools/pack200/Pack200Simple.sh 2010-01-30 09:29:19.000000000 -0800 +--- ./jdk/test/tools/pack200/Pack200Simple.sh 2010-07-09 01:53:16.000000000 -0700 ++++ ./jdk/test/tools/pack200/Pack200Simple.sh 2010-07-11 09:14:48.000000000 -0700 @@ -85,7 +85,7 @@ break ;; @@ -30265,20 +30882,13 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PackOptions="-J-Xmx512m -J-ea" break ;; ---- ./langtools/.hgtags 2010-03-18 01:46:16.000000000 -0700 -+++ ./langtools/.hgtags 2010-03-20 11:13:06.000000000 -0700 -@@ -60,3 +60,4 @@ - c9f4ae1f1480e89aaf7e72173184089d9cea397a jdk7-b83 - d9cd5b8286e44f3baf90da290cd295433e21c05a jdk7-b84 - 136bfc67946219fb02ee223984540a4a9c5b209f jdk7-b85 -+ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86 ---- ./langtools/.jcheck/conf 2010-03-18 01:46:16.000000000 -0700 +--- ./langtools/.jcheck/conf 2010-07-09 01:53:39.000000000 -0700 +++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./langtools/test/Makefile 2010-03-18 01:46:18.000000000 -0700 -+++ ./langtools/test/Makefile 2009-09-23 21:29:29.000000000 -0700 -@@ -20,6 +20,22 @@ +--- ./langtools/test/Makefile 2010-07-09 01:53:41.000000000 -0700 ++++ ./langtools/test/Makefile 2010-07-11 09:15:06.000000000 -0700 +@@ -34,6 +34,22 @@ ARCH=i586 endif endif @@ -30301,7 +30911,7 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ ifeq ($(OSNAME), Windows_NT) PLATFORM = windows JT_PLATFORM = win32 -@@ -62,7 +78,7 @@ +@@ -93,7 +109,7 @@ ifdef JPRT_JAVA_HOME JT_JAVA = $(JPRT_JAVA_HOME) else @@ -30310,7 +30920,7 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ endif # Default JDK to test -@@ -76,7 +92,9 @@ +@@ -188,7 +204,9 @@ # The test directories to run DEFAULT_TESTDIRS = . @@ -30320,9 +30930,9 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ +endif # Root of all test results - TEST_OUTPUT_DIR = $(TEST_ROOT)/o_$(PLATFORM)-$(ARCH) ---- ./langtools/test/jprt.config 2010-03-18 01:46:19.000000000 -0700 -+++ ./langtools/test/jprt.config 2009-06-06 17:29:59.000000000 -0700 + TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools +--- ./langtools/test/jprt.config 2010-07-09 01:53:42.000000000 -0700 ++++ ./langtools/test/jprt.config 2010-07-11 09:15:09.000000000 -0700 @@ -71,8 +71,8 @@ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. @@ -30390,8 +31000,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ # Export PATH setting PATH="${path4sdk}" ---- ./langtools/test/tools/javac/4846262/Test.sh 2010-03-18 01:46:19.000000000 -0700 -+++ ./langtools/test/tools/javac/4846262/Test.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/4846262/Test.sh 2010-07-09 01:53:43.000000000 -0700 ++++ ./langtools/test/tools/javac/4846262/Test.sh 2010-07-11 09:15:09.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30401,8 +31011,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; CYGWIN* ) ---- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-03-18 01:46:19.000000000 -0700 -+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-07-09 01:53:43.000000000 -0700 ++++ ./langtools/test/tools/javac/6302184/T6302184.sh 2010-07-11 09:15:09.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30412,8 +31022,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; CYGWIN* ) ---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-03-18 01:46:20.000000000 -0700 -+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-07-09 01:53:43.000000000 -0700 ++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-07-11 09:15:10.000000000 -0700 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30423,8 +31033,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-03-18 01:46:20.000000000 -0700 -+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-07-09 01:53:44.000000000 -0700 ++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-07-11 09:15:11.000000000 -0700 @@ -54,7 +54,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30434,8 +31044,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javac/MissingInclude.sh 2010-03-18 01:46:20.000000000 -0700 -+++ ./langtools/test/tools/javac/MissingInclude.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/MissingInclude.sh 2010-07-09 01:53:44.000000000 -0700 ++++ ./langtools/test/tools/javac/MissingInclude.sh 2010-07-11 09:15:12.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30445,8 +31055,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-03-18 01:46:20.000000000 -0700 -+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-07-09 01:53:44.000000000 -0700 ++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-07-11 09:15:12.000000000 -0700 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30456,8 +31066,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-03-18 01:46:21.000000000 -0700 -+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-07-09 01:53:44.000000000 -0700 ++++ ./langtools/test/tools/javac/T5090006/compiler.sh 2010-07-11 09:15:13.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30467,8 +31077,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/apt.sh 2010-03-18 01:46:21.000000000 -0700 -+++ ./langtools/test/tools/javac/apt.sh 2009-06-06 17:30:04.000000000 -0700 +--- ./langtools/test/tools/javac/apt.sh 2010-07-09 01:53:45.000000000 -0700 ++++ ./langtools/test/tools/javac/apt.sh 2010-07-11 09:15:14.000000000 -0700 @@ -38,7 +38,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30478,8 +31088,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-03-18 01:46:21.000000000 -0700 -+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-07-09 01:53:45.000000000 -0700 ++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-07-11 09:15:15.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30489,8 +31099,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-03-18 01:46:22.000000000 -0700 -+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-07-09 01:53:45.000000000 -0700 ++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-07-11 09:15:15.000000000 -0700 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30500,8 +31110,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; CYGWIN* ) ---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-03-18 01:46:23.000000000 -0700 -+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-07-09 01:53:47.000000000 -0700 ++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-07-11 09:15:18.000000000 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30511,8 +31121,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/javazip/Test.sh 2010-03-18 01:46:23.000000000 -0700 -+++ ./langtools/test/tools/javac/javazip/Test.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/javazip/Test.sh 2010-07-09 01:53:47.000000000 -0700 ++++ ./langtools/test/tools/javac/javazip/Test.sh 2010-07-11 09:15:18.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30522,8 +31132,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" SCR=`pwd` ;; ---- ./langtools/test/tools/javac/links/links.sh 2010-03-18 01:46:23.000000000 -0700 -+++ ./langtools/test/tools/javac/links/links.sh 2009-06-06 17:30:08.000000000 -0700 +--- ./langtools/test/tools/javac/links/links.sh 2010-07-09 01:53:47.000000000 -0700 ++++ ./langtools/test/tools/javac/links/links.sh 2010-07-11 09:15:19.000000000 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30533,8 +31143,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-03-18 01:46:23.000000000 -0700 -+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-07-09 01:53:47.000000000 -0700 ++++ ./langtools/test/tools/javac/newlines/Newlines.sh 2010-07-11 09:15:19.000000000 -0700 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30544,8 +31154,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-03-18 01:46:24.000000000 -0700 -+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-07-09 01:53:48.000000000 -0700 ++++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-07-11 09:15:21.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30555,8 +31165,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows_95 | Windows_98 | Windows_NT ) ---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-03-18 01:46:24.000000000 -0700 -+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-07-09 01:53:48.000000000 -0700 ++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-07-11 09:15:22.000000000 -0700 @@ -66,6 +66,17 @@ exit 0; fi @@ -30575,8 +31185,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/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 2010-03-18 01:46:24.000000000 -0700 -+++ ./langtools/test/tools/javah/6257087/foo.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javah/6257087/foo.sh 2010-07-09 01:53:48.000000000 -0700 ++++ ./langtools/test/tools/javah/6257087/foo.sh 2010-07-11 09:15:23.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30586,8 +31196,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-03-18 01:46:24.000000000 -0700 -+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-07-09 01:53:48.000000000 -0700 ++++ ./langtools/test/tools/javah/ConstMacroTest.sh 2010-07-11 09:15:23.000000000 -0700 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30597,8 +31207,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-03-18 01:46:24.000000000 -0700 -+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2009-10-18 15:07:54.000000000 -0700 +--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-07-09 01:53:48.000000000 -0700 ++++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-07-11 09:15:23.000000000 -0700 @@ -58,7 +58,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30608,8 +31218,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javah/ReadOldClass.sh 2010-03-18 01:46:24.000000000 -0700 -+++ ./langtools/test/tools/javah/ReadOldClass.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javah/ReadOldClass.sh 2010-07-09 01:53:48.000000000 -0700 ++++ ./langtools/test/tools/javah/ReadOldClass.sh 2010-07-11 09:15:23.000000000 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30619,8 +31229,8 @@ Files /tmp/openjdk_srcdir.WNIZhUSX/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javap/pathsep.sh 2010-03-18 01:46:24.000000000 -0700 -+++ ./langtools/test/tools/javap/pathsep.sh 2009-10-05 22:36:51.000000000 -0700 +--- ./langtools/test/tools/javap/pathsep.sh 2010-07-09 01:53:49.000000000 -0700 ++++ ./langtools/test/tools/javap/pathsep.sh 2010-07-11 09:15:23.000000000 -0700 @@ -40,7 +40,7 @@ # set platform-dependent variables OS=`uname -s` |