summaryrefslogtreecommitdiff
path: root/java/openjdk7
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2011-06-26 18:31:15 +0000
committerGreg Lewis <glewis@FreeBSD.org>2011-06-26 18:31:15 +0000
commita121ec1a940121261cf53a068fe8953a599971be (patch)
tree73d39defe7b934e7562eaa196eaaecfc4219ed26 /java/openjdk7
parent- Add python bindings (diff)
. Update to Build 146.
Notes
Notes: svn path=/head/; revision=276452
Diffstat (limited to 'java/openjdk7')
-rw-r--r--java/openjdk7/Makefile10
-rw-r--r--java/openjdk7/distinfo12
-rw-r--r--java/openjdk7/files/patch-set1327
3 files changed, 680 insertions, 669 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 458556351e9b..fd4f35b36a73 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -36,9 +36,9 @@ MAKE_JOBS_UNSAFE= YES
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 0
-JDK_BUILD_NUMBER= 144
-JDK_BUILD_DATE= 26_may_2011
-JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}-ea-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
+JDK_BUILD_NUMBER= 146
+JDK_BUILD_DATE= 20_jun_2011
+JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
# Use our own version of ant to avoid circular dependencies
ANT_VERSION= 1.8.2
@@ -51,8 +51,8 @@ USE_ICONV= YES
USE_XORG+= x11 xext xi xrender xt xtst
MAKE_JOBS_UNSAFE= yes
-JAXPFILE= jaxp-1_4_5.zip
-JAXWSFILE= jdk7-jaxws2_2_4-b02-2011_05_09.zip
+JAXPFILE= jaxp145_01.zip
+JAXWSFILE= jdk7-jaxws2_2_4-b03-2011_05_27.zip
JAFFILE= jdk7-jaf-2010_08_19.zip
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 \
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index b87c84befa60..17bc759c5404 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,9 +1,9 @@
-SHA256 (openjdk-7-ea-src-b144-26_may_2011.zip) = fbbc1a9a418bd7d1a2cd0ce2c0178bb3eb089bb60c27696239709a4aa8087bbf
-SIZE (openjdk-7-ea-src-b144-26_may_2011.zip) = 87025879
-SHA256 (jaxp-1_4_5.zip) = 8145a789a61d21d0ff9902e4dc1c7ba492bb407ee614187dc933321922249ddb
-SIZE (jaxp-1_4_5.zip) = 6429135
-SHA256 (jdk7-jaxws2_2_4-b02-2011_05_09.zip) = 2fd874aae97a4206c8f4cd93ee419c09f95c3f684349182b66b6ee9010c72f84
-SIZE (jdk7-jaxws2_2_4-b02-2011_05_09.zip) = 5881427
+SHA256 (openjdk-7-fcs-src-b146-20_jun_2011.zip) = a55b15d5f43258ac4829241e0885b46b41a1042f450dd7c51b76b74c0d612cee
+SIZE (openjdk-7-fcs-src-b146-20_jun_2011.zip) = 87207171
+SHA256 (jaxp145_01.zip) = c5924c6188988e2e8397ee5143bd8eaa062569d052567afd2ac9326a54a848cb
+SIZE (jaxp145_01.zip) = 6389175
+SHA256 (jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 05ae7259b75d0f2307276d61ece1887fcd437cb4ecda42fab8c22d4b537effd6
+SIZE (jdk7-jaxws2_2_4-b03-2011_05_27.zip) = 6046353
SHA256 (jdk7-jaf-2010_08_19.zip) = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
SIZE (jdk7-jaf-2010_08_19.zip) = 70613
SHA256 (apache-ant-1.8.2-bin.zip) = a07cd948f69bc0fee76e942ac24ae65ce2ca7e28c444b78eb95bcf8c638342e8
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
index 7e47b52c086c..01d1347801fb 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,26 +1,26 @@
---- ./.hgtags 2011-05-26 17:05:27.000000000 -0700
-+++ ./.hgtags 2011-05-27 00:00:33.000000000 -0700
-@@ -118,3 +118,4 @@
- c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141
- cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
+--- ./.hgtags 2011-06-20 09:35:40.000000000 -0700
++++ ./.hgtags 2011-06-21 05:38:22.000000000 -0700
+@@ -120,3 +120,4 @@
14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143
-+7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
---- ./.jcheck/conf 2011-05-26 17:05:28.000000000 -0700
+ 7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
+ 55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
++2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
+--- ./.jcheck/conf 2011-06-20 09:35:41.000000000 -0700
+++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/.hgtags 2011-05-26 17:08:44.000000000 -0700
-+++ ./corba/.hgtags 2011-05-27 00:00:37.000000000 -0700
-@@ -118,3 +118,4 @@
- a58635cdd921bafef353f4864184a0481353197b jdk7-b141
- a2f340a048c88d10cbedc0504f5cf03d39925a40 jdk7-b142
+--- ./corba/.hgtags 2011-06-20 09:46:05.000000000 -0700
++++ ./corba/.hgtags 2011-06-21 05:38:25.000000000 -0700
+@@ -120,3 +120,4 @@
51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143
-+7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
---- ./corba/.jcheck/conf 2011-05-26 17:08:44.000000000 -0700
+ 7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
+ 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
++770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
+--- ./corba/.jcheck/conf 2011-06-20 09:46:06.000000000 -0700
+++ ./corba/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/make/common/Defs-bsd.gmk 2011-05-29 11:28:25.000000000 -0700
+--- ./corba/make/common/Defs-bsd.gmk 2011-06-25 23:50:16.000000000 -0700
+++ ./corba/make/common/Defs-bsd.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -25,9 +25,18 @@
@@ -42,7 +42,7 @@
# Get shared JDK settings
include $(BUILDDIR)/common/shared/Defs.gmk
---- ./corba/make/common/Defs.gmk 2011-05-26 17:09:01.000000000 -0700
+--- ./corba/make/common/Defs.gmk 2011-06-20 09:46:23.000000000 -0700
+++ ./corba/make/common/Defs.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -53,6 +53,28 @@
@@ -73,7 +73,7 @@
#
# Get platform definitions
#
---- ./corba/make/common/shared/Defs-bsd.gmk 2011-05-29 11:28:25.000000000 -0700
+--- ./corba/make/common/shared/Defs-bsd.gmk 2011-06-25 23:50:16.000000000 -0700
+++ ./corba/make/common/shared/Defs-bsd.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -93,7 +93,7 @@
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
---- ./corba/make/common/shared/Defs-utils.gmk 2011-05-26 17:09:02.000000000 -0700
+--- ./corba/make/common/shared/Defs-utils.gmk 2011-06-20 09:46:24.000000000 -0700
+++ ./corba/make/common/shared/Defs-utils.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -53,6 +53,13 @@
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
@@ -144,7 +144,7 @@
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif
---- ./corba/make/common/shared/Platform.gmk 2011-05-26 17:09:03.000000000 -0700
+--- ./corba/make/common/shared/Platform.gmk 2011-06-20 09:46:25.000000000 -0700
+++ ./corba/make/common/shared/Platform.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -231,6 +231,101 @@
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
@@ -267,18 +267,18 @@
REQUIRED_ZIP_VER = 2.2
REQUIRED_UNZIP_VER = 5.12
REQUIRED_MAKE_VER = 3.81
---- ./hotspot/.hgtags 2011-05-26 17:23:54.000000000 -0700
-+++ ./hotspot/.hgtags 2011-05-27 00:00:43.000000000 -0700
-@@ -174,3 +174,4 @@
- 9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
- c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
- c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
-+fe189d4a44e9e8f0c7d78fcbd1c63701745752ca jdk7-b144
---- ./hotspot/.jcheck/conf 2011-05-26 17:23:54.000000000 -0700
+--- ./hotspot/.hgtags 2011-06-20 09:58:18.000000000 -0700
++++ ./hotspot/.hgtags 2011-06-21 05:38:36.000000000 -0700
+@@ -178,3 +178,4 @@
+ 62f39d40ebf176306a916812729df586f9d10f43 hs21-b14
+ 82a81d5c5700a69333e12532bf0c4d33e885c7fc jdk7-b145
+ 82a81d5c5700a69333e12532bf0c4d33e885c7fc hs21-b15
++38fa55e5e79232d48f1bb8cf27d88bc094c9375a jdk7-b146
+--- ./hotspot/.jcheck/conf 2011-06-20 09:58:18.000000000 -0700
+++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./hotspot/agent/make/Makefile 2011-05-26 17:23:57.000000000 -0700
+--- ./hotspot/agent/make/Makefile 2011-06-20 09:58:20.000000000 -0700
+++ ./hotspot/agent/make/Makefile 2011-05-12 20:54:44.000000000 -0700
@@ -52,6 +52,9 @@
sun.jvm.hotspot.compiler \
@@ -309,7 +309,7 @@
sun/jvm/hotspot/debugger/cdbg/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-04-22 22:28:31.000000000 -0700
@@ -22,6 +22,7 @@
*
@@ -450,7 +450,7 @@
#endif /* amd64 */
---- ./hotspot/agent/src/os/bsd/Makefile 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/Makefile 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/Makefile 2011-04-22 22:28:31.000000000 -0700
@@ -22,7 +22,7 @@
#
@@ -649,7 +649,7 @@
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+ return 0;
+}
---- ./hotspot/agent/src/os/bsd/elfmacros.h 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/elfmacros.h 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2011-04-22 22:28:31.000000000 -0700
@@ -25,16 +25,19 @@
#ifndef _ELFMACROS_H_
@@ -951,7 +951,7 @@
+extern void hdestroy_r (struct hsearch_data *__htab);
+
+#endif /* _HSEARCH_R_H_ */
---- ./hotspot/agent/src/os/bsd/libproc.h 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc.h 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/libproc.h 2011-04-22 22:28:31.000000000 -0700
@@ -27,7 +27,8 @@
@@ -1013,7 +1013,7 @@
// get number of shared objects
int get_num_libs(struct ps_prochandle* ph);
---- ./hotspot/agent/src/os/bsd/libproc_impl.c 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc_impl.c 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2011-04-22 22:28:31.000000000 -0700
@@ -174,10 +174,13 @@
return NULL;
@@ -1114,7 +1114,7 @@
+ print_debug("ps_pcontinue not implemented\n");
return PS_OK;
}
---- ./hotspot/agent/src/os/bsd/libproc_impl.h 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc_impl.h 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2011-04-22 22:28:31.000000000 -0700
@@ -47,7 +47,7 @@
typedef struct thread_info {
@@ -1145,7 +1145,7 @@
// part of the class sharing workaround
int classes_jsa_fd; // file descriptor of class share archive
uintptr_t dynamic_addr; // address of dynamic section of a.out
---- ./hotspot/agent/src/os/bsd/mapfile 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/mapfile 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/mapfile 2011-04-22 22:28:31.000000000 -0700
@@ -43,13 +43,17 @@
# proc_service.h functions - to be used by libthread_db
@@ -1168,7 +1168,7 @@
# used by attach test program
init_libproc;
---- ./hotspot/agent/src/os/bsd/proc_service.h 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/proc_service.h 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,76 +0,0 @@
-/*
@@ -1247,7 +1247,7 @@
-ps_err_e ps_get_thread_area();
-
-#endif /* _PROC_SERVICE_H_ */
---- ./hotspot/agent/src/os/bsd/ps_core.c 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/ps_core.c 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/ps_core.c 2011-04-22 22:28:31.000000000 -0700
@@ -142,6 +142,7 @@
@@ -1560,7 +1560,7 @@
struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
if (ph == NULL) {
---- ./hotspot/agent/src/os/bsd/ps_proc.c 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/ps_proc.c 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2011-04-22 22:28:31.000000000 -0700
@@ -22,20 +22,22 @@
*
@@ -2127,7 +2127,7 @@
- }
return ph;
}
---- ./hotspot/agent/src/os/bsd/salibelf.c 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/salibelf.c 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/salibelf.c 2011-04-22 22:28:31.000000000 -0700
@@ -25,6 +25,7 @@
#include "salibelf.h"
@@ -2137,7 +2137,7 @@
extern void print_debug(const char*,...);
---- ./hotspot/agent/src/os/bsd/symtab.c 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/symtab.c 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/symtab.c 2011-04-22 22:28:31.000000000 -0700
@@ -23,10 +23,10 @@
*/
@@ -2538,7 +2538,7 @@
void destroy_symtab(struct symtab* symtab) {
if (!symtab) return;
if (symtab->strs) free(symtab->strs);
---- ./hotspot/agent/src/os/bsd/symtab.h 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/symtab.h 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/symtab.h 2011-04-22 22:28:31.000000000 -0700
@@ -32,7 +32,7 @@
struct symtab;
@@ -2549,7 +2549,7 @@
// destroy the symbol table
void destroy_symtab(struct symtab* symtab);
---- ./hotspot/agent/src/os/bsd/test.c 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/test.c 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/test.c 2011-04-22 22:28:31.000000000 -0700
@@ -44,7 +44,7 @@
}
@@ -2560,7 +2560,7 @@
return 1;
}
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-05-26 17:24:32.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-06-20 09:58:53.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-04-22 22:28:31.000000000 -0700
@@ -28,6 +28,7 @@
import java.net.*;
@@ -2631,7 +2631,7 @@
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-05-26 17:25:12.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-06-20 09:59:30.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-04-22 22:28:31.000000000 -0700
@@ -29,6 +29,7 @@
import java.rmi.*;
@@ -2704,7 +2704,7 @@
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-04-22 22:28:32.000000000 -0700
@@ -30,10 +30,8 @@
import sun.jvm.hotspot.debugger.cdbg.*;
@@ -2731,7 +2731,7 @@
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-04-22 22:28:32.000000000 -0700
@@ -26,9 +26,7 @@
@@ -2754,7 +2754,7 @@
} else {
throw new RuntimeException("cpu " + cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2011-06-25 23:50:15.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 @@
-/*
@@ -2803,7 +2803,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2011-06-25 23:50:15.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 @@
-/*
@@ -2887,7 +2887,7 @@
- private Address sp;
- private BsdDebugger dbg;
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2011-06-25 23:50:15.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 @@
-/*
@@ -2936,7 +2936,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-05-26 17:26:46.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-06-20 10:00:54.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-04-22 22:28:32.000000000 -0700
@@ -37,6 +37,8 @@
import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
@@ -2961,7 +2961,7 @@
}
if (access == null) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-04-22 22:28:32.000000000 -0700
@@ -28,37 +28,36 @@
private static String[] signalNames = {
@@ -3023,7 +3023,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2011-06-25 23:50:15.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 @@
-/*
@@ -3163,7 +3163,7 @@
- return debugger.getThreadForIdentifierAddress(pthreadIdAddr);
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2011-06-25 23:50:15.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 @@
-/*
@@ -3331,7 +3331,7 @@
-
-
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-04-22 22:28:32.000000000 -0700
@@ -28,37 +28,36 @@
private static String[] signalNames = {
@@ -3393,7 +3393,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-05-26 17:27:16.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-06-20 10:01:24.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-04-22 22:28:33.000000000 -0700
@@ -37,6 +37,14 @@
return "solaris";
@@ -3410,7 +3410,7 @@
} else if (os.startsWith("Windows")) {
return "win32";
} else {
---- ./hotspot/make/Makefile 2011-05-26 17:27:30.000000000 -0700
+--- ./hotspot/make/Makefile 2011-06-20 10:01:36.000000000 -0700
+++ ./hotspot/make/Makefile 2011-04-22 22:28:33.000000000 -0700
@@ -323,28 +323,28 @@
ifneq ($(OSNAME),windows)
@@ -3451,7 +3451,7 @@
$(install-file)
endif
endif
---- ./hotspot/make/bsd/Makefile 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/Makefile 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/Makefile 2011-05-07 21:53:43.000000000 -0700
@@ -39,11 +39,11 @@
# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
@@ -3491,7 +3491,7 @@
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
---- ./hotspot/make/bsd/makefiles/buildtree.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/buildtree.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/buildtree.make 2011-04-22 22:28:33.000000000 -0700
@@ -321,10 +321,11 @@
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
@@ -3677,7 +3677,7 @@
+FORCE:
+
+.PHONY: cscope cscope.clean TAGS.clean nametable.clean FORCE
---- ./hotspot/make/bsd/makefiles/defs.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/defs.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -72,8 +72,8 @@
HS_ARCH = sparc
@@ -3785,7 +3785,7 @@
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
-
-
---- ./hotspot/make/bsd/makefiles/gcc.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/gcc.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/gcc.make 2011-05-12 21:07:19.000000000 -0700
@@ -22,24 +22,28 @@
#
@@ -3915,7 +3915,7 @@
#------------------------------------------------------------------------
# Debug flags
---- ./hotspot/make/bsd/makefiles/jsig.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/jsig.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/jsig.make 2011-04-22 22:28:33.000000000 -0700
@@ -25,11 +25,16 @@
# Rules to build signal interposition library, used by vm.make
@@ -3956,7 +3956,7 @@
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
install_jsig: $(LIBJSIG)
---- ./hotspot/make/bsd/makefiles/launcher.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/launcher.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/launcher.make 2011-04-22 22:28:33.000000000 -0700
@@ -50,7 +50,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
@@ -3967,7 +3967,7 @@
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
---- ./hotspot/make/bsd/makefiles/sa.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/sa.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/sa.make 2011-04-23 12:15:44.000000000 -0700
@@ -45,8 +45,8 @@
@@ -3980,7 +3980,7 @@
AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
---- ./hotspot/make/bsd/makefiles/saproc.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/saproc.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/saproc.make 2011-04-22 22:28:33.000000000 -0700
@@ -25,23 +25,34 @@
# Rules to build serviceability agent library, used by vm.make
@@ -4049,7 +4049,7 @@
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
install_saproc: $(BUILDLIBSAPROC)
---- ./hotspot/make/bsd/makefiles/vm.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/vm.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/vm.make 2011-05-14 23:15:36.000000000 -0700
@@ -92,6 +92,10 @@
${JRE_VERSION} \
@@ -4172,7 +4172,7 @@
}
DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
---- ./hotspot/make/bsd/makefiles/zeroshark.make 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/zeroshark.make 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/zeroshark.make 2011-04-22 22:28:33.000000000 -0700
@@ -40,4 +40,23 @@
CFLAGS += -D_LP64=1
@@ -4198,7 +4198,7 @@
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
OPT_CFLAGS/compactingPermGenGen.o = -O1
---- ./hotspot/make/bsd/platform_amd64 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_amd64 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_amd64 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4206,7 +4206,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_amd64.suncc 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_amd64.suncc 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_amd64.suncc 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
@@ -4214,7 +4214,7 @@
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_arm 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_arm 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_arm 1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-os_family = bsd
@@ -4234,7 +4234,7 @@
-gnu_dis_arch = arm
-
-sysdefs = -DBSD -D_GNU_SOURCE -DARM
---- ./hotspot/make/bsd/platform_i486 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_i486 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_i486 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4242,7 +4242,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_i486.suncc 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_i486.suncc 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_i486.suncc 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
@@ -4250,7 +4250,7 @@
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_ia64 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_ia64 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_ia64 2011-04-22 22:28:33.000000000 -0700
@@ -10,6 +10,6 @@
@@ -4260,7 +4260,7 @@
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP
mark_style = alignment
---- ./hotspot/make/bsd/platform_ppc 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_ppc 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_ppc 1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-os_family = bsd
@@ -4280,7 +4280,7 @@
-gnu_dis_arch = ppc
-
-sysdefs = -DBSD -D_GNU_SOURCE -DPPC
---- ./hotspot/make/bsd/platform_sparc 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_sparc 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_sparc 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4288,7 +4288,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_sparcv9 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_sparcv9 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_sparcv9 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4296,7 +4296,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_zero.in 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/make/bsd/platform_zero.in 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/make/bsd/platform_zero.in 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
@@ -4304,7 +4304,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
---- ./hotspot/make/cscope.make 2011-05-26 17:27:31.000000000 -0700
+--- ./hotspot/make/cscope.make 2011-06-20 10:01:36.000000000 -0700
+++ ./hotspot/make/cscope.make 2011-05-07 23:28:29.000000000 -0700
@@ -63,7 +63,7 @@
# space-separated list of identifiers to include only those systems.
@@ -4315,7 +4315,7 @@
endif
# CPU-specific files for all processors are included by default. Set CS_CPU
---- ./hotspot/make/defs.make 2011-05-26 17:27:31.000000000 -0700
+--- ./hotspot/make/defs.make 2011-06-20 10:01:36.000000000 -0700
+++ ./hotspot/make/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -118,13 +118,23 @@
# Windows should have OS predefined
@@ -4343,7 +4343,7 @@
else
OSNAME=solaris
endif
---- ./hotspot/make/linux/makefiles/defs.make 2011-05-26 17:27:34.000000000 -0700
+--- ./hotspot/make/linux/makefiles/defs.make 2011-06-20 10:01:38.000000000 -0700
+++ ./hotspot/make/linux/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -116,33 +116,36 @@
@@ -4387,7 +4387,7 @@
$(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
---- ./hotspot/make/sa.files 2011-05-26 17:27:40.000000000 -0700
+--- ./hotspot/make/sa.files 2011-06-20 10:01:43.000000000 -0700
+++ ./hotspot/make/sa.files 2011-04-22 22:28:33.000000000 -0700
@@ -50,6 +50,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
@@ -4409,7 +4409,7 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \
---- ./hotspot/make/solaris/makefiles/defs.make 2011-05-26 17:27:42.000000000 -0700
+--- ./hotspot/make/solaris/makefiles/defs.make 2011-06-20 10:01:46.000000000 -0700
+++ ./hotspot/make/solaris/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -61,34 +61,37 @@
@@ -4462,7 +4462,7 @@
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/make/templates/bsd-header 2011-05-26 17:27:52.000000000 -0700
+--- ./hotspot/make/templates/bsd-header 2011-06-20 10:01:56.000000000 -0700
+++ ./hotspot/make/templates/bsd-header 1969-12-31 16:00:00.000000000 -0800
@@ -1,28 +0,0 @@
-Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
@@ -4493,7 +4493,7 @@
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---- ./hotspot/make/windows/makefiles/defs.make 2011-05-26 17:27:54.000000000 -0700
+--- ./hotspot/make/windows/makefiles/defs.make 2011-06-20 10:01:57.000000000 -0700
+++ ./hotspot/make/windows/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -109,6 +109,9 @@
@@ -4536,7 +4536,7 @@
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2011-05-26 17:28:09.000000000 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2011-06-20 10:02:08.000000000 -0700
+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2011-04-22 22:28:33.000000000 -0700
@@ -70,7 +70,11 @@
define_pd_global(bool, RewriteBytecodes, true);
@@ -4550,7 +4550,7 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
---- ./hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-05-26 17:28:20.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-06-20 10:02:15.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -81,6 +81,9 @@
#ifdef TARGET_OS_ARCH_windows_x86
@@ -4562,8 +4562,8 @@
#endif // CPU_X86_VM_BYTES_X86_HPP
---- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-05-26 17:28:22.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-04-23 12:09:38.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-06-20 10:02:16.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-06-07 20:02:44.000000000 -0700
@@ -480,8 +480,8 @@
// Fetch the exception from TLS and clear out exception related thread state
__ get_thread(rsi);
@@ -4575,7 +4575,7 @@
__ bind(_unwind_handler_entry);
__ verify_not_null_oop(rax);
---- ./hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-05-26 17:28:24.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-06-20 10:02:18.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_ARCH_windows_x86
@@ -4587,7 +4587,7 @@
static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
---- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2011-05-26 17:28:28.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2011-06-20 10:02:20.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -70,7 +70,11 @@
define_pd_global(bool, RewriteBytecodes, true);
@@ -4601,7 +4601,7 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-05-26 17:28:28.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-06-20 10:02:21.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-05-12 20:54:44.000000000 -0700
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -4631,7 +4631,7 @@
// index is positive and so should have correct value if this code were
// used on 64bits
imulptr(index, reg2);
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-05-26 17:28:29.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-06-20 10:02:21.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-05-12 20:54:44.000000000 -0700
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -4643,7 +4643,7 @@
// Implementation of InterpreterMacroAssembler
---- ./hotspot/src/cpu/x86/vm/jni_x86.h 2011-05-26 17:28:32.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2011-06-20 10:02:23.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2011-04-22 22:28:34.000000000 -0700
@@ -26,7 +26,7 @@
#ifndef _JAVASOFT_JNI_MD_H_
@@ -4654,8 +4654,8 @@
#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)
#define JNIEXPORT __attribute__((visibility("default")))
---- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-05-26 17:28:34.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-04-22 22:28:34.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-06-20 10:02:26.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-06-21 05:38:36.000000000 -0700
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -4666,8 +4666,8 @@
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
---- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-05-26 17:28:35.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-04-22 22:28:34.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-06-20 10:02:26.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-06-21 05:38:36.000000000 -0700
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -4678,7 +4678,7 @@
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
---- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-05-26 17:28:35.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-06-20 10:02:26.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -4690,7 +4690,7 @@
// Implementation of the platform-specific part of StubRoutines - for
// a description of how to extend it, see the stubRoutines.hpp file.
---- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-05-26 17:28:36.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-06-20 10:02:26.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -4702,7 +4702,7 @@
// Implementation of the platform-specific part of StubRoutines - for
// a description of how to extend it, see the stubRoutines.hpp file.
---- ./hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-05-26 17:28:37.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-06-20 10:02:28.000000000 -0700
+++ ./hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-05-27 00:00:43.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -4714,7 +4714,7 @@
int VM_Version::_cpu;
---- ./hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-05-26 17:28:41.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-06-20 10:02:31.000000000 -0700
+++ ./hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -168,6 +168,9 @@
#ifdef TARGET_OS_ARCH_linux_zero
@@ -4726,7 +4726,7 @@
#endif // VM_LITTLE_ENDIAN
---- ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2011-05-26 17:28:44.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2011-06-20 10:02:34.000000000 -0700
+++ ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2011-04-23 12:09:38.000000000 -0700
@@ -52,7 +52,11 @@
define_pd_global(bool, RewriteBytecodes, true);
@@ -4740,7 +4740,7 @@
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
---- ./hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-05-26 17:28:45.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-06-20 10:02:35.000000000 -0700
+++ ./hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -40,5 +40,8 @@
#ifdef TARGET_OS_FAMILY_linux
@@ -4751,7 +4751,7 @@
+#endif
// This file is intentionally empty
---- ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-05-26 17:28:49.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-06-20 10:02:38.000000000 -0700
+++ ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -43,6 +43,9 @@
#ifdef TARGET_OS_FAMILY_linux
@@ -4763,7 +4763,7 @@
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
---- ./hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-05-26 17:28:49.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-06-20 10:02:38.000000000 -0700
+++ ./hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -30,3 +30,6 @@
#ifdef TARGET_OS_FAMILY_linux
@@ -4772,7 +4772,7 @@
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
---- ./hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-05-26 17:28:51.000000000 -0700
+--- ./hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-06-20 10:02:39.000000000 -0700
+++ ./hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -32,5 +32,8 @@
#ifdef TARGET_OS_FAMILY_linux
@@ -4783,7 +4783,7 @@
+#endif
// This file is intentionally empty
---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -337,6 +337,15 @@
@@ -4839,7 +4839,7 @@
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
---- ./hotspot/src/os/bsd/vm/globals_bsd.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/globals_bsd.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/globals_bsd.hpp 2011-05-13 21:09:51.000000000 -0700
@@ -47,7 +47,7 @@
// Defines Bsd-specific default values. The flags are available on all
@@ -4850,7 +4850,7 @@
define_pd_global(bool, UseLargePagesIndividualAllocation, false);
define_pd_global(bool, UseOSErrorReporting, false);
define_pd_global(bool, UseThreadPriorities, true) ;
---- ./hotspot/src/os/bsd/vm/jsig.c 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/jsig.c 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/jsig.c 2011-04-22 22:28:34.000000000 -0700
@@ -35,10 +35,7 @@
#include <pthread.h>
@@ -4874,7 +4874,7 @@
}
static int call_os_sigaction(int sig, const struct sigaction *act,
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -141,38 +141,31 @@
"ILL", SIGILL, /* Illegal instruction (ANSI). */
@@ -4925,7 +4925,7 @@
};
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2011-04-22 22:28:34.000000000 -0700
@@ -54,7 +54,11 @@
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
@@ -4960,7 +4960,7 @@
#endif /* JVM_MD_H */
// Reconciliation History
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -49,8 +49,8 @@
@@ -4973,7 +4973,7 @@
_siginfo = NULL;
_ucontext = NULL;
_expanding_stack = 0;
---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -39,6 +39,12 @@
@@ -5032,7 +5032,7 @@
pthread_t pthread_id() const {
return _pthread_id;
}
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2011-05-20 20:04:01.000000000 -0700
@@ -22,8 +22,6 @@
*
@@ -6615,7 +6615,7 @@
// execve failed
_exit(-1);
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2011-05-07 21:53:43.000000000 -0700
@@ -30,6 +30,12 @@
/* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
@@ -6756,7 +6756,7 @@
// Stack repair handling
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -94,7 +94,15 @@
@@ -6818,7 +6818,7 @@
}
inline int os::recvfrom(int fd, char *buf, int nBytes, int flags,
---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -248,7 +248,7 @@
@@ -6829,7 +6829,7 @@
struct passwd* p;
int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p);
---- ./hotspot/src/os/linux/vm/os_linux.cpp 2011-05-26 17:28:57.000000000 -0700
+--- ./hotspot/src/os/linux/vm/os_linux.cpp 2011-06-20 10:02:42.000000000 -0700
+++ ./hotspot/src/os/linux/vm/os_linux.cpp 2011-05-20 20:03:59.000000000 -0700
@@ -22,8 +22,6 @@
*
@@ -6840,7 +6840,7 @@
// no precompiled headers
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
---- ./hotspot/src/os/posix/launcher/java_md.c 2011-05-26 17:28:59.000000000 -0700
+--- ./hotspot/src/os/posix/launcher/java_md.c 2011-06-20 10:02:43.000000000 -0700
+++ ./hotspot/src/os/posix/launcher/java_md.c 2011-04-22 22:28:34.000000000 -0700
@@ -41,14 +41,21 @@
#include "version_comp.h"
@@ -6995,7 +6995,7 @@
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./hotspot/src/os/posix/launcher/launcher.script 2011-05-26 17:28:59.000000000 -0700
+--- ./hotspot/src/os/posix/launcher/launcher.script 2011-06-20 10:02:43.000000000 -0700
+++ ./hotspot/src/os/posix/launcher/launcher.script 2011-04-22 22:28:34.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/bash
@@ -7003,7 +7003,7 @@
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
---- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,48 +0,0 @@
-/*
@@ -7054,7 +7054,7 @@
-// Use software breakpoint trap until we figure out how to do this on Bsd
-void MacroAssembler::get_psr_trap() { trap(SP_TRAP_SBPT); }
-void MacroAssembler::set_psr_trap() { trap(SP_TRAP_SBPT); }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,218 +0,0 @@
-/*
@@ -7275,7 +7275,7 @@
-}
-
-#endif // OS_CPU_BSD_SPARC_VM_ATOMIC_BSD_SPARC_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-//
@@ -7305,7 +7305,7 @@
-//
-
-// SPARC Bsd Architecture Description File
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800
@@ -1,105 +0,0 @@
-#
@@ -7413,7 +7413,7 @@
- ta 0x03
- retl
- mov %fp, %o0
---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,41 +0,0 @@
-/*
@@ -7457,7 +7457,7 @@
-define_pd_global(bool, UseVectoredExceptions, false);
-
-#endif // OS_CPU_BSD_SPARC_VM_GLOBALS_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,110 +0,0 @@
-/*
@@ -7570,7 +7570,7 @@
-inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); }
-
-#endif // OS_CPU_BSD_SPARC_VM_ORDERACCESS_BSD_SPARC_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,758 +0,0 @@
-/*
@@ -8331,7 +8331,7 @@
- // guard page, only enable glibc guard page for non-Java threads.
- return (thr_type == java_thread ? 0 : page_size());
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,49 +0,0 @@
-/*
@@ -8383,7 +8383,7 @@
- static bool register_code_area(char *low, char *high) { return true; }
-
-#endif // OS_CPU_BSD_SPARC_VM_OS_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,47 +0,0 @@
-/*
@@ -8433,7 +8433,7 @@
-#endif
-
-#endif // OS_CPU_BSD_SPARC_VM_PREFETCH_BSD_SPARC_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,38 +0,0 @@
-/*
@@ -8474,7 +8474,7 @@
-void ThreadLocalStorage::pd_set_thread(Thread* thread) {
- os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,33 +0,0 @@
-/*
@@ -8510,7 +8510,7 @@
- }
-
-#endif // OS_CPU_BSD_SPARC_VM_THREADLS_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,111 +0,0 @@
-/*
@@ -8624,7 +8624,7 @@
-
-void JavaThread::cache_global_variables() { }
-
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,103 +0,0 @@
-/*
@@ -8730,7 +8730,7 @@
- static void disable_register_stack_guard() {}
-
-#endif // OS_CPU_BSD_SPARC_VM_THREAD_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,74 +0,0 @@
-/*
@@ -8807,7 +8807,7 @@
- last_entry()
-
-#endif // OS_CPU_BSD_SPARC_VM_VMSTRUCTS_BSD_SPARC_HPP
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,62 +0,0 @@
-/*
@@ -8872,7 +8872,7 @@
-
- return features;
-}
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2011-04-22 22:28:34.000000000 -0700
@@ -21,6 +21,17 @@
# questions.
@@ -9076,7 +9076,7 @@
# 8(%esp) : return PC
pushl %ebx # 4(%esp) : old %ebx
pushl %edi # 0(%esp) : old %edi
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-04-22 22:28:34.000000000 -0700
@@ -21,6 +21,14 @@
# questions.
@@ -9225,7 +9225,7 @@
cmpq %rdi,%rsi
leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8
jbe acl_CopyRight
---- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -25,7 +25,33 @@
#ifndef OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
@@ -9261,7 +9261,7 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
---- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -25,9 +25,10 @@
#ifndef OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
@@ -9290,7 +9290,7 @@
// Only used on 64 bit Windows platforms
define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -78,23 +78,202 @@
# include <sys/wait.h>
@@ -9891,7 +9891,7 @@
#endif // AMD64
st->cr();
---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -30,8 +30,10 @@
#ifndef AMD64
@@ -9904,7 +9904,7 @@
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
#endif // !AMD64
---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -34,7 +34,7 @@
/******************************/ \
@@ -9915,7 +9915,7 @@
nonstatic_field(OSThread, _pthread_id, pthread_t) \
/* This must be the last entry, and must be present */ \
last_entry()
---- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -31,136 +31,455 @@
#include "runtime/os.hpp"
@@ -10613,7 +10613,7 @@
}
#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -28,18 +28,25 @@
// Efficient swapping of data bytes from Java byte
@@ -10645,7 +10645,7 @@
}
#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
@@ -46,7 +46,12 @@
@@ -10660,7 +10660,7 @@
#ifdef PPC
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2011-05-29 11:28:24.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2011-06-25 23:50:15.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -23,6 +23,10 @@
*
@@ -10777,7 +10777,7 @@
assert(os::current_stack_pointer() >= stack_bottom, "should do");
assert(os::current_stack_pointer() < stack_top, "should do");
---- ./hotspot/src/share/vm/adlc/adlc.hpp 2011-05-26 17:30:48.000000000 -0700
+--- ./hotspot/src/share/vm/adlc/adlc.hpp 2011-06-20 10:04:16.000000000 -0700
+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2011-04-22 22:28:35.000000000 -0700
@@ -67,9 +67,9 @@
#endif
@@ -10791,7 +10791,7 @@
// Macros
#define uint32 unsigned int
---- ./hotspot/src/share/vm/c1/c1_globals.hpp 2011-05-26 17:31:05.000000000 -0700
+--- ./hotspot/src/share/vm/c1/c1_globals.hpp 2011-06-20 10:04:27.000000000 -0700
+++ ./hotspot/src/share/vm/c1/c1_globals.hpp 2011-04-22 22:28:35.000000000 -0700
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10803,7 +10803,7 @@
//
// Defines all global flags used by the client compiler.
---- ./hotspot/src/share/vm/classfile/classLoader.cpp 2011-05-26 17:31:23.000000000 -0700
+--- ./hotspot/src/share/vm/classfile/classLoader.cpp 2011-06-20 10:04:38.000000000 -0700
+++ ./hotspot/src/share/vm/classfile/classLoader.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -68,6 +68,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10815,7 +10815,7 @@
// Entry points in zip.dll for loading zip/jar file entries
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2011-05-26 17:31:26.000000000 -0700
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2011-06-20 10:04:39.000000000 -0700
+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2011-05-20 20:03:59.000000000 -0700
@@ -56,6 +56,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10836,7 +10836,7 @@
}
}
---- ./hotspot/src/share/vm/code/stubs.hpp 2011-05-26 17:31:37.000000000 -0700
+--- ./hotspot/src/share/vm/code/stubs.hpp 2011-06-20 10:04:46.000000000 -0700
+++ ./hotspot/src/share/vm/code/stubs.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10848,7 +10848,7 @@
// The classes in this file provide a simple framework for the
// management of little pieces of machine code - or stubs -
---- ./hotspot/src/share/vm/compiler/disassembler.hpp 2011-05-26 17:31:39.000000000 -0700
+--- ./hotspot/src/share/vm/compiler/disassembler.hpp 2011-06-20 10:04:47.000000000 -0700
+++ ./hotspot/src/share/vm/compiler/disassembler.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10860,7 +10860,7 @@
class decode_env;
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2011-05-26 17:31:41.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2011-06-20 10:04:49.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10872,7 +10872,7 @@
elapsedTimer CMSAdaptiveSizePolicy::_concurrent_timer;
elapsedTimer CMSAdaptiveSizePolicy::_STW_timer;
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2011-05-26 17:31:42.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2011-06-20 10:04:49.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -50,6 +50,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10884,7 +10884,7 @@
//
// ConcurrentMarkSweepPolicy methods
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2011-05-26 17:31:45.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2011-06-20 10:04:52.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10896,7 +10896,7 @@
class ConcurrentMarkSweepGeneration;
class CMSCollector;
---- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2011-05-26 17:31:45.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2011-06-20 10:04:52.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10908,7 +10908,7 @@
#ifndef PRODUCT
Mutex* FreeBlockDictionary::par_lock() const {
---- ./hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2011-05-26 17:31:49.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2011-06-20 10:04:55.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10920,7 +10920,7 @@
bool DirtyCardQueue::apply_closure(CardTableEntryClosure* cl,
bool consume,
---- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2011-05-26 17:31:54.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2011-06-20 10:04:59.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2011-05-07 21:53:41.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10932,7 +10932,7 @@
G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(MemRegion whole_heap,
int max_covered_regions) :
---- ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2011-05-26 17:31:58.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2011-06-20 10:05:02.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10944,7 +10944,7 @@
PtrQueue::PtrQueue(PtrQueueSet* qset, bool perm, bool active) :
_qset(qset), _buf(NULL), _index(0), _active(active),
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2011-05-26 17:32:04.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2011-06-20 10:05:07.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10956,7 +10956,7 @@
bool
ParMarkBitMap::initialize(MemRegion covered_region)
---- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2011-05-26 17:32:10.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2011-06-20 10:05:12.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10968,7 +10968,7 @@
// PSVirtualSpace
---- ./hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2011-05-26 17:32:16.000000000 -0700
+--- ./hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2011-06-20 10:05:17.000000000 -0700
+++ ./hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10980,7 +10980,7 @@
MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) {
---- ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2011-05-26 17:32:18.000000000 -0700
+--- ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2011-06-20 10:05:19.000000000 -0700
+++ ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -10992,7 +10992,7 @@
#ifdef ASSERT
---- ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2011-05-26 17:32:18.000000000 -0700
+--- ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2011-06-20 10:05:19.000000000 -0700
+++ ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -43,6 +43,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11004,7 +11004,7 @@
// Inline allocation implementations.
---- ./hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2011-05-26 17:32:19.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2011-06-20 10:05:19.000000000 -0700
+++ ./hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2011-05-20 20:03:59.000000000 -0700
@@ -56,6 +56,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11016,7 +11016,7 @@
// This file contains the platform-independent parts
// of the abstract interpreter and the abstract interpreter generator.
---- ./hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2011-05-26 17:32:19.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2011-06-20 10:05:21.000000000 -0700
+++ ./hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2011-04-23 12:09:38.000000000 -0700
@@ -65,6 +65,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -11031,7 +11031,7 @@
// no precompiled headers
---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2011-05-26 17:32:21.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2011-06-20 10:05:22.000000000 -0700
+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2011-05-27 00:00:43.000000000 -0700
@@ -92,7 +92,7 @@
// the incoming method. We could lose a line of trace output.
@@ -11051,8 +11051,8 @@
if (Verbose) {
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
---- ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-05-26 17:32:22.000000000 -0700
-+++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-04-22 22:28:36.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-06-20 10:05:23.000000000 -0700
++++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-06-21 05:38:36.000000000 -0700
@@ -41,6 +41,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11063,8 +11063,8 @@
// The InterpreterRuntime is called by the interpreter for everything
// that cannot/should not be dealt with in assembly and needs C support.
---- ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-05-26 17:32:23.000000000 -0700
-+++ ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-05-12 20:54:44.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-06-20 10:05:24.000000000 -0700
++++ ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-06-07 20:02:44.000000000 -0700
@@ -52,6 +52,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11075,7 +11075,7 @@
//------------------------------------------------------------------------------------------------------------------------
// Implementation of FieldAccessInfo
---- ./hotspot/src/share/vm/memory/allocation.cpp 2011-05-26 17:32:26.000000000 -0700
+--- ./hotspot/src/share/vm/memory/allocation.cpp 2011-06-20 10:05:26.000000000 -0700
+++ ./hotspot/src/share/vm/memory/allocation.cpp 2011-05-12 20:54:44.000000000 -0700
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11087,7 +11087,7 @@
void* CHeapObj::operator new(size_t size){
return (void *) AllocateHeap(size, "CHeapObj-new");
---- ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2011-05-26 17:32:28.000000000 -0700
+--- ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2011-06-20 10:05:27.000000000 -0700
+++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2011-05-12 20:54:44.000000000 -0700
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11099,7 +11099,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
#include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp"
---- ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2011-05-26 17:32:29.000000000 -0700
+--- ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2011-06-20 10:05:28.000000000 -0700
+++ ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -48,6 +48,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11111,7 +11111,7 @@
//
// DefNewGeneration functions.
---- ./hotspot/src/share/vm/memory/gcLocker.hpp 2011-05-26 17:32:30.000000000 -0700
+--- ./hotspot/src/share/vm/memory/gcLocker.hpp 2011-06-20 10:05:29.000000000 -0700
+++ ./hotspot/src/share/vm/memory/gcLocker.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -41,6 +41,10 @@
# include "os_windows.inline.hpp"
@@ -11124,7 +11124,7 @@
// The direct lock/unlock calls do not force a collection if an unlock
// decrements the count to zero. Avoid calling these if at all possible.
---- ./hotspot/src/share/vm/memory/genMarkSweep.cpp 2011-05-26 17:32:31.000000000 -0700
+--- ./hotspot/src/share/vm/memory/genMarkSweep.cpp 2011-06-20 10:05:30.000000000 -0700
+++ ./hotspot/src/share/vm/memory/genMarkSweep.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -55,6 +55,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11136,7 +11136,7 @@
void GenMarkSweep::invoke_at_safepoint(int level, ReferenceProcessor* rp,
bool clear_all_softrefs) {
---- ./hotspot/src/share/vm/memory/resourceArea.cpp 2011-05-26 17:32:34.000000000 -0700
+--- ./hotspot/src/share/vm/memory/resourceArea.cpp 2011-06-20 10:05:34.000000000 -0700
+++ ./hotspot/src/share/vm/memory/resourceArea.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11148,7 +11148,7 @@
//------------------------------ResourceMark-----------------------------------
debug_only(int ResourceArea::_warned;) // to suppress multiple warnings
---- ./hotspot/src/share/vm/memory/resourceArea.hpp 2011-05-26 17:32:34.000000000 -0700
+--- ./hotspot/src/share/vm/memory/resourceArea.hpp 2011-06-20 10:05:34.000000000 -0700
+++ ./hotspot/src/share/vm/memory/resourceArea.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11160,7 +11160,7 @@
// The resource area holds temporary data structures in the VM.
// The actual allocation areas are thread local. Typical usage:
---- ./hotspot/src/share/vm/memory/space.hpp 2011-05-26 17:32:35.000000000 -0700
+--- ./hotspot/src/share/vm/memory/space.hpp 2011-06-20 10:05:36.000000000 -0700
+++ ./hotspot/src/share/vm/memory/space.hpp 2011-04-22 22:28:36.000000000 -0700
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11172,7 +11172,7 @@
// A space is an abstraction for the "storage units" backing
// up the generation abstraction. It includes specific
---- ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2011-05-26 17:32:36.000000000 -0700
+--- ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2011-06-20 10:05:36.000000000 -0700
+++ ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11184,7 +11184,7 @@
// Thread-Local Edens support
---- ./hotspot/src/share/vm/memory/universe.cpp 2011-05-26 17:32:36.000000000 -0700
+--- ./hotspot/src/share/vm/memory/universe.cpp 2011-06-20 10:05:37.000000000 -0700
+++ ./hotspot/src/share/vm/memory/universe.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -89,6 +89,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11196,7 +11196,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
---- ./hotspot/src/share/vm/oops/constantPoolKlass.cpp 2011-05-26 17:32:40.000000000 -0700
+--- ./hotspot/src/share/vm/oops/constantPoolKlass.cpp 2011-06-20 10:05:39.000000000 -0700
+++ ./hotspot/src/share/vm/oops/constantPoolKlass.cpp 2011-05-20 20:03:59.000000000 -0700
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11208,7 +11208,7 @@
#ifndef SERIALGC
#include "gc_implementation/parNew/parOopClosures.inline.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
---- ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2011-05-26 17:32:40.000000000 -0700
+--- ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2011-06-20 10:05:39.000000000 -0700
+++ ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2011-04-23 12:09:38.000000000 -0700
@@ -1332,7 +1332,7 @@
}
@@ -11219,8 +11219,8 @@
ent_size = 8;
idx++; // Long takes two cpool slots
break;
---- ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-05-26 17:32:41.000000000 -0700
-+++ ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-04-22 22:28:36.000000000 -0700
+--- ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-06-20 10:05:41.000000000 -0700
++++ ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-06-07 20:02:44.000000000 -0700
@@ -60,6 +60,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
@@ -11231,7 +11231,7 @@
#ifndef SERIALGC
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
---- ./hotspot/src/share/vm/oops/markOop.cpp 2011-05-26 17:32:44.000000000 -0700
+--- ./hotspot/src/share/vm/oops/markOop.cpp 2011-06-20 10:05:44.000000000 -0700
+++ ./hotspot/src/share/vm/oops/markOop.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11243,7 +11243,7 @@
void markOopDesc::print_on(outputStream* st) const {
---- ./hotspot/src/share/vm/oops/oop.cpp 2011-05-26 17:32:47.000000000 -0700
+--- ./hotspot/src/share/vm/oops/oop.cpp 2011-06-20 10:05:47.000000000 -0700
+++ ./hotspot/src/share/vm/oops/oop.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11255,7 +11255,7 @@
bool always_do_update_barrier = false;
---- ./hotspot/src/share/vm/oops/oopsHierarchy.cpp 2011-05-26 17:32:48.000000000 -0700
+--- ./hotspot/src/share/vm/oops/oopsHierarchy.cpp 2011-06-20 10:05:48.000000000 -0700
+++ ./hotspot/src/share/vm/oops/oopsHierarchy.cpp 2011-04-22 22:28:36.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11267,7 +11267,7 @@
#ifdef CHECK_UNHANDLED_OOPS
---- ./hotspot/src/share/vm/opto/c2_globals.hpp 2011-05-26 17:32:52.000000000 -0700
+--- ./hotspot/src/share/vm/opto/c2_globals.hpp 2011-06-20 10:05:51.000000000 -0700
+++ ./hotspot/src/share/vm/opto/c2_globals.hpp 2011-05-12 20:54:44.000000000 -0700
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11279,7 +11279,7 @@
//
// Defines all globals flags used by the server compiler.
---- ./hotspot/src/share/vm/prims/forte.cpp 2011-05-26 17:33:09.000000000 -0700
+--- ./hotspot/src/share/vm/prims/forte.cpp 2011-06-20 10:06:04.000000000 -0700
+++ ./hotspot/src/share/vm/prims/forte.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -640,6 +640,11 @@
// Method to let libcollector know about a dynamically loaded function.
@@ -11301,7 +11301,7 @@
#endif // !_WINDOWS
} // end extern "C"
---- ./hotspot/src/share/vm/prims/jni.cpp 2011-05-26 17:33:09.000000000 -0700
+--- ./hotspot/src/share/vm/prims/jni.cpp 2011-06-20 10:06:04.000000000 -0700
+++ ./hotspot/src/share/vm/prims/jni.cpp 2011-05-07 21:53:42.000000000 -0700
@@ -91,6 +91,10 @@
# include "os_windows.inline.hpp"
@@ -11314,7 +11314,7 @@
static jint CurrentVersion = JNI_VERSION_1_6;
---- ./hotspot/src/share/vm/prims/jvm.cpp 2011-05-26 17:33:10.000000000 -0700
+--- ./hotspot/src/share/vm/prims/jvm.cpp 2011-06-20 10:06:05.000000000 -0700
+++ ./hotspot/src/share/vm/prims/jvm.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -72,6 +72,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11326,7 +11326,7 @@
#include <errno.h>
---- ./hotspot/src/share/vm/prims/jvm.h 2011-05-26 17:33:10.000000000 -0700
+--- ./hotspot/src/share/vm/prims/jvm.h 2011-06-20 10:06:05.000000000 -0700
+++ ./hotspot/src/share/vm/prims/jvm.h 2011-04-23 12:09:39.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11338,7 +11338,7 @@
#ifndef _JAVASOFT_JVM_H_
#define _JAVASOFT_JVM_H_
---- ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2011-05-26 17:33:12.000000000 -0700
+--- ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2011-06-20 10:06:06.000000000 -0700
+++ ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2011-05-07 21:53:42.000000000 -0700
@@ -68,6 +68,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11350,7 +11350,7 @@
---- ./hotspot/src/share/vm/prims/jvmtiImpl.cpp 2011-05-26 17:33:15.000000000 -0700
+--- ./hotspot/src/share/vm/prims/jvmtiImpl.cpp 2011-06-20 10:06:09.000000000 -0700
+++ ./hotspot/src/share/vm/prims/jvmtiImpl.cpp 2011-05-12 20:54:44.000000000 -0700
@@ -54,6 +54,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11362,7 +11362,7 @@
//
// class JvmtiAgentThread
---- ./hotspot/src/share/vm/prims/nativeLookup.cpp 2011-05-26 17:33:19.000000000 -0700
+--- ./hotspot/src/share/vm/prims/nativeLookup.cpp 2011-06-20 10:06:12.000000000 -0700
+++ ./hotspot/src/share/vm/prims/nativeLookup.cpp 2011-04-23 12:09:39.000000000 -0700
@@ -49,6 +49,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11374,7 +11374,7 @@
static void mangle_name_on(outputStream* st, Symbol* name, int begin, int end) {
---- ./hotspot/src/share/vm/runtime/arguments.cpp 2011-05-26 17:33:21.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/arguments.cpp 2011-06-20 10:06:14.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/arguments.cpp 2011-05-12 20:54:44.000000000 -0700
@@ -55,6 +55,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11386,7 +11386,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
#endif
---- ./hotspot/src/share/vm/runtime/atomic.cpp 2011-05-26 17:33:21.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/atomic.cpp 2011-06-20 10:06:15.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/atomic.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11411,7 +11411,7 @@
jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) {
assert(sizeof(jbyte) == 1, "assumption.");
---- ./hotspot/src/share/vm/runtime/fprofiler.hpp 2011-05-26 17:33:24.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/fprofiler.hpp 2011-06-20 10:06:18.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/fprofiler.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11423,8 +11423,8 @@
// a simple flat profiler for Java
---- ./hotspot/src/share/vm/runtime/globals.hpp 2011-05-26 17:33:25.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/globals.hpp 2011-05-27 00:00:44.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/globals.hpp 2011-06-20 10:06:18.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/globals.hpp 2011-06-21 05:38:37.000000000 -0700
@@ -50,6 +50,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "globals_windows.hpp"
@@ -11468,7 +11468,7 @@
#endif
#ifdef SHARK
#ifdef TARGET_ARCH_zero
---- ./hotspot/src/share/vm/runtime/handles.cpp 2011-05-26 17:33:25.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/handles.cpp 2011-06-20 10:06:19.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/handles.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -38,6 +38,10 @@
# include "os_windows.inline.hpp"
@@ -11481,7 +11481,7 @@
#ifdef ASSERT
oop* HandleArea::allocate_handle(oop obj) {
---- ./hotspot/src/share/vm/runtime/handles.inline.hpp 2011-05-26 17:33:25.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/handles.inline.hpp 2011-06-20 10:06:19.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/handles.inline.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11493,7 +11493,7 @@
// these inline functions are in a separate file to break an include cycle
// between Thread and Handle
---- ./hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-05-26 17:33:26.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-06-20 10:06:20.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11515,7 +11515,7 @@
};
---- ./hotspot/src/share/vm/runtime/java.cpp 2011-05-26 17:33:26.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/java.cpp 2011-06-20 10:06:20.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/java.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -85,6 +85,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11527,7 +11527,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
---- ./hotspot/src/share/vm/runtime/javaCalls.cpp 2011-05-26 17:33:27.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/javaCalls.cpp 2011-06-20 10:06:20.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/javaCalls.cpp 2011-05-07 21:53:42.000000000 -0700
@@ -48,6 +48,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11539,7 +11539,7 @@
// -----------------------------------------------------
// Implementation of JavaCallWrapper
---- ./hotspot/src/share/vm/runtime/javaCalls.hpp 2011-05-26 17:33:27.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/javaCalls.hpp 2011-06-20 10:06:20.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/javaCalls.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -54,6 +54,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11551,7 +11551,7 @@
// A JavaCallWrapper is constructed before each JavaCall and destructed after the call.
// Its purpose is to allocate/deallocate a new handle block and to save/restore the last
---- ./hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2011-05-26 17:33:27.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2011-06-20 10:06:20.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -50,6 +50,13 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -11567,7 +11567,7 @@
//
// An object for encapsulating the machine/os dependent part of a JavaThread frame state
//
---- ./hotspot/src/share/vm/runtime/jniHandles.cpp 2011-05-26 17:33:27.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/jniHandles.cpp 2011-06-20 10:06:21.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/jniHandles.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11579,7 +11579,7 @@
JNIHandleBlock* JNIHandles::_global_handles = NULL;
---- ./hotspot/src/share/vm/runtime/memprofiler.cpp 2011-05-26 17:33:28.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/memprofiler.cpp 2011-06-20 10:06:21.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/memprofiler.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -46,6 +46,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11591,7 +11591,7 @@
#ifndef PRODUCT
---- ./hotspot/src/share/vm/runtime/mutex.cpp 2011-05-26 17:33:28.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/mutex.cpp 2011-06-20 10:06:22.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/mutex.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -39,6 +39,10 @@
# include "mutex_windows.inline.hpp"
@@ -11604,7 +11604,7 @@
// o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o
//
---- ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2011-05-26 17:33:28.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2011-06-20 10:06:22.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11616,7 +11616,7 @@
// Mutexes used in the VM (see comment in mutexLocker.hpp):
//
---- ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2011-05-26 17:33:29.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2011-06-20 10:06:22.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11628,7 +11628,7 @@
// Mutexes used in the VM.
---- ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2011-05-26 17:33:29.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2011-06-20 10:06:22.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -50,6 +50,10 @@
# include "os_windows.inline.hpp"
@@ -11641,7 +11641,7 @@
#if defined(__GNUC__) && !defined(IA64)
// Need to inhibit inlining for older versions of GCC to avoid build-time failures
---- ./hotspot/src/share/vm/runtime/os.cpp 2011-05-26 17:33:29.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/os.cpp 2011-06-20 10:06:23.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/os.cpp 2011-04-23 12:09:39.000000000 -0700
@@ -60,6 +60,10 @@
# include "os_windows.inline.hpp"
@@ -11680,7 +11680,7 @@
}
static jboolean onLoaded = JNI_FALSE;
if (onLoaded) {
---- ./hotspot/src/share/vm/runtime/os.hpp 2011-05-26 17:33:29.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/os.hpp 2011-06-20 10:06:23.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/os.hpp 2011-05-12 20:54:45.000000000 -0700
@@ -30,6 +30,9 @@
#include "runtime/extendedPC.hpp"
@@ -11725,7 +11725,7 @@
// debugging support (mostly used by debug.cpp but also fatal error handler)
---- ./hotspot/src/share/vm/runtime/osThread.hpp 2011-05-26 17:33:30.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/osThread.hpp 2011-06-20 10:06:23.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/osThread.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -109,6 +109,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11737,7 +11737,7 @@
};
---- ./hotspot/src/share/vm/runtime/safepoint.cpp 2011-05-26 17:33:33.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/safepoint.cpp 2011-06-20 10:06:26.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/safepoint.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -78,6 +78,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11749,7 +11749,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/shared/concurrentGCThread.hpp"
---- ./hotspot/src/share/vm/runtime/synchronizer.cpp 2011-05-26 17:33:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/synchronizer.cpp 2011-06-20 10:06:30.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/synchronizer.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -51,6 +51,10 @@
# include "os_windows.inline.hpp"
@@ -11762,7 +11762,7 @@
#if defined(__GNUC__) && !defined(IA64)
// Need to inhibit inlining for older versions of GCC to avoid build-time failures
---- ./hotspot/src/share/vm/runtime/task.cpp 2011-05-26 17:33:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/task.cpp 2011-06-20 10:06:30.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/task.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -39,6 +39,10 @@
# include "os_windows.inline.hpp"
@@ -11775,7 +11775,7 @@
int PeriodicTask::_num_tasks = 0;
PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks];
---- ./hotspot/src/share/vm/runtime/thread.cpp 2011-05-26 17:33:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/thread.cpp 2011-06-20 10:06:30.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/thread.cpp 2011-05-27 00:00:44.000000000 -0700
@@ -89,6 +89,10 @@
# include "os_windows.inline.hpp"
@@ -11788,7 +11788,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
---- ./hotspot/src/share/vm/runtime/thread.hpp 2011-05-26 17:33:37.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/thread.hpp 2011-06-20 10:06:30.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/thread.hpp 2011-05-27 00:00:44.000000000 -0700
@@ -1610,6 +1610,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -11803,7 +11803,7 @@
public:
---- ./hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2011-05-26 17:33:38.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2011-06-20 10:06:30.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -36,6 +36,10 @@
# include "os_windows.inline.hpp"
@@ -11816,7 +11816,7 @@
// static member initialization
int ThreadLocalStorage::_thread_index = -1;
---- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2011-05-26 17:33:38.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2011-06-20 10:06:31.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -68,6 +68,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -11831,7 +11831,7 @@
public:
---- ./hotspot/src/share/vm/runtime/timer.cpp 2011-05-26 17:33:38.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/timer.cpp 2011-06-20 10:06:31.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/timer.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11843,7 +11843,7 @@
void elapsedTimer::add(elapsedTimer t) {
---- ./hotspot/src/share/vm/runtime/virtualspace.cpp 2011-05-26 17:33:39.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/virtualspace.cpp 2011-06-20 10:06:32.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11855,7 +11855,7 @@
// ReservedSpace
---- ./hotspot/src/share/vm/runtime/vmStructs.cpp 2011-05-26 17:33:40.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vmStructs.cpp 2011-06-20 10:06:33.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/vmStructs.cpp 2011-05-27 00:00:44.000000000 -0700
@@ -125,6 +125,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11880,7 +11880,7 @@
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsPermGen.hpp"
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
---- ./hotspot/src/share/vm/runtime/vmThread.cpp 2011-05-26 17:33:40.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp 2011-06-20 10:06:33.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/vmThread.cpp 2011-05-07 21:53:42.000000000 -0700
@@ -46,6 +46,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11892,7 +11892,7 @@
HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int);
HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int);
---- ./hotspot/src/share/vm/runtime/vmThread.hpp 2011-05-26 17:33:40.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vmThread.hpp 2011-06-20 10:06:33.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/vmThread.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11904,7 +11904,7 @@
//
// Prioritized queue of VM operations.
---- ./hotspot/src/share/vm/runtime/vm_operations.cpp 2011-05-26 17:33:40.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vm_operations.cpp 2011-06-20 10:06:33.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/vm_operations.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11916,7 +11916,7 @@
#define VM_OP_NAME_INITIALIZE(name) #name,
---- ./hotspot/src/share/vm/runtime/vm_version.cpp 2011-05-26 17:33:41.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2011-06-20 10:06:34.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -166,7 +166,8 @@
@@ -11928,7 +11928,7 @@
#ifdef ZERO
#define CPU ZERO_LIBARCH
---- ./hotspot/src/share/vm/utilities/accessFlags.cpp 2011-05-26 17:33:55.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/accessFlags.cpp 2011-06-20 10:06:45.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/accessFlags.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11940,7 +11940,7 @@
void AccessFlags::atomic_set_bits(jint bits) {
---- ./hotspot/src/share/vm/utilities/array.cpp 2011-05-26 17:33:55.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/array.cpp 2011-06-20 10:06:45.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/array.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11952,7 +11952,7 @@
#ifdef ASSERT
---- ./hotspot/src/share/vm/utilities/bitMap.cpp 2011-05-26 17:33:56.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/bitMap.cpp 2011-06-20 10:06:45.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/bitMap.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -11964,7 +11964,7 @@
BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) :
---- ./hotspot/src/share/vm/utilities/debug.cpp 2011-05-26 17:33:57.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/debug.cpp 2011-06-20 10:06:46.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/debug.cpp 2011-05-12 20:54:45.000000000 -0700
@@ -62,6 +62,10 @@
# include "os_windows.inline.hpp"
@@ -14585,7 +14585,7 @@
+__END_DECLS
+
+#endif /* elf.h */
---- ./hotspot/src/share/vm/utilities/elfFile.hpp 2011-05-26 17:33:59.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/elfFile.hpp 2011-06-20 10:06:47.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/elfFile.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -27,7 +27,13 @@
@@ -14622,7 +14622,7 @@
#include "globalDefinitions.hpp"
#include "memory/allocation.hpp"
---- ./hotspot/src/share/vm/utilities/events.cpp 2011-05-26 17:34:00.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/events.cpp 2011-06-20 10:06:48.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/events.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14634,7 +14634,7 @@
#ifndef PRODUCT
---- ./hotspot/src/share/vm/utilities/exceptions.cpp 2011-05-26 17:34:00.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/exceptions.cpp 2011-06-20 10:06:49.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/exceptions.cpp 2011-05-07 21:53:42.000000000 -0700
@@ -42,6 +42,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14646,7 +14646,7 @@
// Implementation of ThreadShadow
---- ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-05-26 17:34:01.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-06-20 10:06:49.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-04-23 12:09:39.000000000 -0700
@@ -25,6 +25,8 @@
#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
@@ -14718,7 +14718,7 @@
// Enable zap-a-lot if in debug version.
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-05-26 17:34:01.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-06-20 10:06:49.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-04-23 12:13:39.000000000 -0700
@@ -76,15 +76,28 @@
# include <sys/procfs.h>
@@ -14789,7 +14789,7 @@
inline int g_isnan(float f) { return isnanf(f); }
inline int g_isnan(double f) { return isnan(f); }
#else
---- ./hotspot/src/share/vm/utilities/growableArray.cpp 2011-05-26 17:34:01.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/growableArray.cpp 2011-06-20 10:06:50.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/growableArray.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14801,7 +14801,7 @@
#ifdef ASSERT
void GenericGrowableArray::set_nesting() {
if (on_stack()) {
---- ./hotspot/src/share/vm/utilities/histogram.hpp 2011-05-26 17:34:02.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/histogram.hpp 2011-06-20 10:06:50.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/histogram.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14813,7 +14813,7 @@
// This class provides a framework for collecting various statistics.
// The current implementation is oriented towards counting invocations
---- ./hotspot/src/share/vm/utilities/macros.hpp 2011-05-26 17:34:03.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/macros.hpp 2011-06-20 10:06:51.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/macros.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -161,6 +161,14 @@
#define NOT_WINDOWS(code) code
@@ -14830,7 +14830,7 @@
#ifdef _WIN64
#define WIN64_ONLY(code) code
#define NOT_WIN64(code)
---- ./hotspot/src/share/vm/utilities/ostream.cpp 2011-05-26 17:34:04.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/ostream.cpp 2011-06-20 10:06:51.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2011-04-22 22:28:37.000000000 -0700
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14851,7 +14851,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
---- ./hotspot/src/share/vm/utilities/preserveException.hpp 2011-05-26 17:34:04.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/preserveException.hpp 2011-06-20 10:06:52.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/preserveException.hpp 2011-04-22 22:28:37.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14863,7 +14863,7 @@
// This file provides more support for exception handling; see also exceptions.hpp
class PreserveExceptionMark {
---- ./hotspot/src/share/vm/utilities/taskqueue.cpp 2011-05-26 17:34:05.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/taskqueue.cpp 2011-06-20 10:06:53.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/taskqueue.cpp 2011-04-22 22:28:38.000000000 -0700
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14875,7 +14875,7 @@
#ifdef TRACESPINNING
uint ParallelTaskTerminator::_total_yields = 0;
---- ./hotspot/src/share/vm/utilities/taskqueue.hpp 2011-05-26 17:34:05.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/taskqueue.hpp 2011-06-20 10:06:53.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/taskqueue.hpp 2011-04-22 22:28:38.000000000 -0700
@@ -53,6 +53,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
@@ -14890,7 +14890,7 @@
// Simple TaskQueue stats that are collected by default in debug builds.
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2011-05-26 17:34:07.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/vmError.cpp 2011-06-20 10:06:54.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2011-04-22 22:28:38.000000000 -0700
@@ -45,13 +45,18 @@
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
@@ -14921,7 +14921,7 @@
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
---- ./hotspot/src/share/vm/utilities/workgroup.hpp 2011-05-26 17:34:08.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/workgroup.hpp 2011-06-20 10:06:54.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/workgroup.hpp 2011-04-22 22:28:38.000000000 -0700
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
@@ -14933,7 +14933,7 @@
// Task class hierarchy:
// AbstractGangTask
---- ./hotspot/test/Makefile 2011-05-26 17:34:08.000000000 -0700
+--- ./hotspot/test/Makefile 2011-06-20 10:06:55.000000000 -0700
+++ ./hotspot/test/Makefile 2011-04-22 22:28:38.000000000 -0700
@@ -44,6 +44,22 @@
ARCH = i586
@@ -14967,7 +14967,7 @@
ifdef TESTDIRS
JTREG_TESTDIRS = $(TESTDIRS)
endif
---- ./hotspot/test/jprt.config 2011-05-26 17:34:32.000000000 -0700
+--- ./hotspot/test/jprt.config 2011-06-20 10:07:14.000000000 -0700
+++ ./hotspot/test/jprt.config 2011-04-22 22:28:38.000000000 -0700
@@ -75,8 +75,8 @@
@@ -15036,7 +15036,7 @@
# Export PATH setting
PATH="${path4sdk}"
---- ./hotspot/test/runtime/6929067/Test6929067.sh 2011-05-26 17:34:35.000000000 -0700
+--- ./hotspot/test/runtime/6929067/Test6929067.sh 2011-06-20 10:07:16.000000000 -0700
+++ ./hotspot/test/runtime/6929067/Test6929067.sh 2011-04-22 22:28:38.000000000 -0700
@@ -29,7 +29,7 @@
PS=":"
@@ -15047,40 +15047,51 @@
NULL=NUL
PS=";"
FS="\\"
---- ./jaxp/.hgtags 2011-05-26 17:46:21.000000000 -0700
-+++ ./jaxp/.hgtags 2011-05-27 00:00:49.000000000 -0700
-@@ -118,3 +118,4 @@
- e1b5ef243445bf836d095fd44866e1771ef99374 jdk7-b141
- 7d067af4b25e4b7e6b28bef48527d67f8650e6c5 jdk7-b142
+--- ./hotspot/test/runtime/7020373/Test7020373.sh 2011-06-20 10:07:17.000000000 -0700
++++ ./hotspot/test/runtime/7020373/Test7020373.sh 2011-06-21 18:23:22.000000000 -0700
+@@ -32,7 +32,7 @@
+ # set platform-dependent variables
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux )
++ SunOS | Linux | *BSD | Darwin )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+--- ./jaxp/.hgtags 2011-06-20 10:11:28.000000000 -0700
++++ ./jaxp/.hgtags 2011-06-21 05:38:40.000000000 -0700
+@@ -120,3 +120,4 @@
16b847e9bbd747f9d27785b2fc20d4d720cca893 jdk7-b143
-+39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144
---- ./jaxp/.jcheck/conf 2011-05-26 17:46:21.000000000 -0700
+ 39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144
+ 10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145
++bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
+--- ./jaxp/.jcheck/conf 2011-06-20 10:11:28.000000000 -0700
+++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jaxws/.hgtags 2011-05-26 17:53:54.000000000 -0700
-+++ ./jaxws/.hgtags 2011-05-27 00:00:52.000000000 -0700
-@@ -118,3 +118,4 @@
- 66826b0aec5a1834da3821c35cf85ac154e9b04d jdk7-b141
- 0ef3ef823c39eee3d670e58027c3219cb66f0283 jdk7-b142
+--- ./jaxws/.hgtags 2011-06-20 10:21:14.000000000 -0700
++++ ./jaxws/.hgtags 2011-06-21 05:38:46.000000000 -0700
+@@ -120,3 +120,4 @@
569d1e7ea980d172046c4aba79d96b5c3afabbba jdk7-b143
-+6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144
---- ./jaxws/.jcheck/conf 2011-05-26 17:53:54.000000000 -0700
+ 6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144
+ 42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145
++05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
+--- ./jaxws/.jcheck/conf 2011-06-20 10:21:15.000000000 -0700
+++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/.hgtags 2011-05-26 18:33:40.000000000 -0700
-+++ ./jdk/.hgtags 2011-05-27 00:01:00.000000000 -0700
-@@ -118,3 +118,4 @@
- 63eeefe118da18c75ba3d36266768cd1ccaaca6b jdk7-b141
- 312612e89ece62633f4809706dec00bcd5fe7c2d jdk7-b142
+--- ./jdk/.hgtags 2011-06-20 11:31:23.000000000 -0700
++++ ./jdk/.hgtags 2011-06-21 05:39:00.000000000 -0700
+@@ -120,3 +120,4 @@
efbf75c24b0f31847c9c403f6dc07dc80551908d jdk7-b143
-+23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144
---- ./jdk/.jcheck/conf 2011-05-26 18:33:40.000000000 -0700
+ 23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144
+ 1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145
++539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
+--- ./jdk/.jcheck/conf 2011-06-20 11:31:24.000000000 -0700
+++ ./jdk/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/make/com/sun/java/pack/Makefile 2011-05-26 18:33:44.000000000 -0700
+--- ./jdk/make/com/sun/java/pack/Makefile 2011-06-20 11:31:42.000000000 -0700
+++ ./jdk/make/com/sun/java/pack/Makefile 2011-05-07 21:54:09.000000000 -0700
@@ -57,6 +57,7 @@
vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
@@ -15113,7 +15124,7 @@
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
---- ./jdk/make/com/sun/nio/Makefile 2011-05-26 18:33:46.000000000 -0700
+--- ./jdk/make/com/sun/nio/Makefile 2011-06-20 11:31:45.000000000 -0700
+++ ./jdk/make/com/sun/nio/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -30,7 +30,16 @@
BUILDDIR = ../../..
@@ -15132,7 +15143,7 @@
include $(BUILDDIR)/common/Subdirs.gmk
all build clean clobber::
---- ./jdk/make/com/sun/nio/sctp/Makefile 2011-05-26 18:33:47.000000000 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile 2011-06-20 11:31:46.000000000 -0700
+++ ./jdk/make/com/sun/nio/sctp/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -59,15 +59,11 @@
-I$(PLATFORM_SRC)/native/java/net \
@@ -15152,7 +15163,7 @@
else # windows
include $(BUILDDIR)/common/Classes.gmk
---- ./jdk/make/com/sun/security/auth/module/Makefile 2011-05-26 18:33:49.000000000 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile 2011-06-20 11:31:50.000000000 -0700
+++ ./jdk/make/com/sun/security/auth/module/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
@@ -15163,7 +15174,7 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2011-05-26 18:33:51.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2011-06-20 11:31:51.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,5 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
@@ -15175,7 +15186,7 @@
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2011-05-26 18:33:51.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2011-06-20 11:31:51.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -39,4 +39,7 @@
LinuxVirtualMachine.c
@@ -15186,7 +15197,7 @@
+FILES_c = \
+ BsdVirtualMachine.c
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2011-05-26 18:33:51.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2011-06-20 11:31:51.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,6 +43,11 @@
sun/tools/attach/LinuxAttachProvider.java
@@ -15200,8 +15211,8 @@
#
# Files that need to be copied
#
---- ./jdk/make/com/sun/tools/attach/Makefile 2011-05-26 18:33:51.000000000 -0700
-+++ ./jdk/make/com/sun/tools/attach/Makefile 2011-04-22 23:08:15.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile 2011-06-20 11:31:51.000000000 -0700
++++ ./jdk/make/com/sun/tools/attach/Makefile 2011-06-21 05:39:00.000000000 -0700
@@ -36,6 +36,9 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
@@ -15212,7 +15223,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2011-04-22 23:08:15.000000000 -0700
@@ -30,14 +30,12 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
@@ -15230,7 +15241,7 @@
local:
*;
};
---- ./jdk/make/common/Defs-bsd.gmk 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/make/common/Defs-bsd.gmk 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/make/common/Defs-bsd.gmk 2011-05-07 22:01:55.000000000 -0700
@@ -25,7 +25,7 @@
@@ -15454,7 +15465,7 @@
ifeq ($(ARCH), ia64)
INCLUDE_SA = false
else
---- ./jdk/make/common/Defs-linux.gmk 2011-05-26 18:33:52.000000000 -0700
+--- ./jdk/make/common/Defs-linux.gmk 2011-06-20 11:31:53.000000000 -0700
+++ ./jdk/make/common/Defs-linux.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -323,8 +323,10 @@
override LIBSOCKET =
@@ -15467,7 +15478,7 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs-solaris.gmk 2011-05-26 18:33:52.000000000 -0700
+--- ./jdk/make/common/Defs-solaris.gmk 2011-06-20 11:31:53.000000000 -0700
+++ ./jdk/make/common/Defs-solaris.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -648,6 +648,9 @@
# Network Services library
@@ -15479,7 +15490,7 @@
# GLOBAL_KPIC: If set means all libraries are PIC, position independent code
# EXCEPT for select compiles
# If a .o file is compiled non-PIC then it should be forced
---- ./jdk/make/common/Defs.gmk 2011-05-26 18:33:52.000000000 -0700
+--- ./jdk/make/common/Defs.gmk 2011-06-20 11:31:54.000000000 -0700
+++ ./jdk/make/common/Defs.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -109,6 +109,49 @@
endif
@@ -15550,7 +15561,7 @@
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./jdk/make/common/Program.gmk 2011-05-26 18:33:53.000000000 -0700
+--- ./jdk/make/common/Program.gmk 2011-06-20 11:31:54.000000000 -0700
+++ ./jdk/make/common/Program.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -73,11 +73,27 @@
# Create a dependency on libjli (Java Launcher Infrastructure)
@@ -15612,8 +15623,8 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk 2011-05-26 18:33:53.000000000 -0700
-+++ ./jdk/make/common/Release.gmk 2011-05-12 20:55:05.000000000 -0700
+--- ./jdk/make/common/Release.gmk 2011-06-20 11:31:54.000000000 -0700
++++ ./jdk/make/common/Release.gmk 2011-06-21 05:39:00.000000000 -0700
@@ -128,7 +128,6 @@
JDK_MAN_PAGES = \
$(JRE_MAN_PAGES) \
@@ -15648,7 +15659,7 @@
#
# Specific files and directories that will be filtered out from above areas.
-@@ -990,7 +1001,7 @@
+@@ -992,7 +1003,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.
@@ -15657,7 +15668,7 @@
for d in $(SOURCE_DIRS); do \
$(RM) $(ABS_TEMPDIR)/src-files.list; \
($(CD) $$d && \
-@@ -1003,7 +1014,7 @@
+@@ -1005,7 +1016,7 @@
done ; \
) ; \
if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \
@@ -15666,7 +15677,7 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/shared/Compiler-gcc.gmk 2011-05-26 18:33:54.000000000 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk 2011-06-20 11:31:56.000000000 -0700
+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -72,6 +72,24 @@
@@ -15693,7 +15704,7 @@
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./jdk/make/common/shared/Defs-bsd.gmk 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/make/common/shared/Defs-bsd.gmk 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/make/common/shared/Defs-bsd.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -15771,7 +15782,7 @@
else
define binary_file_verification
( \
---- ./jdk/make/common/shared/Defs-utils.gmk 2011-05-26 18:33:55.000000000 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk 2011-06-20 11:31:57.000000000 -0700
+++ ./jdk/make/common/shared/Defs-utils.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -67,6 +67,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
@@ -15836,7 +15847,7 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs-versions.gmk 2011-05-26 18:33:55.000000000 -0700
+--- ./jdk/make/common/shared/Defs-versions.gmk 2011-06-20 11:31:57.000000000 -0700
+++ ./jdk/make/common/shared/Defs-versions.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -44,6 +44,11 @@
override CC_VERSION = gcc
@@ -15850,7 +15861,7 @@
##########################################################################
#
# List of JDK official minimum, expected, or required versions:
---- ./jdk/make/common/shared/Platform.gmk 2011-05-26 18:33:55.000000000 -0700
+--- ./jdk/make/common/shared/Platform.gmk 2011-06-20 11:31:58.000000000 -0700
+++ ./jdk/make/common/shared/Platform.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -86,7 +86,7 @@
SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
@@ -15997,7 +16008,7 @@
# If blanks in the username, use the first 4 words and pack them together
_USER1:=$(subst ', ,$(_USER))
_USER2:=$(subst ", ,$(_USER1))
---- ./jdk/make/common/shared/Sanity.gmk 2011-05-26 18:33:55.000000000 -0700
+--- ./jdk/make/common/shared/Sanity.gmk 2011-06-20 11:31:58.000000000 -0700
+++ ./jdk/make/common/shared/Sanity.gmk 2011-05-07 23:39:41.000000000 -0700
@@ -140,6 +140,9 @@
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
@@ -16028,7 +16039,7 @@
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
---- ./jdk/make/java/Makefile 2011-05-26 18:33:56.000000000 -0700
+--- ./jdk/make/java/Makefile 2011-06-20 11:31:59.000000000 -0700
+++ ./jdk/make/java/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -53,7 +53,7 @@
endif
@@ -16039,7 +16050,7 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/instrument/Makefile 2011-05-26 18:33:57.000000000 -0700
+--- ./jdk/make/java/instrument/Makefile 2011-06-20 11:32:00.000000000 -0700
+++ ./jdk/make/java/instrument/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -102,9 +102,29 @@
# equivalent of strcasecmp is stricmp on Windows
@@ -16080,7 +16091,7 @@
#
# Library to compile.
---- ./jdk/make/java/java/Makefile 2011-05-26 18:33:58.000000000 -0700
+--- ./jdk/make/java/java/Makefile 2011-06-20 11:32:01.000000000 -0700
+++ ./jdk/make/java/java/Makefile 2011-05-12 20:55:05.000000000 -0700
@@ -165,8 +165,10 @@
# Is the altzone extern documented in ctime(3C) available?
@@ -16102,7 +16113,7 @@
-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
endif
---- ./jdk/make/java/java/genlocales.gmk 2011-05-26 18:33:58.000000000 -0700
+--- ./jdk/make/java/java/genlocales.gmk 2011-06-20 11:32:01.000000000 -0700
+++ ./jdk/make/java/java/genlocales.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -76,10 +76,14 @@
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
@@ -16123,7 +16134,7 @@
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
---- ./jdk/make/java/java/localegen.sh 2011-05-26 18:33:58.000000000 -0700
+--- ./jdk/make/java/java/localegen.sh 2011-06-20 11:32:02.000000000 -0700
+++ ./jdk/make/java/java/localegen.sh 2011-04-22 23:08:15.000000000 -0700
@@ -55,9 +55,9 @@
for FILE in $RESOURCE_NAMES
@@ -16137,7 +16148,7 @@
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
---- ./jdk/make/java/java_hprof_demo/Makefile 2011-05-26 18:33:59.000000000 -0700
+--- ./jdk/make/java/java_hprof_demo/Makefile 2011-06-20 11:32:03.000000000 -0700
+++ ./jdk/make/java/java_hprof_demo/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -83,7 +83,7 @@
ifeq ($(PLATFORM), windows)
@@ -16148,7 +16159,7 @@
endif
#
---- ./jdk/make/java/jli/Makefile 2011-05-26 18:33:59.000000000 -0700
+--- ./jdk/make/java/jli/Makefile 2011-06-20 11:32:03.000000000 -0700
+++ ./jdk/make/java/jli/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -44,7 +44,9 @@
@@ -16240,7 +16251,7 @@
+ vpath %.c $(ZIP_SRC)
+endif
+
---- ./jdk/make/java/net/FILES_c.gmk 2011-05-26 18:34:02.000000000 -0700
+--- ./jdk/make/java/net/FILES_c.gmk 2011-06-20 11:32:06.000000000 -0700
+++ ./jdk/make/java/net/FILES_c.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,6 +43,10 @@
FILES_c += linux_close.c
@@ -16253,7 +16264,7 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile 2011-05-26 18:34:02.000000000 -0700
+--- ./jdk/make/java/net/Makefile 2011-06-20 11:32:06.000000000 -0700
+++ ./jdk/make/java/net/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -91,16 +91,23 @@
@@ -16280,7 +16291,7 @@
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
---- ./jdk/make/java/nio/Makefile 2011-05-26 18:34:02.000000000 -0700
+--- ./jdk/make/java/nio/Makefile 2011-06-20 11:32:06.000000000 -0700
+++ ./jdk/make/java/nio/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -260,6 +260,69 @@
sun/nio/fs/UnixConstants.java
@@ -16378,7 +16389,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
---- ./jdk/make/java/nio/mapfile-bsd 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/make/java/nio/mapfile-bsd 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/make/java/nio/mapfile-bsd 2011-05-12 20:59:33.000000000 -0700
@@ -36,24 +36,6 @@
Java_sun_nio_ch_DatagramDispatcher_readv0;
@@ -16435,7 +16446,7 @@
Java_sun_nio_fs_UnixNativeDispatcher_init;
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
Java_sun_nio_fs_UnixNativeDispatcher_strerror;
---- ./jdk/make/java/npt/Makefile 2011-05-26 18:34:03.000000000 -0700
+--- ./jdk/make/java/npt/Makefile 2011-06-20 11:32:08.000000000 -0700
+++ ./jdk/make/java/npt/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -67,6 +67,18 @@
OTHER_LCF += -export:nptInitialize -export:nptTerminate
@@ -16456,7 +16467,7 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile 2011-05-26 18:34:04.000000000 -0700
+--- ./jdk/make/java/redist/fonts/Makefile 2011-06-20 11:32:08.000000000 -0700
+++ ./jdk/make/java/redist/fonts/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -42,7 +42,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
@@ -16485,7 +16496,7 @@
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/java/security/Makefile 2011-05-26 18:34:04.000000000 -0700
+--- ./jdk/make/java/security/Makefile 2011-06-20 11:32:09.000000000 -0700
+++ ./jdk/make/java/security/Makefile 2011-05-12 20:58:11.000000000 -0700
@@ -47,7 +47,14 @@
# Register Microsoft CryptoAPI provider only on Windows platform.
@@ -16503,7 +16514,7 @@
endif # PLATFORM
---- ./jdk/make/java/zip/FILES_c.gmk 2011-05-26 18:34:06.000000000 -0700
+--- ./jdk/make/java/zip/FILES_c.gmk 2011-06-20 11:32:12.000000000 -0700
+++ ./jdk/make/java/zip/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -29,7 +29,10 @@
Deflater.c \
@@ -16524,7 +16535,7 @@
- zutil.c
+ zutil.c
+endif
---- ./jdk/make/java/zip/Makefile 2011-05-26 18:34:06.000000000 -0700
+--- ./jdk/make/java/zip/Makefile 2011-06-20 11:32:12.000000000 -0700
+++ ./jdk/make/java/zip/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -74,16 +74,24 @@
CPPFLAGS += -UDEBUG
@@ -16552,7 +16563,7 @@
OTHER_LDLIBS = $(JVMLIB)
+endif
+
---- ./jdk/make/javax/sound/FILES_c.gmk 2011-05-26 18:34:09.000000000 -0700
+--- ./jdk/make/javax/sound/FILES_c.gmk 2011-06-20 11:32:16.000000000 -0700
+++ ./jdk/make/javax/sound/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -34,6 +34,8 @@
@@ -16563,7 +16574,7 @@
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
---- ./jdk/make/javax/sound/Makefile 2011-05-26 18:34:10.000000000 -0700
+--- ./jdk/make/javax/sound/Makefile 2011-06-20 11:32:16.000000000 -0700
+++ ./jdk/make/javax/sound/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -105,6 +105,22 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
@@ -16588,7 +16599,7 @@
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk 2011-05-26 18:34:10.000000000 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk 2011-06-20 11:32:16.000000000 -0700
+++ ./jdk/make/javax/sound/SoundDefs.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
@@ -16601,7 +16612,7 @@
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
---- ./jdk/make/javax/sound/jsoundalsa/Makefile 2011-05-26 18:34:10.000000000 -0700
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile 2011-06-20 11:32:17.000000000 -0700
+++ ./jdk/make/javax/sound/jsoundalsa/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -51,6 +51,7 @@
$(PORTFILES_c)
@@ -16653,7 +16664,7 @@
#
# Add to the ambient VPATH.
---- ./jdk/make/jpda/back/Makefile 2011-05-26 18:34:11.000000000 -0700
+--- ./jdk/make/jpda/back/Makefile 2011-06-20 11:32:20.000000000 -0700
+++ ./jdk/make/jpda/back/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -49,7 +49,7 @@
-I$(GENNATIVESRCDIR)/jdwp
@@ -16664,7 +16675,7 @@
endif # PLATFORM
#
---- ./jdk/make/jpda/transport/socket/Makefile 2011-05-26 18:34:12.000000000 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile 2011-06-20 11:32:24.000000000 -0700
+++ ./jdk/make/jpda/transport/socket/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -40,6 +40,11 @@
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
@@ -16678,7 +16689,7 @@
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET)
endif
---- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2011-05-26 18:34:19.000000000 -0700
+--- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2011-06-20 11:32:53.000000000 -0700
+++ ./jdk/make/mkdemo/jvmti/hprof/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -37,12 +37,11 @@
@@ -16697,7 +16708,7 @@
endif
#
---- ./jdk/make/sun/awt/Makefile 2011-05-26 18:34:33.000000000 -0700
+--- ./jdk/make/sun/awt/Makefile 2011-06-20 11:33:16.000000000 -0700
+++ ./jdk/make/sun/awt/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -93,7 +93,7 @@
ifeq ($(PLATFORM), solaris)
@@ -16778,7 +16789,7 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mawt.gmk 2011-05-26 18:34:34.000000000 -0700
+--- ./jdk/make/sun/awt/mawt.gmk 2011-06-20 11:33:17.000000000 -0700
+++ ./jdk/make/sun/awt/mawt.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
@@ -16842,7 +16853,7 @@
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
---- ./jdk/make/sun/font/Makefile 2011-05-26 18:34:36.000000000 -0700
+--- ./jdk/make/sun/font/Makefile 2011-06-20 11:33:19.000000000 -0700
+++ ./jdk/make/sun/font/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -172,6 +172,15 @@
# Libraries to link, and other C flags.
@@ -16868,7 +16879,7 @@
endif # PLATFORM
---- ./jdk/make/sun/image/generic/Makefile 2011-05-26 18:34:38.000000000 -0700
+--- ./jdk/make/sun/image/generic/Makefile 2011-06-20 11:33:21.000000000 -0700
+++ ./jdk/make/sun/image/generic/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -70,6 +70,6 @@
OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
@@ -16878,7 +16889,7 @@
+ OTHER_LDLIBS = $(LIBM) $(LIBDL)
endif
---- ./jdk/make/sun/image/vis/Makefile 2011-05-26 18:34:39.000000000 -0700
+--- ./jdk/make/sun/image/vis/Makefile 2011-06-20 11:33:21.000000000 -0700
+++ ./jdk/make/sun/image/vis/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -68,5 +68,5 @@
CFLAGS += $(CFLAGS_$(ARCH)) $(INLINE) -I$(PLATFORM_SRC)/native/sun/awt/medialib -I$(SHARE_SRC)/native/sun/awt/medialib
@@ -16887,7 +16898,7 @@
-OTHER_LDLIBS = $(LIBM) -ldl
+OTHER_LDLIBS = $(LIBM) $(LIBDL)
---- ./jdk/make/sun/jawt/Makefile 2011-05-26 18:34:43.000000000 -0700
+--- ./jdk/make/sun/jawt/Makefile 2011-06-20 11:33:26.000000000 -0700
+++ ./jdk/make/sun/jawt/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -92,8 +92,7 @@
#
@@ -16924,7 +16935,7 @@
#
# Lets not remove any class files.
#
---- ./jdk/make/sun/jdga/Makefile 2011-05-26 18:34:44.000000000 -0700
+--- ./jdk/make/sun/jdga/Makefile 2011-06-20 11:33:27.000000000 -0700
+++ ./jdk/make/sun/jdga/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -55,7 +55,7 @@
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
@@ -16935,7 +16946,7 @@
CPPFLAGS += \
-I$(SHARE_SRC)/javavm/export \
---- ./jdk/make/sun/rmi/rmi/Makefile 2011-05-26 18:34:49.000000000 -0700
+--- ./jdk/make/sun/rmi/rmi/Makefile 2011-06-20 11:33:37.000000000 -0700
+++ ./jdk/make/sun/rmi/rmi/Makefile 2011-05-20 20:16:38.000000000 -0700
@@ -97,6 +97,9 @@
BUILD_TARGETS += bin
@@ -16947,7 +16958,7 @@
build: $(BUILD_TARGETS)
---- ./jdk/make/sun/security/ec/Makefile 2011-05-26 18:34:50.000000000 -0700
+--- ./jdk/make/sun/security/ec/Makefile 2011-06-20 11:33:40.000000000 -0700
+++ ./jdk/make/sun/security/ec/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -192,7 +192,7 @@
ifeq ($(PLATFORM), windows)
@@ -16958,7 +16969,7 @@
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2011-05-26 18:34:51.000000000 -0700
+--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2011-06-20 11:33:41.000000000 -0700
+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -71,6 +71,6 @@
#
@@ -16969,7 +16980,7 @@
+ifeq ($(PLATFORM), windows)
+OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
endif
---- ./jdk/make/sun/security/krb5/Makefile 2011-05-26 18:34:51.000000000 -0700
+--- ./jdk/make/sun/security/krb5/Makefile 2011-06-20 11:33:41.000000000 -0700
+++ ./jdk/make/sun/security/krb5/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -75,7 +75,7 @@
ifeq ($(PLATFORM), windows)
@@ -16980,8 +16991,8 @@
endif
build:
---- ./jdk/make/sun/security/pkcs11/Makefile 2011-05-26 18:34:52.000000000 -0700
-+++ ./jdk/make/sun/security/pkcs11/Makefile 2011-04-22 23:08:16.000000000 -0700
+--- ./jdk/make/sun/security/pkcs11/Makefile 2011-06-20 11:33:42.000000000 -0700
++++ ./jdk/make/sun/security/pkcs11/Makefile 2011-06-21 05:39:00.000000000 -0700
@@ -156,10 +156,10 @@
#
# Libraries to link
@@ -16995,7 +17006,7 @@
endif
# Other config files
---- ./jdk/make/sun/security/smartcardio/Makefile 2011-05-26 18:34:52.000000000 -0700
+--- ./jdk/make/sun/security/smartcardio/Makefile 2011-06-20 11:33:43.000000000 -0700
+++ ./jdk/make/sun/security/smartcardio/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -75,6 +75,6 @@
ifeq ($(PLATFORM), windows)
@@ -17005,7 +17016,7 @@
+ OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
OTHER_CFLAGS = -D__sun_jdk
endif
---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2011-05-26 18:34:53.000000000 -0700
+--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2011-06-20 11:33:44.000000000 -0700
+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -49,18 +49,6 @@
dgif_lib.c \
@@ -17045,7 +17056,7 @@
+ zcrc32.c \
+ zutil.c
+endif
---- ./jdk/make/sun/splashscreen/Makefile 2011-05-26 18:34:53.000000000 -0700
+--- ./jdk/make/sun/splashscreen/Makefile 2011-06-20 11:33:44.000000000 -0700
+++ ./jdk/make/sun/splashscreen/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -63,8 +63,24 @@
@@ -17097,7 +17108,7 @@
# Shun the less than portable MMX assembly code in pnggccrd.c,
# and use alternative implementations in C.
---- ./jdk/make/sun/tracing/dtrace/Makefile 2011-05-26 18:34:54.000000000 -0700
+--- ./jdk/make/sun/tracing/dtrace/Makefile 2011-06-20 11:33:46.000000000 -0700
+++ ./jdk/make/sun/tracing/dtrace/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -55,7 +55,7 @@
FILES_export = $(FILES_java)
@@ -17108,7 +17119,7 @@
endif
#
---- ./jdk/make/sun/xawt/Makefile 2011-05-26 18:34:55.000000000 -0700
+--- ./jdk/make/sun/xawt/Makefile 2011-06-20 11:33:48.000000000 -0700
+++ ./jdk/make/sun/xawt/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -47,6 +47,9 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -17181,7 +17192,7 @@
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
---- ./jdk/make/tools/freetypecheck/Makefile 2011-05-26 18:35:35.000000000 -0700
+--- ./jdk/make/tools/freetypecheck/Makefile 2011-06-20 11:34:30.000000000 -0700
+++ ./jdk/make/tools/freetypecheck/Makefile 2011-04-22 23:08:17.000000000 -0700
@@ -49,8 +49,15 @@
# Add runtime lib search path to ensure test will be runnable
@@ -17200,7 +17211,7 @@
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
---- ./jdk/make/tools/reorder/Makefile 2011-05-26 18:35:37.000000000 -0700
+--- ./jdk/make/tools/reorder/Makefile 2011-06-20 11:34:33.000000000 -0700
+++ ./jdk/make/tools/reorder/Makefile 2011-04-22 23:08:17.000000000 -0700
@@ -185,11 +185,11 @@
@@ -17216,7 +17227,7 @@
# Reorder libraries.
---- ./jdk/src/bsd/doc/man/ja/jvisualvm.1 2011-05-29 11:28:24.000000000 -0700
+--- ./jdk/src/bsd/doc/man/ja/jvisualvm.1 2011-06-25 23:50:15.000000000 -0700
+++ ./jdk/src/bsd/doc/man/ja/jvisualvm.1 1969-12-31 16:00:00.000000000 -0800
@@ -1,126 +0,0 @@
-." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -17748,7 +17759,7 @@
+¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢UNIX ¤Î
+.BI ps
+¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢¹¶·â¼Ô¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
---- ./jdk/src/bsd/doc/man/jvisualvm.1 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/bsd/doc/man/jvisualvm.1 2011-06-25 23:50:15.000000000 -0700
+++ ./jdk/src/bsd/doc/man/jvisualvm.1 1969-12-31 16:00:00.000000000 -0800
@@ -1,104 +0,0 @@
-." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
@@ -17855,7 +17866,7 @@
-\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP
-.LP
-
---- ./jdk/src/share/back/commonRef.c 2011-05-26 18:36:27.000000000 -0700
+--- ./jdk/src/share/back/commonRef.c 2011-06-20 11:36:50.000000000 -0700
+++ ./jdk/src/share/back/commonRef.c 2011-04-22 23:08:18.000000000 -0700
@@ -23,6 +23,10 @@
* questions.
@@ -17868,7 +17879,7 @@
#include "util.h"
#include "commonRef.h"
---- ./jdk/src/share/bin/java.c 2011-05-26 18:36:33.000000000 -0700
+--- ./jdk/src/share/bin/java.c 2011-06-20 11:36:56.000000000 -0700
+++ ./jdk/src/share/bin/java.c 2011-04-22 23:08:18.000000000 -0700
@@ -70,6 +70,10 @@
static jboolean printXUsage = JNI_FALSE; /* print and exit*/
@@ -17966,7 +17977,7 @@
static void
DumpState()
{
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2011-05-26 18:37:04.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2011-06-20 11:37:40.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2011-04-22 23:08:19.000000000 -0700
@@ -477,6 +477,10 @@
String[] dirs = new String[] {
@@ -17979,7 +17990,7 @@
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
---- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2011-05-26 18:37:55.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2011-06-20 11:38:58.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2011-04-22 23:08:19.000000000 -0700
@@ -78,6 +78,9 @@
*/
@@ -17991,7 +18002,7 @@
/**
---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2011-06-25 23:50:15.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
@@ -18000,7 +18011,7 @@
-com.sun.media.sound.SimpleInputDeviceProvider
-com.sun.media.sound.DirectAudioDeviceProvider
-com.sun.media.sound.HeadspaceMixerProvider
---- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -18196,7 +18207,7 @@
- }
-
-}
---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2011-05-26 18:40:49.000000000 -0700
+--- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2011-06-20 11:44:03.000000000 -0700
+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2011-04-22 23:08:22.000000000 -0700
@@ -172,7 +172,12 @@
} else {
@@ -18212,7 +18223,7 @@
(System.getenv("DISPLAY") == null));
}
} else if (nm.equals("true")) {
---- ./jdk/src/share/classes/java/util/TimeZone.java 2011-05-26 18:43:50.000000000 -0700
+--- ./jdk/src/share/classes/java/util/TimeZone.java 2011-06-20 11:49:03.000000000 -0700
+++ ./jdk/src/share/classes/java/util/TimeZone.java 2011-04-22 23:08:24.000000000 -0700
@@ -849,15 +849,13 @@
}
@@ -18231,7 +18242,7 @@
}
return zi;
}
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2011-05-26 18:48:46.000000000 -0700
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2011-06-20 11:59:39.000000000 -0700
+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2011-04-22 23:08:28.000000000 -0700
@@ -1131,7 +1131,7 @@
*/
@@ -18242,7 +18253,7 @@
return false;
} else if (existsMap == null) {
existsMap = new HashMap<String, Boolean>();
---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2011-05-26 18:48:48.000000000 -0700
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java 2011-06-20 11:59:59.000000000 -0700
+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2011-04-22 23:08:28.000000000 -0700
@@ -39,6 +39,7 @@
WINDOWS,
@@ -18267,7 +18278,7 @@
// determine another OS here
}
---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2011-05-26 18:49:03.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java 2011-06-20 12:01:43.000000000 -0700
+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2011-04-22 23:08:28.000000000 -0700
@@ -48,6 +48,8 @@
@@ -18290,7 +18301,7 @@
String t2kStr = System.getProperty("sun.java2d.font.scaler");
if (t2kStr != null) {
useT2K = "t2k".equals(t2kStr);
---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2011-05-26 18:49:04.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2011-06-20 12:01:51.000000000 -0700
+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2011-04-22 23:08:28.000000000 -0700
@@ -413,7 +413,7 @@
* registerFonts method as on-screen these JRE fonts
@@ -18301,7 +18312,7 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,190 +0,0 @@
-/*
@@ -18494,7 +18505,7 @@
- return charOff - outOff;
- }
-}
---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -18690,7 +18701,7 @@
- return 2;
- }
-}
---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,370 +0,0 @@
-/*
@@ -19063,7 +19074,7 @@
- }
- }
-}
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2011-05-26 18:50:48.000000000 -0700
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2011-06-20 12:06:38.000000000 -0700
+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2011-04-22 23:08:30.000000000 -0700
@@ -1534,7 +1534,9 @@
pFlags |= NOSHEET;
@@ -19076,7 +19087,7 @@
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2011-05-26 18:51:24.000000000 -0700
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2011-06-20 12:08:21.000000000 -0700
+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2011-04-22 23:08:31.000000000 -0700
@@ -83,7 +83,9 @@
String osname = System.getProperty("os.name");
@@ -19089,14 +19100,14 @@
gssLibs = new String[]{
"libgssapi.so",
"libgssapi_krb5.so",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2011-05-26 18:52:37.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2011-06-20 12:12:17.000000000 -0700
+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2011-04-22 23:08:32.000000000 -0700
@@ -30,3 +30,4 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[bsd]sun.tools.attach.BsdAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java 2011-05-26 18:52:37.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2011-06-20 12:12:18.000000000 -0700
+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2011-04-22 23:08:32.000000000 -0700
@@ -51,6 +51,7 @@
String zname = "";
@@ -19168,7 +19179,7 @@
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2011-05-26 18:52:38.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2011-06-20 12:12:19.000000000 -0700
+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2011-04-22 23:08:32.000000000 -0700
@@ -44,6 +44,8 @@
{0} : could not create directory
@@ -19179,7 +19190,7 @@
out.added.manifest=\
added manifest
out.update.manifest=\
---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-05-26 18:53:56.000000000 -0700
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-06-20 12:15:27.000000000 -0700
+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-04-22 23:08:34.000000000 -0700
@@ -38,6 +38,7 @@
# gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
@@ -19491,7 +19502,7 @@
+# Example,
+# ocsp.responderCertSerialNumber=2A:FF:00
+
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-05-26 18:54:24.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-06-20 12:16:22.000000000 -0700
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-04-22 23:08:35.000000000 -0700
@@ -32,6 +32,10 @@
#include <unistd.h>
@@ -19518,7 +19529,7 @@
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2011-05-26 18:54:24.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2011-06-20 12:16:22.000000000 -0700
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2011-04-22 23:08:35.000000000 -0700
@@ -22,6 +22,9 @@
* or visit www.oracle.com if you need additional information or have any
@@ -19560,7 +19571,7 @@
true));
}
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2011-05-26 18:54:25.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2011-06-20 12:16:24.000000000 -0700
+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2011-04-22 23:08:35.000000000 -0700
@@ -33,7 +33,11 @@
@@ -19574,7 +19585,7 @@
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2011-05-26 18:54:26.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2011-06-20 12:16:25.000000000 -0700
+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2011-04-22 23:08:35.000000000 -0700
@@ -99,5 +99,24 @@
return com_sun_media_sound_Platform_LIB_ALSA;
@@ -19601,7 +19612,7 @@
+#endif
return 0;
}
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-05-26 18:54:26.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-06-20 12:16:26.000000000 -0700
+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-04-22 23:08:35.000000000 -0700
@@ -31,6 +31,7 @@
#define X_WINDOWS 1
@@ -19630,7 +19641,7 @@
+
+
#endif // __SOUNDDEFS_INCLUDED__
---- ./jdk/src/share/native/common/check_code.c 2011-05-26 18:54:27.000000000 -0700
+--- ./jdk/src/share/native/common/check_code.c 2011-06-20 12:16:27.000000000 -0700
+++ ./jdk/src/share/native/common/check_code.c 2011-04-22 23:08:35.000000000 -0700
@@ -1067,7 +1067,7 @@
* Make sure that branches don't go into the middle of nowhere.
@@ -19693,7 +19704,7 @@
/* There can't be more than 64K labels because of the limit
* on per-method byte code length.
*/
---- ./jdk/src/share/native/java/io/io_util.h 2011-05-26 18:54:29.000000000 -0700
+--- ./jdk/src/share/native/java/io/io_util.h 2011-06-20 12:16:31.000000000 -0700
+++ ./jdk/src/share/native/java/io/io_util.h 2011-04-22 23:08:35.000000000 -0700
@@ -29,7 +29,15 @@
extern jfieldID IO_fd_fdID;
@@ -19712,7 +19723,7 @@
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2011-05-26 18:54:31.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2011-06-20 12:16:33.000000000 -0700
+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2011-04-22 23:08:35.000000000 -0700
@@ -24,6 +24,15 @@
* questions.
@@ -19740,7 +19751,7 @@
#define __HI(x) *(1+(int*)&x)
#define __LO(x) *(int*)&x
#define __HIp(x) *(1+(int*)x)
---- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2011-05-26 18:54:31.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2011-06-20 12:16:34.000000000 -0700
+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2011-04-22 23:08:35.000000000 -0700
@@ -61,7 +61,7 @@
#define log1p jlog1p
@@ -19751,7 +19762,7 @@
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_acosh __j__ieee754_acosh
---- ./jdk/src/share/native/java/util/zip/Inflater.c 2011-05-26 18:54:39.000000000 -0700
+--- ./jdk/src/share/native/java/util/zip/Inflater.c 2011-06-20 12:16:52.000000000 -0700
+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2011-04-22 23:08:35.000000000 -0700
@@ -65,6 +65,10 @@
return jlong_zero;
@@ -19775,7 +19786,7 @@
}
JNIEXPORT void JNICALL
---- ./jdk/src/share/native/java/util/zip/zip_util.c 2011-05-26 18:54:39.000000000 -0700
+--- ./jdk/src/share/native/java/util/zip/zip_util.c 2011-06-20 12:16:52.000000000 -0700
+++ ./jdk/src/share/native/java/util/zip/zip_util.c 2011-04-22 23:08:35.000000000 -0700
@@ -46,6 +46,11 @@
#include "zip_util.h"
@@ -19789,7 +19800,7 @@
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
#include <sys/mman.h>
---- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2011-05-26 18:54:42.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2011-06-20 12:16:59.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2011-04-22 23:08:35.000000000 -0700
@@ -50,7 +50,9 @@
#include <stdio.h>
@@ -19801,7 +19812,7 @@
#include <limits.h>
/* keep these after the other headers */
---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2011-05-26 18:54:42.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2011-06-20 12:17:00.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2011-04-22 23:08:35.000000000 -0700
@@ -24,7 +24,11 @@
*/
@@ -19815,7 +19826,7 @@
#include "sun_awt_image_BufImgSurfaceData.h"
---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2011-05-26 18:54:43.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2011-06-20 12:17:00.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2011-04-22 23:08:35.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
@@ -19829,7 +19840,7 @@
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2011-05-26 18:54:54.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2011-06-20 12:17:26.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2011-04-22 23:08:36.000000000 -0700
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -19870,7 +19881,7 @@
#endif /* _NO_LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2011-05-26 18:54:55.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2011-06-20 12:17:28.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -19911,7 +19922,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2011-05-26 18:54:55.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2011-06-20 12:17:28.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -19952,7 +19963,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2011-05-26 18:54:55.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2011-06-20 12:17:28.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -19993,7 +20004,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2011-05-26 18:54:55.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2011-06-20 12:17:29.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -20034,7 +20045,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2011-05-26 18:54:56.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2011-06-20 12:17:29.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -20075,7 +20086,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2011-05-26 18:54:56.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2011-06-20 12:17:29.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -20116,7 +20127,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2011-05-26 18:54:56.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2011-06-20 12:17:30.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2011-04-22 23:08:36.000000000 -0700
@@ -95,7 +95,7 @@
dst = dp[0];
@@ -20337,7 +20348,7 @@
}
#else /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2011-05-26 18:54:56.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2011-06-20 12:17:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2011-04-22 23:08:36.000000000 -0700
@@ -168,7 +168,7 @@
}
@@ -20619,7 +20630,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2011-05-26 18:54:56.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2011-06-20 12:17:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2011-04-22 23:08:36.000000000 -0700
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -20772,7 +20783,7 @@
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2011-05-26 18:54:57.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2011-06-20 12:17:32.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2011-04-22 23:08:36.000000000 -0700
@@ -30,7 +30,7 @@
typedef union {
@@ -20783,7 +20794,7 @@
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2011-05-26 18:54:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2011-06-20 12:17:36.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2011-04-22 23:08:36.000000000 -0700
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
@@ -20883,7 +20894,7 @@
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2011-05-26 18:54:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2011-06-20 12:17:37.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2011-04-22 23:08:36.000000000 -0700
@@ -120,7 +120,7 @@
} \
@@ -22117,7 +22128,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2011-05-26 18:54:59.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2011-06-20 12:17:37.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2011-04-22 23:08:36.000000000 -0700
@@ -27,6 +27,16 @@
#ifndef MLIB_IMAGE_H
@@ -22136,7 +22147,7 @@
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2011-05-26 18:54:59.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2011-06-20 12:17:38.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2011-04-22 23:08:36.000000000 -0700
@@ -26,9 +26,15 @@
@@ -22168,7 +22179,7 @@
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2011-05-26 18:55:00.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2011-06-20 12:17:39.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2011-04-22 23:08:36.000000000 -0700
@@ -59,7 +59,10 @@
@@ -22182,7 +22193,7 @@
#include <stdint.h> /* for uintptr_t */
#include <malloc.h> /* for ptrdiff_t */
#else
---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-05-26 18:55:01.000000000 -0700
+--- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-06-20 12:17:41.000000000 -0700
+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-04-22 23:08:36.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
@@ -22196,7 +22207,7 @@
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2011-05-26 18:55:01.000000000 -0700
+--- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2011-06-20 12:17:41.000000000 -0700
+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2011-04-22 23:08:36.000000000 -0700
@@ -26,7 +26,11 @@
#include "jlong.h"
@@ -22210,7 +22221,7 @@
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
---- ./jdk/src/share/native/sun/font/sunFont.c 2011-05-26 18:55:15.000000000 -0700
+--- ./jdk/src/share/native/sun/font/sunFont.c 2011-06-20 12:18:39.000000000 -0700
+++ ./jdk/src/share/native/sun/font/sunFont.c 2011-04-22 23:08:36.000000000 -0700
@@ -24,7 +24,9 @@
*/
@@ -22222,7 +22233,7 @@
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2011-05-26 18:55:16.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2011-06-20 12:18:43.000000000 -0700
+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2011-04-22 23:08:36.000000000 -0700
@@ -28,7 +28,11 @@
#include "jni_util.h"
@@ -22236,7 +22247,7 @@
#include "string.h"
/**
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2011-05-26 18:55:27.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2011-06-20 12:19:30.000000000 -0700
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2011-04-22 23:08:36.000000000 -0700
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
@@ -22248,7 +22259,7 @@
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2011-05-26 18:55:28.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2011-06-20 12:19:32.000000000 -0700
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2011-04-22 23:08:36.000000000 -0700
@@ -25,7 +25,11 @@
@@ -22262,7 +22273,7 @@
#include "sun_java2d_pipe_BufferedOpCodes.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-05-26 18:55:28.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-06-20 12:19:33.000000000 -0700
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-04-22 23:08:36.000000000 -0700
@@ -25,7 +25,11 @@
@@ -22276,7 +22287,7 @@
#include <math.h>
#include <jlong.h>
---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2011-05-26 18:55:31.000000000 -0700
+--- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2011-06-20 12:19:51.000000000 -0700
+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2011-05-20 20:04:18.000000000 -0700
@@ -28,6 +28,7 @@
#include <winsock2.h>
@@ -22286,9 +22297,9 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-05-26 18:55:33.000000000 -0700
-+++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-04-22 23:08:36.000000000 -0700
-@@ -76,6 +76,14 @@
+--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-06-20 12:19:54.000000000 -0700
++++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-06-07 20:03:04.000000000 -0700
+@@ -57,6 +57,14 @@
typedef enum { B_FALSE, B_TRUE } boolean_t;
#endif /* __linux__ */
@@ -22303,9 +22314,9 @@
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-05-26 18:55:33.000000000 -0700
-+++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-04-22 23:08:36.000000000 -0700
-@@ -58,9 +58,9 @@
+--- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-06-20 12:19:54.000000000 -0700
++++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-06-07 20:03:04.000000000 -0700
+@@ -39,9 +39,9 @@
#include <sys/types.h>
#ifndef _WIN32
@@ -22317,9 +22328,9 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-05-26 18:55:35.000000000 -0700
-+++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-04-22 23:08:36.000000000 -0700
-@@ -57,9 +57,9 @@
+--- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-06-20 12:20:01.000000000 -0700
++++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-06-07 20:03:04.000000000 -0700
+@@ -38,9 +38,9 @@
#include <sys/types.h>
#ifndef _WIN32
@@ -22331,9 +22342,9 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-05-26 18:55:35.000000000 -0700
-+++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-04-22 23:08:36.000000000 -0700
-@@ -62,9 +62,9 @@
+--- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-06-20 12:20:01.000000000 -0700
++++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-06-07 20:03:04.000000000 -0700
+@@ -43,9 +43,9 @@
#include <sys/types.h>
#ifndef _WIN32
@@ -22345,7 +22356,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/transport/socket/socketTransport.c 2011-05-26 18:55:52.000000000 -0700
+--- ./jdk/src/share/transport/socket/socketTransport.c 2011-06-20 12:20:37.000000000 -0700
+++ ./jdk/src/share/transport/socket/socketTransport.c 2011-04-22 23:08:37.000000000 -0700
@@ -65,6 +65,9 @@
#define HEADER_SIZE 11
@@ -22434,7 +22445,7 @@
return res;
} else if (res == 0) {
break; /* eof, return nbytes which is less than len */
---- ./jdk/src/solaris/back/exec_md.c 2011-05-26 18:55:52.000000000 -0700
+--- ./jdk/src/solaris/back/exec_md.c 2011-06-20 12:20:38.000000000 -0700
+++ ./jdk/src/solaris/back/exec_md.c 2011-04-22 23:08:37.000000000 -0700
@@ -30,7 +30,7 @@
#include "sys.h"
@@ -22445,7 +22456,7 @@
/* Linux */
#define FORK() fork()
#else
---- ./jdk/src/solaris/back/linker_md.c 2011-05-26 18:55:52.000000000 -0700
+--- ./jdk/src/solaris/back/linker_md.c 2011-06-20 12:20:38.000000000 -0700
+++ ./jdk/src/solaris/back/linker_md.c 2011-04-22 23:08:37.000000000 -0700
@@ -48,6 +48,12 @@
#include "threads_md.h"
@@ -22472,7 +22483,7 @@
}
}
---- ./jdk/src/solaris/back/util_md.h 2011-05-26 18:55:53.000000000 -0700
+--- ./jdk/src/solaris/back/util_md.h 2011-06-20 12:20:39.000000000 -0700
+++ ./jdk/src/solaris/back/util_md.h 2011-04-22 23:08:37.000000000 -0700
@@ -31,6 +31,11 @@
@@ -22495,7 +22506,7 @@
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo.c 2011-05-26 18:55:53.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.c 2011-06-20 12:20:39.000000000 -0700
+++ ./jdk/src/solaris/bin/ergo.c 2011-04-22 23:08:37.000000000 -0700
@@ -100,14 +100,39 @@
/* Compute physical memory by asking the OS */
@@ -22539,7 +22550,7 @@
return result;
+#endif /* _ALLBSD_SOURCE */
}
---- ./jdk/src/solaris/bin/ergo.h 2011-05-26 18:55:53.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.h 2011-06-20 12:20:40.000000000 -0700
+++ ./jdk/src/solaris/bin/ergo.h 2011-04-22 23:08:37.000000000 -0700
@@ -33,6 +33,10 @@
#include <sys/stat.h>
@@ -22552,7 +22563,7 @@
#include "java.h"
---- ./jdk/src/solaris/bin/ergo_i586.c 2011-05-26 18:55:53.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo_i586.c 2011-06-20 12:20:40.000000000 -0700
+++ ./jdk/src/solaris/bin/ergo_i586.c 2011-04-22 23:08:37.000000000 -0700
@@ -106,7 +106,7 @@
@@ -22634,7 +22645,7 @@
JLI_TraceLauncher("physical processors: %lu\n", result);
return result;
}
---- ./jdk/src/solaris/bin/java_md.c 2011-05-26 18:55:54.000000000 -0700
+--- ./jdk/src/solaris/bin/java_md.c 2011-06-20 12:20:41.000000000 -0700
+++ ./jdk/src/solaris/bin/java_md.c 2011-05-07 21:54:10.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -22744,7 +22755,7 @@
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./jdk/src/solaris/bin/java_md.h 2011-05-26 18:55:54.000000000 -0700
+--- ./jdk/src/solaris/bin/java_md.h 2011-06-20 12:20:41.000000000 -0700
+++ ./jdk/src/solaris/bin/java_md.h 2011-04-22 23:08:37.000000000 -0700
@@ -47,10 +47,14 @@
#include <sys/time.h>
@@ -22762,7 +22773,7 @@
/*
* Function prototypes.
---- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-05-26 18:56:06.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-06-20 12:21:08.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-04-22 23:08:38.000000000 -0700
@@ -101,7 +101,8 @@
ICE_WM = 10,
@@ -22812,7 +22823,7 @@
} else if (doIsIceWM && isIceWM()) {
awt_wmgr = XWM.ICE_WM;
}
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2011-05-26 18:56:09.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2011-06-20 12:21:18.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2011-04-22 23:08:38.000000000 -0700
@@ -213,7 +213,7 @@
if (fontID != null) {
@@ -22841,7 +22852,7 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,377 +0,0 @@
-#
@@ -23221,7 +23232,7 @@
-filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf
-filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf
-
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2011-06-25 23:50:16.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 @@
-#
@@ -23378,7 +23389,7 @@
-filename.UnDotum_Bold=/usr/share/fonts/truetype/UnDotumBold.ttf
-filename.UnBatang=/usr/share/fonts/truetype/UnBatang.ttf
-filename.UnBatang_Bold=/usr/share/fonts/truetype/UnBatangBold.ttf
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,348 +0,0 @@
-#
@@ -23729,7 +23740,7 @@
-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,90 +0,0 @@
-/*
@@ -23822,7 +23833,7 @@
- return new UnixAsynchronousSocketChannelImpl(toPort(group));
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,281 +0,0 @@
-/*
@@ -24106,7 +24117,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2011-04-22 23:08:38.000000000 -0700
@@ -36,10 +36,6 @@
class BsdFileStore
@@ -24186,7 +24197,7 @@
return super.supportsFileAttributeView(name);
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2011-04-22 23:08:38.000000000 -0700
@@ -28,13 +28,15 @@
import java.nio.file.*;
@@ -24279,7 +24290,7 @@
@Override
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java 2011-04-22 23:08:38.000000000 -0700
@@ -54,14 +54,6 @@
Class<V> type,
@@ -24311,7 +24322,7 @@
return super.getFileAttributeView(obj, name, options);
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2011-04-22 23:08:38.000000000 -0700
@@ -36,84 +36,23 @@
private BsdNativeDispatcher() { }
@@ -24416,7 +24427,7 @@
+ initIDs();
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,350 +0,0 @@
-/*
@@ -24769,7 +24780,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,463 +0,0 @@
-/*
@@ -25235,7 +25246,7 @@
- }});
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2011-05-26 18:56:22.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2011-06-20 12:22:10.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2011-04-22 23:08:38.000000000 -0700
@@ -68,6 +68,8 @@
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
@@ -25246,7 +25257,7 @@
throw new AssertionError("Platform not recognized");
}
}
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2011-05-26 18:56:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2011-06-20 12:22:18.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2011-04-22 23:08:38.000000000 -0700
@@ -119,7 +119,11 @@
}
@@ -25281,7 +25292,7 @@
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2011-04-22 23:08:38.000000000 -0700
@@ -40,9 +40,6 @@
// temp directory for socket file
@@ -25380,7 +25391,7 @@
- isBsdThreads = isBsdThreads();
}
}
---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2011-05-26 18:56:26.000000000 -0700
+--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2011-06-20 12:22:23.000000000 -0700
+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2011-04-22 23:08:38.000000000 -0700
@@ -33,7 +33,7 @@
#include <sys/stat.h>
@@ -25447,7 +25458,7 @@
}
}
---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2011-05-26 18:56:34.000000000 -0700
+--- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2011-06-20 12:22:43.000000000 -0700
+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2011-04-22 23:08:38.000000000 -0700
@@ -28,7 +28,10 @@
#include <string.h>
@@ -25478,7 +25489,7 @@
/* Open conversion descriptors */
iconvToPlatform = iconv_open(codeset, "UTF-8");
---- ./jdk/src/solaris/javavm/export/jvm_md.h 2011-05-26 18:56:34.000000000 -0700
+--- ./jdk/src/solaris/javavm/export/jvm_md.h 2011-06-20 12:22:44.000000000 -0700
+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2011-04-22 23:08:38.000000000 -0700
@@ -41,7 +41,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
@@ -25504,7 +25515,7 @@
/* Signals */
---- ./jdk/src/solaris/native/com/sun/management/BsdOperatingSystem.c 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/native/com/sun/management/BsdOperatingSystem.c 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/native/com/sun/management/BsdOperatingSystem.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,332 +0,0 @@
-/*
@@ -25839,7 +25850,7 @@
- return -1.0;
- }
-}
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2011-05-26 18:56:35.000000000 -0700
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2011-06-20 12:22:45.000000000 -0700
+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2011-04-22 23:08:38.000000000 -0700
@@ -32,10 +32,16 @@
@@ -26003,7 +26014,7 @@
}
JNIEXPORT jlong JNICALL
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2011-05-26 18:56:38.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2011-06-20 12:22:51.000000000 -0700
+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -41,6 +41,12 @@
#include "java_io_FileSystem.h"
@@ -26026,7 +26037,7 @@
JNIEXPORT jboolean JNICALL
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2011-05-26 18:56:38.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2011-06-20 12:22:51.000000000 -0700
+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,9 @@
#include <sys/stat.h>
@@ -26038,7 +26049,7 @@
/* Note: The comments in this file use the terminology
---- ./jdk/src/solaris/native/java/io/io_util_md.c 2011-05-26 18:56:38.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/io_util_md.c 2011-06-20 12:22:51.000000000 -0700
+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -36,7 +36,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
@@ -26049,7 +26060,7 @@
/* Remove trailing slashes, since the kernel won't */
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2011-06-20 12:22:51.000000000 -0700
+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,6 +28,11 @@
#include "jni.h"
@@ -26091,7 +26102,7 @@
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2011-06-20 12:22:52.000000000 -0700
+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -40,7 +40,11 @@
#include <stdlib.h>
@@ -26195,7 +26206,7 @@
if (envp == NULL || (char **) envp == environ) {
execvp(file, (char **) argv);
return;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c 2011-06-20 12:22:52.000000000 -0700
+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -23,7 +23,7 @@
* questions.
@@ -26269,7 +26280,7 @@
return &sprops;
}
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2011-06-20 12:22:52.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -36,12 +36,288 @@
#include <stdlib.h>
@@ -26621,7 +26632,7 @@
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2011-06-20 12:22:52.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,6 +33,9 @@
#include <strings.h>
@@ -26663,7 +26674,7 @@
}
return (*env)->NewStringUTF(env, hostname);
}
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-06-20 12:22:53.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,6 +26,9 @@
@@ -27022,7 +27033,7 @@
+}
+
+#endif
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2011-06-20 12:22:53.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -23,12 +23,12 @@
* questions.
@@ -27130,7 +27141,7 @@
}
}
}
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2011-06-20 12:22:53.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -483,9 +483,11 @@
if (connect_rv == JVM_IO_INTR) {
@@ -27153,7 +27164,7 @@
int port;
jobject iaObj;
jclass iaCntrClass;
---- ./jdk/src/solaris/native/java/net/bsd_close.c 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/bsd_close.c 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2011-04-22 23:08:39.000000000 -0700
@@ -57,7 +57,7 @@
/*
@@ -27190,7 +27201,7 @@
}
int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
---- ./jdk/src/solaris/native/java/net/net_util_md.c 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.c 2011-06-20 12:22:54.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,16 @@
#include <netdb.h>
@@ -27402,7 +27413,7 @@
len = sizeof(arg);
if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg,
---- ./jdk/src/solaris/native/java/net/net_util_md.h 2011-05-26 18:56:39.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.h 2011-06-20 12:22:54.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -37,7 +37,7 @@
#endif
@@ -27413,7 +27424,7 @@
extern int NET_Timeout(int s, long timeout);
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2011-05-26 18:56:40.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2011-06-20 12:22:55.000000000 -0700
+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2011-04-22 23:08:39.000000000 -0700
@@ -47,8 +47,11 @@
return (jint) result;
@@ -27452,7 +27463,7 @@
if (rc < 0) {
close(fd);
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2011-05-26 18:56:40.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2011-06-20 12:22:55.000000000 -0700
+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -31,7 +31,7 @@
#include <errno.h>
@@ -27590,7 +27601,7 @@
sprintf(buf, (const char *)"GMT%c%02d:%02d",
sign, (int)(offset/3600), (int)((offset%3600)/60));
return strdup(buf);
---- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2011-05-26 18:56:40.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2011-06-20 12:22:56.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2011-04-22 23:08:39.000000000 -0700
@@ -25,6 +25,7 @@
@@ -27614,7 +27625,7 @@
if (handle == NULL) {
return JNI_FALSE;
}
---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2011-05-26 18:56:40.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2011-06-20 12:22:57.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2011-04-22 23:08:39.000000000 -0700
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -27628,7 +27639,7 @@
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2011-05-26 18:56:40.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/X11Color.c 2011-06-20 12:22:57.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,9 @@
#include <math.h>
@@ -27640,7 +27651,7 @@
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2011-05-26 18:56:40.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2011-06-20 12:22:57.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2011-04-22 23:08:39.000000000 -0700
@@ -31,7 +31,11 @@
#include <Xm/XmP.h>
@@ -27654,7 +27665,7 @@
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2011-05-26 18:56:42.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2011-06-20 12:22:59.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2011-04-22 23:08:39.000000000 -0700
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
@@ -27665,7 +27676,7 @@
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-05-26 18:56:43.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-06-20 12:23:00.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-04-22 23:08:39.000000000 -0700
@@ -40,6 +40,7 @@
#include <jni.h>
@@ -27794,7 +27805,7 @@
if (pLibRandR == NULL) {
J2dRlsTraceLn(J2D_TRACE_ERROR,
"X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2011-05-26 18:56:43.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2011-06-20 12:23:00.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2011-04-22 23:08:39.000000000 -0700
@@ -67,7 +67,7 @@
XIMPreeditDrawCallbackStruct *);
@@ -28035,7 +28046,7 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2011-05-26 18:56:43.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2011-06-20 12:23:01.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2011-05-07 22:00:01.000000000 -0700
@@ -130,10 +130,10 @@
@@ -28050,7 +28061,7 @@
}
if (toolkit) {
---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2011-05-26 18:56:43.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2011-06-20 12:23:01.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,8 +63,9 @@
extern JavaVM *jvm;
@@ -28072,7 +28083,7 @@
statusWindowEventHandler(xev);
#endif
xembed_eventHandler(&xev);
---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2011-05-26 18:56:44.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2011-06-20 12:23:02.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,6 +32,7 @@
#include <dlfcn.h>
@@ -28096,7 +28107,7 @@
}
if (handle == NULL) {
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2011-05-26 18:56:44.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2011-06-20 12:23:02.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2011-05-20 20:09:20.000000000 -0700
@@ -45,7 +45,7 @@
#include "wsutils.h"
@@ -28115,7 +28126,7 @@
JNIEXPORT void JNICALL
Java_sun_awt_X11_XRobotPeer_getRGBPixelsImpl( JNIEnv *env,
jclass cls,
---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2011-05-26 18:56:45.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h 2011-06-20 12:23:04.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2011-04-22 23:08:39.000000000 -0700
@@ -187,15 +187,20 @@
#ifdef __solaris__
@@ -28139,7 +28150,7 @@
typedef struct _XmImRefRec {
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2011-05-26 18:56:45.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2011-06-20 12:23:04.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2011-04-22 23:08:39.000000000 -0700
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -28238,7 +28249,7 @@
awt_wmgr = OPENLOOK_WM;
}
else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2011-05-26 18:56:45.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2011-06-20 12:23:04.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2011-04-22 23:08:39.000000000 -0700
@@ -45,7 +45,10 @@
KDE2_WM,
@@ -28252,7 +28263,7 @@
};
extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h 2011-05-26 18:56:45.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/extutil.h 2011-06-20 12:23:05.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2011-04-22 23:08:39.000000000 -0700
@@ -58,7 +58,7 @@
*/
@@ -28269,7 +28280,7 @@
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2011-05-26 18:56:46.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c 2011-06-20 12:23:06.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2011-05-12 20:55:07.000000000 -0700
@@ -23,7 +23,7 @@
* questions.
@@ -28428,7 +28439,7 @@
if (libfontconfig == NULL) {
return NULL;
}
---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2011-05-26 18:56:46.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2011-06-20 12:23:06.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2011-05-07 21:54:10.000000000 -0700
@@ -30,9 +30,12 @@
#include <string.h>
@@ -28484,7 +28495,7 @@
if (setjmp(j) == 0)
{
---- ./jdk/src/solaris/native/sun/awt/list.c 2011-05-26 18:56:46.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/list.c 2011-06-20 12:23:07.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/list.c 2011-04-22 23:08:39.000000000 -0700
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -28498,7 +28509,7 @@
#include "list.h"
---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2011-05-26 18:56:55.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c 2011-06-20 12:23:22.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2011-04-22 23:08:39.000000000 -0700
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
@@ -28510,7 +28521,7 @@
#include "robot_common.h"
/*
---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2011-05-26 18:56:56.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2011-06-20 12:23:24.000000000 -0700
+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,7 +32,11 @@
* into X11FontScaler_md.c, which is compiled into another library.
@@ -28524,7 +28535,7 @@
#include <ctype.h>
#include <sys/utsname.h>
---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2011-05-26 18:56:57.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2011-06-20 12:23:25.000000000 -0700
+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2011-04-22 23:08:39.000000000 -0700
@@ -39,7 +39,11 @@
#include "GraphicsPrimitiveMgr.h"
@@ -28538,7 +28549,7 @@
JNIEXPORT void JNICALL AWTDrawGlyphList
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2011-05-26 18:56:57.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2011-06-20 12:23:25.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -28555,7 +28566,7 @@
typedef unsigned char jubyte;
typedef unsigned short jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2011-05-26 18:56:57.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2011-06-20 12:23:26.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,6 +63,10 @@
* MLIB_EDGE_SRC_PADDED
@@ -28662,7 +28673,7 @@
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2011-05-26 18:56:59.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2011-06-20 12:23:30.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2011-04-22 23:08:39.000000000 -0700
@@ -804,7 +804,7 @@
static int initialized;
@@ -28673,7 +28684,7 @@
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2011-05-26 18:57:01.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2011-06-20 12:23:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
@@ -28695,7 +28706,7 @@
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2011-05-26 18:57:01.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2011-06-20 12:23:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,6 +32,7 @@
#include "gdefs.h"
@@ -28714,7 +28725,7 @@
}
if (lib != NULL) {
---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2011-05-26 18:57:02.000000000 -0700
+--- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2011-06-20 12:23:37.000000000 -0700
+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2011-04-22 23:08:39.000000000 -0700
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
@@ -28738,7 +28749,7 @@
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2011-05-26 18:57:02.000000000 -0700
+--- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2011-06-20 12:23:38.000000000 -0700
+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -30,6 +30,10 @@
#include "jni_util.h"
@@ -28751,7 +28762,7 @@
/*
* Class: sun_management_FileSystemImpl
* Method: isAccessUserOnly0
---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2011-05-26 18:57:02.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2011-06-20 12:23:38.000000000 -0700
+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,7 @@
#include <strings.h>
@@ -28762,7 +28773,7 @@
#include <string.h>
#endif
---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2011-05-26 18:57:03.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2011-06-20 12:23:39.000000000 -0700
+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,11 +26,12 @@
#include "jni.h"
@@ -28790,7 +28801,7 @@
gconf_ver = 2;
}
if (gconf_ver > 0) {
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2011-05-26 18:57:03.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2011-06-20 12:23:39.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -35,7 +35,7 @@
#include <string.h>
@@ -28841,7 +28852,7 @@
}
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2011-05-26 18:57:03.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2011-06-20 12:23:39.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2011-04-22 23:08:39.000000000 -0700
@@ -73,7 +73,7 @@
m.msg_accrightslen = 0;
@@ -28861,7 +28872,7 @@
m.msg_control = NULL;
m.msg_controllen = 0;
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2011-05-26 18:57:03.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2011-06-20 12:23:40.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,9 +26,11 @@
#include "jni.h"
@@ -28927,7 +28938,7 @@
+ return IOS_UNSUPPORTED;
#endif
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2011-05-26 18:57:04.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2011-06-20 12:23:40.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,9 +33,24 @@
#include <sys/socket.h>
@@ -28978,7 +28989,7 @@
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2011-05-26 18:57:04.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2011-06-20 12:23:40.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2011-04-22 23:08:39.000000000 -0700
@@ -30,6 +30,12 @@
#include "nio_util.h"
@@ -28993,7 +29004,7 @@
static jfieldID key_st_dev; /* id for FileKey.st_dev */
static jfieldID key_st_ino; /* id for FileKey.st_ino */
---- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2011-05-26 18:57:04.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2011-06-20 12:23:41.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2011-04-22 23:08:39.000000000 -0700
@@ -116,6 +116,47 @@
@@ -29145,7 +29156,7 @@
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2011-05-26 18:57:04.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2011-06-20 12:23:41.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2011-04-22 23:08:39.000000000 -0700
@@ -67,7 +67,7 @@
@@ -29195,7 +29206,7 @@
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2011-05-26 18:57:04.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2011-06-20 12:23:41.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -337,11 +337,11 @@
break;
@@ -29211,7 +29222,7 @@
}
addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2011-05-26 18:57:04.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2011-06-20 12:23:42.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2011-04-22 23:08:39.000000000 -0700
@@ -58,6 +58,7 @@
*/
@@ -29229,7 +29240,7 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,23 +28,35 @@
#include "jvm.h"
@@ -29511,7 +29522,7 @@
+ free(iter);
+ }
}
---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,153 +0,0 @@
-/*
@@ -29667,7 +29678,7 @@
- }
- return (jint)n;
-}
---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2011-05-26 18:57:05.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2011-06-20 12:23:44.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2011-04-22 23:08:39.000000000 -0700
@@ -30,7 +30,9 @@
@@ -29679,7 +29690,7 @@
#ifdef __solaris__
#include <strings.h>
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2011-05-26 18:57:05.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2011-06-20 12:23:45.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2011-05-20 20:04:19.000000000 -0700
@@ -49,6 +49,19 @@
#include <mntent.h>
@@ -29756,7 +29767,7 @@
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2011-05-26 18:57:05.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2011-06-20 12:23:46.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,7 +63,12 @@
DEFX(O_EXCL);
@@ -29784,7 +29795,7 @@
DEF(ERANGE);
// flags used with openat/unlinkat/etc.
---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2011-05-26 18:57:05.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2011-06-20 12:23:46.000000000 -0700
+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,7 +26,9 @@
#include <stdio.h>
@@ -29796,7 +29807,7 @@
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-05-26 18:57:06.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-06-20 12:23:46.000000000 -0700
+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,12 +28,19 @@
#include <string.h>
@@ -29840,7 +29851,7 @@
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2011-05-26 18:57:06.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2011-06-20 12:23:47.000000000 -0700
+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -64,7 +64,9 @@
#include <assert.h>
@@ -29852,7 +29863,7 @@
#include <jni.h>
---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2011-05-26 18:57:06.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2011-06-20 12:23:48.000000000 -0700
+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -29,7 +29,9 @@
#include <assert.h>
@@ -29864,7 +29875,7 @@
#include <winscard.h>
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2011-04-22 23:08:39.000000000 -0700
@@ -1,12 +1,12 @@
/*
@@ -30199,7 +30210,7 @@
+ JNU_ReleaseStringPlatformChars(env, path, _path);
+ }
+}
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2011-05-26 18:57:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2011-06-20 12:23:49.000000000 -0700
+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2011-04-22 23:08:39.000000000 -0700
@@ -228,10 +228,10 @@
{java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
@@ -30225,7 +30236,7 @@
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2011-05-26 18:57:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2011-06-20 12:23:50.000000000 -0700
+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2011-04-22 23:08:39.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -30273,7 +30284,7 @@
}
dlerror(); /* Clear errors */
gnome_url_show = (GNOME_URL_SHOW_TYPE*)dlsym(gnome_handle, "gnome_url_show");
---- ./jdk/src/solaris/npt/npt_md.h 2011-05-26 18:57:07.000000000 -0700
+--- ./jdk/src/solaris/npt/npt_md.h 2011-06-20 12:23:50.000000000 -0700
+++ ./jdk/src/solaris/npt/npt_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -32,9 +32,10 @@
#include <string.h>
@@ -30297,7 +30308,7 @@
if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
_sym = dlsym(_handle, "nptInitialize"); \
if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
---- ./jdk/src/solaris/transport/socket/socket_md.c 2011-05-26 18:57:10.000000000 -0700
+--- ./jdk/src/solaris/transport/socket/socket_md.c 2011-06-20 12:23:54.000000000 -0700
+++ ./jdk/src/solaris/transport/socket/socket_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -36,7 +36,7 @@
#ifdef __solaris__
@@ -30317,7 +30328,7 @@
int
dbgsysTlsAlloc() {
pthread_key_t key;
---- ./jdk/test/Makefile 2011-05-26 18:57:59.000000000 -0700
+--- ./jdk/test/Makefile 2011-06-20 12:26:45.000000000 -0700
+++ ./jdk/test/Makefile 2011-04-22 23:08:40.000000000 -0700
@@ -79,6 +79,16 @@
endif
@@ -30336,7 +30347,7 @@
ifeq ($(OS_NAME),)
OS_NAME = windows
# GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2011-05-26 18:58:11.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2011-06-20 12:27:16.000000000 -0700
+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2011-04-22 23:08:41.000000000 -0700
@@ -56,7 +56,7 @@
@@ -30347,7 +30358,7 @@
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2011-05-26 18:58:13.000000000 -0700
+--- ./jdk/test/com/sun/jdi/JITDebug.sh 2011-06-20 12:27:18.000000000 -0700
+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2011-04-22 23:08:41.000000000 -0700
@@ -63,7 +63,7 @@
OS=`uname -s`
@@ -30358,7 +30369,7 @@
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2011-05-26 18:58:15.000000000 -0700
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2011-06-20 12:27:31.000000000 -0700
+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2011-04-22 23:08:41.000000000 -0700
@@ -123,10 +123,14 @@
esac
@@ -30376,7 +30387,7 @@
Windows*)
is_windows=true
libloc=${jreloc}/bin
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2011-05-26 18:58:17.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2011-06-20 12:27:40.000000000 -0700
+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2011-04-22 23:08:41.000000000 -0700
@@ -292,7 +292,7 @@
psCmd=ps
@@ -30387,7 +30398,7 @@
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2011-05-26 18:58:17.000000000 -0700
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2011-06-20 12:27:41.000000000 -0700
+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2011-04-22 23:08:41.000000000 -0700
@@ -112,7 +112,7 @@
fi
@@ -30398,7 +30409,7 @@
pass "This test always passes on $OS"
;;
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2011-05-26 18:58:20.000000000 -0700
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2011-06-20 12:27:49.000000000 -0700
+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2011-04-22 23:08:41.000000000 -0700
@@ -45,10 +45,7 @@
@@ -30412,7 +30423,7 @@
PS=":"
;;
Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-05-26 18:58:24.000000000 -0700
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-06-20 12:28:05.000000000 -0700
+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-04-22 23:08:41.000000000 -0700
@@ -83,6 +83,10 @@
total_swap=`free -b | grep -i swap | awk '{print $2}'`
@@ -30425,7 +30436,7 @@
* )
runOne GetTotalSwapSpaceSize "sanity-only"
;;
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2011-05-26 18:58:24.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2011-06-20 12:28:06.000000000 -0700
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2011-04-22 23:08:41.000000000 -0700
@@ -48,7 +48,7 @@
@@ -30436,7 +30447,7 @@
runOne GetMaxFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2011-05-26 18:58:25.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2011-06-20 12:28:06.000000000 -0700
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2011-04-22 23:08:41.000000000 -0700
@@ -48,7 +48,7 @@
@@ -30447,7 +30458,7 @@
runOne GetOpenFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2011-05-26 18:58:40.000000000 -0700
+--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2011-06-20 12:28:44.000000000 -0700
+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2011-04-22 23:08:41.000000000 -0700
@@ -36,11 +36,7 @@
@@ -30462,7 +30473,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2011-05-26 18:59:08.000000000 -0700
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2011-06-20 12:29:49.000000000 -0700
+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2011-04-22 23:08:42.000000000 -0700
@@ -25,10 +25,11 @@
fi
@@ -30480,7 +30491,7 @@
# Windows
if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh 2011-05-26 18:59:59.000000000 -0700
+--- ./jdk/test/java/io/File/GetXSpace.sh 2011-06-20 12:32:32.000000000 -0700
+++ ./jdk/test/java/io/File/GetXSpace.sh 2011-04-22 23:08:43.000000000 -0700
@@ -26,7 +26,7 @@
# set platform-dependent variable
@@ -30491,7 +30502,7 @@
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2011-05-26 19:00:25.000000000 -0700
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2011-06-20 12:33:16.000000000 -0700
+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
@@ -30502,7 +30513,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2011-05-26 19:00:34.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2011-06-20 12:33:35.000000000 -0700
+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30513,7 +30524,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2011-05-26 19:00:34.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2011-06-20 12:33:36.000000000 -0700
+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30524,7 +30535,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2011-05-26 19:00:52.000000000 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2011-06-20 12:34:11.000000000 -0700
+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2011-04-22 23:08:44.000000000 -0700
@@ -49,10 +49,7 @@
# set platform-specific variables
@@ -30538,7 +30549,7 @@
FS="/"
;;
Windows* | CYGWIN* )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2011-05-26 19:01:03.000000000 -0700
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2011-06-20 12:34:35.000000000 -0700
+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2011-04-22 23:08:45.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -30549,7 +30560,7 @@
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2011-05-26 19:01:09.000000000 -0700
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2011-06-20 12:34:47.000000000 -0700
+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2011-04-22 23:08:45.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -30560,7 +30571,7 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2011-05-26 19:01:13.000000000 -0700
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2011-06-20 12:34:54.000000000 -0700
+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2011-04-22 23:08:45.000000000 -0700
@@ -49,7 +49,7 @@
@@ -30571,7 +30582,7 @@
PATHSEP=":"
;;
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2011-05-26 19:01:20.000000000 -0700
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2011-06-20 12:35:10.000000000 -0700
+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2011-04-22 23:08:45.000000000 -0700
@@ -35,11 +35,7 @@
@@ -30586,7 +30597,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2011-05-26 19:01:28.000000000 -0700
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2011-06-20 12:35:25.000000000 -0700
+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2011-04-22 23:08:45.000000000 -0700
@@ -61,10 +61,7 @@
while true; do
@@ -30600,7 +30611,7 @@
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2011-05-26 19:01:39.000000000 -0700
+--- ./jdk/test/java/net/Authenticator/B4933582.sh 2011-06-20 12:35:43.000000000 -0700
+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2011-04-22 23:08:45.000000000 -0700
@@ -26,7 +26,7 @@
@@ -30611,7 +30622,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2011-05-26 19:01:43.000000000 -0700
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2011-06-20 12:35:48.000000000 -0700
+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2011-04-22 23:08:45.000000000 -0700
@@ -27,11 +27,7 @@
# set platform-dependent variables
@@ -30626,7 +30637,7 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2011-05-26 19:01:53.000000000 -0700
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2011-06-20 12:36:10.000000000 -0700
+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2011-04-22 23:08:45.000000000 -0700
@@ -28,7 +28,7 @@
@@ -30637,7 +30648,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh 2011-05-26 19:01:57.000000000 -0700
+--- ./jdk/test/java/net/URL/B5086147.sh 2011-06-20 12:36:19.000000000 -0700
+++ ./jdk/test/java/net/URL/B5086147.sh 2011-04-22 23:08:46.000000000 -0700
@@ -26,7 +26,7 @@
@@ -30648,7 +30659,7 @@
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh 2011-05-26 19:02:00.000000000 -0700
+--- ./jdk/test/java/net/URL/runconstructor.sh 2011-06-20 12:36:25.000000000 -0700
+++ ./jdk/test/java/net/URL/runconstructor.sh 2011-04-22 23:08:46.000000000 -0700
@@ -27,7 +27,7 @@
#
@@ -30659,7 +30670,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2011-05-26 19:02:00.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2011-06-20 12:36:26.000000000 -0700
+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2011-04-22 23:08:46.000000000 -0700
@@ -34,11 +34,7 @@
@@ -30674,7 +30685,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2011-05-26 19:02:03.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2011-06-20 12:36:32.000000000 -0700
+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2011-04-22 23:08:46.000000000 -0700
@@ -27,11 +27,7 @@
@@ -30689,7 +30700,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2011-05-26 19:02:03.000000000 -0700
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh 2011-06-20 12:36:33.000000000 -0700
+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2011-04-22 23:08:46.000000000 -0700
@@ -33,11 +33,7 @@
@@ -30704,7 +30715,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2011-05-26 19:02:27.000000000 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2011-06-20 12:37:22.000000000 -0700
+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2011-04-22 23:08:46.000000000 -0700
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
@@ -30755,8 +30766,8 @@
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2011-05-26 19:02:29.000000000 -0700
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2011-06-20 12:37:23.000000000 -0700
+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2011-04-22 23:08:46.000000000 -0700
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -30826,7 +30837,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/charset/Charset/default.sh 2011-05-26 19:02:30.000000000 -0700
+--- ./jdk/test/java/nio/charset/Charset/default.sh 2011-06-20 12:37:24.000000000 -0700
+++ ./jdk/test/java/nio/charset/Charset/default.sh 2011-04-22 23:08:46.000000000 -0700
@@ -41,10 +41,14 @@
fi
@@ -30847,7 +30858,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=$TESTJAVA/bin/java
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2011-05-26 19:02:31.000000000 -0700
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2011-06-20 12:37:25.000000000 -0700
+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2011-04-22 23:08:46.000000000 -0700
@@ -34,7 +34,7 @@
@@ -30858,7 +30869,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
# Skip locale test for Windows
Windows* )
echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh 2011-05-26 19:02:32.000000000 -0700
+--- ./jdk/test/java/nio/charset/spi/basic.sh 2011-06-20 12:37:27.000000000 -0700
+++ ./jdk/test/java/nio/charset/spi/basic.sh 2011-04-22 23:08:46.000000000 -0700
@@ -70,10 +70,14 @@
L="$1"
@@ -30888,7 +30899,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
Windows* ) CPS=';' ;;
*) echo "Unknown platform: `uname`"; exit 1 ;;
esac
---- ./jdk/test/java/nio/file/Files/CopyAndMove.java 2011-05-26 19:02:33.000000000 -0700
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java 2011-06-20 12:37:28.000000000 -0700
+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java 2011-04-22 23:08:46.000000000 -0700
@@ -153,7 +153,8 @@
@@ -30900,7 +30911,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
posixAttributes = readAttributes(source, PosixFileAttributes.class, NOFOLLOW_LINKS);
basicAttributes = posixAttributes;
}
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2011-05-26 19:03:04.000000000 -0700
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2011-06-20 12:38:17.000000000 -0700
+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2011-04-22 23:08:47.000000000 -0700
@@ -84,14 +84,12 @@
@@ -30921,7 +30932,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
export PATH_SEP
mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2011-05-26 19:03:34.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2011-06-20 12:38:50.000000000 -0700
+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -30936,7 +30947,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2011-05-26 19:03:34.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2011-06-20 12:38:50.000000000 -0700
+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2011-04-22 23:08:48.000000000 -0700
@@ -34,11 +34,7 @@
# set platform-dependent variables
@@ -30951,7 +30962,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2011-05-26 19:03:35.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2011-06-20 12:38:52.000000000 -0700
+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -30966,7 +30977,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2011-05-26 19:03:36.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh 2011-06-20 12:38:52.000000000 -0700
+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -30981,7 +30992,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2011-05-26 19:03:53.000000000 -0700
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2011-06-20 12:39:13.000000000 -0700
+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2011-04-22 23:08:48.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -30992,7 +31003,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2011-05-26 19:04:07.000000000 -0700
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2011-06-20 12:39:28.000000000 -0700
+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2011-04-22 23:08:48.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -31003,7 +31014,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2011-05-26 19:04:13.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2011-06-20 12:39:35.000000000 -0700
+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2011-04-22 23:08:49.000000000 -0700
@@ -31,7 +31,7 @@
# set platform-dependent variables
@@ -31014,7 +31025,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2011-05-26 19:04:14.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2011-06-20 12:39:37.000000000 -0700
+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2011-04-22 23:08:49.000000000 -0700
@@ -75,7 +75,7 @@
SunOS)
@@ -31025,7 +31036,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
DEL=":"
HAS_S=YES
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh 2011-05-26 19:04:19.000000000 -0700
+--- ./jdk/test/java/util/ServiceLoader/basic.sh 2011-06-20 12:39:44.000000000 -0700
+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2011-04-22 23:08:49.000000000 -0700
@@ -42,9 +42,7 @@
@@ -31038,7 +31049,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2011-05-26 19:04:44.000000000 -0700
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2011-06-20 12:40:11.000000000 -0700
+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2011-04-22 23:08:49.000000000 -0700
@@ -51,7 +51,7 @@
# set platform-dependent variables
@@ -31049,7 +31060,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/script/CommonSetup.sh 2011-05-26 19:05:20.000000000 -0700
+--- ./jdk/test/javax/script/CommonSetup.sh 2011-06-20 12:40:58.000000000 -0700
+++ ./jdk/test/javax/script/CommonSetup.sh 2011-04-22 23:08:50.000000000 -0700
@@ -36,11 +36,7 @@
@@ -31064,7 +31075,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2011-05-26 19:05:24.000000000 -0700
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2011-06-20 12:41:03.000000000 -0700
+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2011-04-22 23:08:50.000000000 -0700
@@ -33,12 +33,7 @@
# set platform-dependent variables
@@ -31080,7 +31091,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/jprt.config 2011-05-26 19:06:21.000000000 -0700
+--- ./jdk/test/jprt.config 2011-06-20 12:42:14.000000000 -0700
+++ ./jdk/test/jprt.config 2011-04-22 23:08:51.000000000 -0700
@@ -71,8 +71,8 @@
@@ -31149,7 +31160,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
# Export PATH setting
PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2011-05-26 19:06:22.000000000 -0700
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2011-06-20 12:42:15.000000000 -0700
+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2011-04-22 23:08:51.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -31160,7 +31171,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2011-05-26 19:06:34.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2011-06-20 12:42:26.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -45,37 +45,50 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
@@ -31238,7 +31249,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
#
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2011-05-26 19:06:34.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2011-06-20 12:42:26.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2011-04-22 23:08:51.000000000 -0700
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -31249,7 +31260,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2011-05-26 19:06:34.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2011-06-20 12:42:27.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -31268,7 +31279,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2011-05-26 19:06:34.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2011-06-20 12:42:27.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -70,10 +70,12 @@
# security the password file.
@@ -31287,7 +31298,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
# Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2011-05-26 19:06:35.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2011-06-20 12:42:28.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -69,10 +69,12 @@
# security the password file.
@@ -31306,8 +31317,8 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/Select
# Create management and SSL configuration files
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2011-05-26 19:06:42.000000000 -0700
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
+--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2011-06-20 12:42:36.000000000 -0700
+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2011-04-22 23:08:52.000000000 -0700
@@ -36,11 +36,7 @@
@@ -31322,7 +31333,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2011-05-26 19:06:47.000000000 -0700
+--- ./jdk/test/sun/net/www/MarkResetTest.sh 2011-06-20 12:42:42.000000000 -0700
+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2011-04-22 23:08:52.000000000 -0700
@@ -28,7 +28,7 @@
@@ -31333,7 +31344,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2011-05-26 19:06:50.000000000 -0700
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2011-06-20 12:42:45.000000000 -0700
+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2011-04-22 23:08:52.000000000 -0700
@@ -28,7 +28,7 @@
@@ -31344,7 +31355,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2011-05-26 19:06:56.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2011-06-20 12:42:50.000000000 -0700
+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2011-04-22 23:08:52.000000000 -0700
@@ -31,11 +31,7 @@
@@ -31359,7 +31370,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2011-05-26 19:06:57.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2011-06-20 12:42:52.000000000 -0700
+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2011-04-22 23:08:52.000000000 -0700
@@ -31,11 +31,7 @@
@@ -31374,7 +31385,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,79 +0,0 @@
-/*
@@ -31456,7 +31467,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
- System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
- if (failed > 0) throw new AssertionError("Some tests failed");}
-}
---- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2011-05-29 11:28:25.000000000 -0700
+--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2011-06-25 23:50:16.000000000 -0700
+++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,70 +0,0 @@
-/*
@@ -31529,7 +31540,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
- }
- }
-}
---- ./jdk/test/sun/security/krb5/runNameEquals.sh 2011-05-26 19:07:30.000000000 -0700
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh 2011-06-20 12:43:47.000000000 -0700
+++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2011-04-22 23:08:53.000000000 -0700
@@ -58,6 +58,11 @@
FILESEP="/"
@@ -31543,7 +31554,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
CYGWIN* )
PATHSEP=";"
FILESEP="/"
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2011-05-26 19:07:34.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2011-06-20 12:43:52.000000000 -0700
+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2011-04-22 23:08:53.000000000 -0700
@@ -131,6 +131,27 @@
;;
@@ -31573,7 +31584,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2011-05-26 19:07:37.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2011-06-20 12:43:54.000000000 -0700
+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2011-04-22 23:08:53.000000000 -0700
@@ -92,6 +92,27 @@
;;
@@ -31603,7 +31614,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2011-05-26 19:07:39.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2011-06-20 12:43:56.000000000 -0700
+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2011-04-22 23:08:53.000000000 -0700
@@ -50,13 +50,7 @@
@@ -31620,7 +31631,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2011-05-26 19:07:40.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2011-06-20 12:43:57.000000000 -0700
+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2011-04-22 23:08:53.000000000 -0700
@@ -51,13 +51,7 @@
@@ -31637,22 +31648,22 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
-Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2011-05-26 19:07:59.000000000 -0700
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
+Files /tmp/openjdk_srcdir.o38PuUUK/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /usr/home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2011-06-20 12:44:24.000000000 -0700
+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2011-04-22 23:08:53.000000000 -0700
@@ -44,11 +44,7 @@
# set platform-dependent variables
@@ -31667,7 +31678,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2011-05-26 19:08:00.000000000 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2011-06-20 12:44:27.000000000 -0700
+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -31682,7 +31693,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2011-05-26 19:08:08.000000000 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2011-06-20 12:44:40.000000000 -0700
+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -42,7 +42,7 @@
@@ -31693,7 +31704,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FILESEP="/"
PATHSEP=":"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2011-05-26 19:08:16.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2011-06-20 12:44:54.000000000 -0700
+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -31704,7 +31715,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2011-05-26 19:08:16.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2011-06-20 12:44:54.000000000 -0700
+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2011-04-22 23:08:54.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -31715,7 +31726,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2011-05-26 19:08:17.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2011-06-20 12:44:56.000000000 -0700
+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31726,7 +31737,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2011-05-26 19:08:18.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2011-06-20 12:44:56.000000000 -0700
+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31737,7 +31748,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2011-05-26 19:08:18.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2011-06-20 12:44:57.000000000 -0700
+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2011-04-22 23:08:54.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -31748,7 +31759,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2011-05-26 19:08:18.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2011-06-20 12:44:57.000000000 -0700
+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2011-04-22 23:08:54.000000000 -0700
@@ -42,7 +42,7 @@
# set platform-dependent variables
@@ -31759,7 +31770,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2011-05-26 19:08:19.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2011-06-20 12:44:58.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31770,7 +31781,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2011-05-26 19:08:19.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2011-06-20 12:44:58.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -31785,7 +31796,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2011-05-26 19:08:20.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2011-06-20 12:45:00.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2011-04-22 23:08:54.000000000 -0700
@@ -45,7 +45,7 @@
# set platform-dependent variables
@@ -31796,7 +31807,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2011-05-26 19:08:20.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2011-06-20 12:45:00.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31807,7 +31818,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2011-05-26 19:08:20.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh 2011-06-20 12:45:00.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -72,6 +72,27 @@
;;
@@ -31837,7 +31848,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
* )
echo "Will not run test on: ${OS}"
exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh 2011-05-26 19:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2011-06-20 12:45:01.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31848,7 +31859,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2011-05-26 19:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh 2011-06-20 12:45:02.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2011-04-22 23:08:54.000000000 -0700
@@ -37,7 +37,7 @@
# set platform-dependent variables
@@ -31859,7 +31870,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh 2011-05-26 19:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/resource.sh 2011-06-20 12:45:02.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2011-04-22 23:08:54.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -31870,7 +31881,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
FS="/"
TMP=/tmp
---- ./jdk/test/sun/security/tools/keytool/standard.sh 2011-05-26 19:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/standard.sh 2011-06-20 12:45:02.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2011-04-22 23:08:54.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -31881,7 +31892,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2011-05-26 19:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh 2011-06-20 12:45:03.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31892,7 +31903,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2011-05-26 19:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2011-06-20 12:45:03.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31903,7 +31914,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2011-05-26 19:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2011-06-20 12:45:03.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31914,7 +31925,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2011-05-26 19:08:23.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2011-06-20 12:45:04.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31925,7 +31936,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2011-05-26 19:08:23.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2011-06-20 12:45:04.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31936,7 +31947,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2011-05-26 19:08:23.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2011-06-20 12:45:05.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31947,7 +31958,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2011-05-26 19:08:23.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh 2011-06-20 12:45:05.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31958,7 +31969,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2011-05-26 19:08:30.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2011-06-20 12:45:14.000000000 -0700
+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -53,7 +53,7 @@
@@ -31969,7 +31980,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2011-05-26 19:08:31.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2011-06-20 12:45:15.000000000 -0700
+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -54,7 +54,7 @@
@@ -31980,7 +31991,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2011-05-26 19:08:42.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2011-06-20 12:45:32.000000000 -0700
+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2011-04-22 23:08:55.000000000 -0700
@@ -33,7 +33,7 @@
@@ -31991,7 +32002,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
esac
N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2011-05-26 19:08:42.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2011-06-20 12:45:39.000000000 -0700
+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2011-04-22 23:08:55.000000000 -0700
@@ -56,7 +56,7 @@
@@ -32002,18 +32013,18 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./langtools/.hgtags 2011-05-26 19:15:40.000000000 -0700
-+++ ./langtools/.hgtags 2011-05-27 00:01:06.000000000 -0700
-@@ -118,3 +118,4 @@
- 90adb5d6adc7d99d27c8b142a31ac8921070274f jdk7-b141
- 7476b164194c1814704153e74d5ff7e965c6fdbf jdk7-b142
+--- ./langtools/.hgtags 2011-06-20 12:52:17.000000000 -0700
++++ ./langtools/.hgtags 2011-06-21 05:39:09.000000000 -0700
+@@ -120,3 +120,4 @@
5faa9eedc44e201f2b13ad837e9077668b823d28 jdk7-b143
-+8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144
---- ./langtools/.jcheck/conf 2011-05-26 19:15:40.000000000 -0700
+ 8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144
+ c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145
++9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
+--- ./langtools/.jcheck/conf 2011-06-20 12:52:17.000000000 -0700
+++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./langtools/make/build.xml 2011-05-26 19:15:41.000000000 -0700
+--- ./langtools/make/build.xml 2011-06-20 12:52:18.000000000 -0700
+++ ./langtools/make/build.xml 2011-05-07 21:54:16.000000000 -0700
@@ -186,9 +186,14 @@
</condition>
@@ -32033,7 +32044,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
</condition>
<condition property="bootstrap.exclude.files" value="" else="${require.latest.jdk.files}">
---- ./langtools/test/Makefile 2011-05-26 19:16:47.000000000 -0700
+--- ./langtools/test/Makefile 2011-06-20 12:53:35.000000000 -0700
+++ ./langtools/test/Makefile 2011-04-22 23:11:42.000000000 -0700
@@ -34,6 +34,22 @@
ARCH=i586
@@ -32078,7 +32089,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Root of all test results
TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
---- ./langtools/test/jprt.config 2011-05-26 19:17:31.000000000 -0700
+--- ./langtools/test/jprt.config 2011-06-20 12:54:21.000000000 -0700
+++ ./langtools/test/jprt.config 2011-04-22 23:11:43.000000000 -0700
@@ -71,8 +71,8 @@
@@ -32147,7 +32158,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Export PATH setting
PATH="${path4sdk}"
---- ./langtools/test/tools/javac/4846262/Test.sh 2011-05-26 19:17:42.000000000 -0700
+--- ./langtools/test/tools/javac/4846262/Test.sh 2011-06-20 12:54:33.000000000 -0700
+++ ./langtools/test/tools/javac/4846262/Test.sh 2011-04-22 23:11:44.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -32158,7 +32169,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2011-05-26 19:17:44.000000000 -0700
+--- ./langtools/test/tools/javac/6302184/T6302184.sh 2011-06-20 12:54:37.000000000 -0700
+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2011-04-22 23:11:44.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -32169,7 +32180,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2011-05-26 19:18:02.000000000 -0700
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2011-06-20 12:55:00.000000000 -0700
+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2011-04-22 23:11:44.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -32180,7 +32191,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2011-05-26 19:18:15.000000000 -0700
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2011-06-20 12:55:11.000000000 -0700
+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2011-04-22 23:11:44.000000000 -0700
@@ -54,7 +54,7 @@
# set platform-dependent variables
@@ -32191,7 +32202,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/MissingInclude.sh 2011-05-26 19:18:23.000000000 -0700
+--- ./langtools/test/tools/javac/MissingInclude.sh 2011-06-20 12:55:27.000000000 -0700
+++ ./langtools/test/tools/javac/MissingInclude.sh 2011-04-22 23:11:45.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -32202,7 +32213,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2011-05-26 19:18:31.000000000 -0700
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2011-06-20 12:55:36.000000000 -0700
+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2011-04-22 23:11:45.000000000 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
@@ -32213,7 +32224,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2011-05-26 19:18:37.000000000 -0700
+--- ./langtools/test/tools/javac/T5090006/compiler.sh 2011-06-20 12:55:49.000000000 -0700
+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2011-04-22 23:11:45.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -32224,7 +32235,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/apt.sh 2011-05-26 19:19:04.000000000 -0700
+--- ./langtools/test/tools/javac/apt.sh 2011-06-20 12:56:19.000000000 -0700
+++ ./langtools/test/tools/javac/apt.sh 2011-04-22 23:11:45.000000000 -0700
@@ -38,7 +38,7 @@
# set platform-dependent variables
@@ -32235,7 +32246,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2011-05-26 19:19:13.000000000 -0700
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2011-06-20 12:56:26.000000000 -0700
+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2011-04-22 23:11:46.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -32246,7 +32257,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2011-05-26 19:19:59.000000000 -0700
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2011-06-20 12:57:21.000000000 -0700
+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2011-04-22 23:11:46.000000000 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
@@ -32257,7 +32268,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2011-05-26 19:20:48.000000000 -0700
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2011-06-20 12:58:18.000000000 -0700
+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2011-04-22 23:11:47.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -32268,7 +32279,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh 2011-05-26 19:20:49.000000000 -0700
+--- ./langtools/test/tools/javac/javazip/Test.sh 2011-06-20 12:58:18.000000000 -0700
+++ ./langtools/test/tools/javac/javazip/Test.sh 2011-04-22 23:11:47.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -32279,7 +32290,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
SCR=`pwd`
;;
---- ./langtools/test/tools/javac/links/links.sh 2011-05-26 19:20:52.000000000 -0700
+--- ./langtools/test/tools/javac/links/links.sh 2011-06-20 12:58:20.000000000 -0700
+++ ./langtools/test/tools/javac/links/links.sh 2011-04-22 23:11:47.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -32290,7 +32301,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh 2011-05-26 19:21:00.000000000 -0700
+--- ./langtools/test/tools/javac/newlines/Newlines.sh 2011-06-20 12:58:34.000000000 -0700
+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2011-04-22 23:11:48.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -32301,7 +32312,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2011-05-26 19:21:13.000000000 -0700
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2011-06-20 12:58:59.000000000 -0700
+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2011-04-22 23:11:48.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -32312,7 +32323,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2011-05-26 19:21:16.000000000 -0700
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2011-06-20 12:59:12.000000000 -0700
+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2011-04-22 23:11:48.000000000 -0700
@@ -66,6 +66,17 @@
exit 0;
@@ -32332,7 +32343,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
Windows_98 | Windows_ME )
echo "As Windows 98/Me do not provide Unicode-aware file system, the compilation of the test case is expected to fail on these platforms. Ignoring this test."
exit 0;
---- ./langtools/test/tools/javah/6257087/foo.sh 2011-05-26 19:21:30.000000000 -0700
+--- ./langtools/test/tools/javah/6257087/foo.sh 2011-06-20 12:59:35.000000000 -0700
+++ ./langtools/test/tools/javah/6257087/foo.sh 2011-04-22 23:11:49.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -32343,7 +32354,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2011-05-26 19:21:31.000000000 -0700
+--- ./langtools/test/tools/javah/ConstMacroTest.sh 2011-06-20 12:59:36.000000000 -0700
+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2011-04-22 23:11:49.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -32354,7 +32365,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2011-05-26 19:21:31.000000000 -0700
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2011-06-20 12:59:36.000000000 -0700
+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2011-04-22 23:11:49.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -32365,7 +32376,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ReadOldClass.sh 2011-05-26 19:21:31.000000000 -0700
+--- ./langtools/test/tools/javah/ReadOldClass.sh 2011-06-20 12:59:37.000000000 -0700
+++ ./langtools/test/tools/javah/ReadOldClass.sh 2011-04-22 23:11:49.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -32376,7 +32387,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javap/pathsep.sh 2011-05-26 19:21:34.000000000 -0700
+--- ./langtools/test/tools/javap/pathsep.sh 2011-06-20 12:59:42.000000000 -0700
+++ ./langtools/test/tools/javap/pathsep.sh 2011-04-22 23:11:49.000000000 -0700
@@ -40,7 +40,7 @@
# set platform-dependent variables
@@ -32387,7 +32398,7 @@ Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./make/Defs-internal.gmk 2011-05-26 17:05:29.000000000 -0700
+--- ./make/Defs-internal.gmk 2011-06-20 09:35:46.000000000 -0700
+++ ./make/Defs-internal.gmk 2011-04-22 22:19:24.000000000 -0700
@@ -79,7 +79,7 @@
# Find all build_time_* files and print their contents in a list sorted
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-26 20:04:03 +0000