aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2010-12-14 23:37:29 +0000
committerGreg Lewis <glewis@FreeBSD.org>2010-12-14 23:37:29 +0000
commitbe29271c63bcfd92280588cbdfccb6d33187b8cf (patch)
tree666fdb726eeba2a2ff787f40884a493e8784c5bc /java
parent3fc9cc9ed381703d46ae7fc462dc2c97c8a33913 (diff)
downloadports-be29271c63bcfd92280588cbdfccb6d33187b8cf.tar.gz
ports-be29271c63bcfd92280588cbdfccb6d33187b8cf.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/openjdk7/Makefile4
-rw-r--r--java/openjdk7/distinfo4
-rw-r--r--java/openjdk7/files/patch-set1876
-rw-r--r--java/openjdk7/files/patch-zzz-nio-kqueue10
4 files changed, 991 insertions, 903 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 9e8ae07326a6..b30dfb0315a9 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -36,8 +36,8 @@ MAKE_JOBS_UNSAFE= YES
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 0
-JDK_BUILD_NUMBER= 117
-JDK_BUILD_DATE= 04_nov_2010
+JDK_BUILD_NUMBER= 121
+JDK_BUILD_DATE= 09_dec_2010
JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}-ea-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
# Use our own version of ant to avoid circular dependencies
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index 67e36fd71ba5..96c6352a3764 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openjdk-7-ea-src-b117-04_nov_2010.zip) = 966f623c13152980773eac0a04b00e5d7b20a20adab1b7865cd8c847726cbeb3
-SIZE (openjdk-7-ea-src-b117-04_nov_2010.zip) = 85420789
+SHA256 (openjdk-7-ea-src-b121-09_dec_2010.zip) = d45a1922b6a3083aba239d651325822e00f8d4b072efbed80139e9d9df0009d2
+SIZE (openjdk-7-ea-src-b121-09_dec_2010.zip) = 85655941
SHA256 (jaxp-1_4_4.zip) = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
SIZE (jaxp-1_4_4.zip) = 5972577
SHA256 (jdk7-jaxws2_2-2010_08_19.zip) = b8877aafbb15a348babcaee4ee372fb3e2ea0282f8fe93d306272fd24d7847de
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
index c356dbc5a764..331504557a0f 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,26 +1,26 @@
---- ./.hgtags 2010-11-04 16:11:55.000000000 -0700
-+++ ./.hgtags 2010-11-06 22:59:28.000000000 -0700
-@@ -91,3 +91,4 @@
- 27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114
- e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
- 94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116
-+7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
---- ./.jcheck/conf 2010-11-04 16:11:55.000000000 -0700
+--- ./.hgtags 2010-12-09 09:27:47.000000000 -0800
++++ ./.hgtags 2010-12-11 09:07:01.000000000 -0800
+@@ -95,3 +95,4 @@
+ a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
+ 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
+ 366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
++2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
+--- ./.jcheck/conf 2010-12-09 09:27:47.000000000 -0800
+++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/.hgtags 2010-11-04 16:11:58.000000000 -0700
-+++ ./corba/.hgtags 2010-11-06 22:59:32.000000000 -0700
-@@ -91,3 +91,4 @@
- 88fddb73c5c4a4b50c319cbae9380caf5172ab45 jdk7-b114
- da7561d479e0ddaa4650d8023ac0fc7294e014e3 jdk7-b115
- 98c028de4301106f2285ac0e128a1bb9b4c24f5c jdk7-b116
-+fa502e4834dac2176499cc1f44794d5dc32a11b9 jdk7-b117
---- ./corba/.jcheck/conf 2010-11-04 16:11:58.000000000 -0700
+--- ./corba/.hgtags 2010-12-09 09:28:19.000000000 -0800
++++ ./corba/.hgtags 2010-12-11 09:07:04.000000000 -0800
+@@ -95,3 +95,4 @@
+ 42e77836fded7c2a3080d27316b96634ea9e33c6 jdk7-b118
+ 39829414ae31a0080578a49b751899edd518cd7d jdk7-b119
+ cff5a173ec1e89013359e804a3e31736ef6fb462 jdk7-b120
++2cc9f32992101732b23730b737740e64ebc5fa89 jdk7-b121
+--- ./corba/.jcheck/conf 2010-12-09 09:28:19.000000000 -0800
+++ ./corba/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/make/common/Defs-bsd.gmk 2010-11-07 17:21:38.000000000 -0800
+--- ./corba/make/common/Defs-bsd.gmk 2010-12-13 23:06:10.000000000 -0800
+++ ./corba/make/common/Defs-bsd.gmk 2010-10-31 14:11:33.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 2010-11-04 16:11:58.000000000 -0700
+--- ./corba/make/common/Defs.gmk 2010-12-09 09:28:21.000000000 -0800
+++ ./corba/make/common/Defs.gmk 2010-10-31 14:08:26.000000000 -0700
@@ -53,6 +53,28 @@
@@ -73,7 +73,7 @@
#
# Get platform definitions
#
---- ./corba/make/common/shared/Defs-bsd.gmk 2010-11-07 17:21:38.000000000 -0800
+--- ./corba/make/common/shared/Defs-bsd.gmk 2010-12-13 23:06:10.000000000 -0800
+++ ./corba/make/common/shared/Defs-bsd.gmk 2010-10-31 14:10:12.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 2010-11-04 16:11:58.000000000 -0700
+--- ./corba/make/common/shared/Defs-utils.gmk 2010-12-09 09:28:22.000000000 -0800
+++ ./corba/make/common/shared/Defs-utils.gmk 2010-10-31 13:48:36.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 2010-11-04 16:11:58.000000000 -0700
+--- ./corba/make/common/shared/Platform.gmk 2010-12-09 09:28:22.000000000 -0800
+++ ./corba/make/common/shared/Platform.gmk 2010-10-31 14:05:41.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.78
---- ./hotspot/.hgtags 2010-11-04 16:12:12.000000000 -0700
-+++ ./hotspot/.hgtags 2010-11-06 22:59:36.000000000 -0700
-@@ -127,3 +127,4 @@
- 5511edd5d719f3fc9fdd04879482026a3d2c8652 hs20-b01
- bdbc48857210a509b3c50a3291ecb9dd6a72e016 jdk7-b115
- 96b3f2a7add0b445b8aa421f6823cff5a2e2fe03 jdk7-b116
-+806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117
---- ./hotspot/.jcheck/conf 2010-11-04 16:12:12.000000000 -0700
+--- ./hotspot/.hgtags 2010-12-09 09:30:59.000000000 -0800
++++ ./hotspot/.hgtags 2010-12-11 09:07:07.000000000 -0800
+@@ -133,3 +133,4 @@
+ 3ef7426b4deac5dcfd4afb35cabe9ab3d666df91 hs20-b02
+ 5484e7c53fa7da5e869902437ee08a9ae10c1c69 jdk7-b119
+ f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120
++3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121
+--- ./hotspot/.jcheck/conf 2010-12-09 09:30:59.000000000 -0800
+++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./hotspot/agent/make/Makefile 2010-11-04 16:12:12.000000000 -0700
+--- ./hotspot/agent/make/Makefile 2010-12-09 09:31:00.000000000 -0800
+++ ./hotspot/agent/make/Makefile 2010-06-15 22:03:11.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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-07-04 09:30:36.000000000 -0700
@@ -22,6 +22,7 @@
*
@@ -450,7 +450,7 @@
#endif /* amd64 */
---- ./hotspot/agent/src/os/bsd/Makefile 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/Makefile 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/Makefile 2010-07-04 09:45:58.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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2010-07-04 09:30:36.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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/libproc.h 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/libproc.h 2010-07-04 09:30:36.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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-07-04 09:30:37.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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-07-04 09:30:37.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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/mapfile 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/mapfile 2010-07-04 09:30:37.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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/proc_service.h 2010-12-13 23:06:09.000000000 -0800
+++ ./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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/ps_core.c 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/ps_core.c 2010-07-04 09:30:46.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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2010-10-31 14:26:55.000000000 -0700
@@ -22,20 +22,22 @@
*
@@ -2129,7 +2129,7 @@
- }
return ph;
}
---- ./hotspot/agent/src/os/bsd/salibelf.c 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/salibelf.c 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/salibelf.c 2010-07-04 09:30:46.000000000 -0700
@@ -25,6 +25,7 @@
#include "salibelf.h"
@@ -2139,7 +2139,7 @@
extern void print_debug(const char*,...);
---- ./hotspot/agent/src/os/bsd/symtab.c 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/symtab.c 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/symtab.c 2010-07-04 09:30:46.000000000 -0700
@@ -23,10 +23,10 @@
*/
@@ -2540,7 +2540,7 @@
void destroy_symtab(struct symtab* symtab) {
if (!symtab) return;
if (symtab->strs) free(symtab->strs);
---- ./hotspot/agent/src/os/bsd/symtab.h 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/symtab.h 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/symtab.h 2010-07-04 09:30:46.000000000 -0700
@@ -32,7 +32,7 @@
struct symtab;
@@ -2551,7 +2551,7 @@
// destroy the symbol table
void destroy_symtab(struct symtab* symtab);
---- ./hotspot/agent/src/os/bsd/test.c 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/test.c 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/test.c 2010-07-04 09:30:46.000000000 -0700
@@ -44,7 +44,7 @@
}
@@ -2562,7 +2562,7 @@
return 1;
}
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-11-04 16:12:12.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-12-09 09:31:19.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-06-15 22:03:12.000000000 -0700
@@ -28,6 +28,7 @@
import java.net.*;
@@ -2633,7 +2633,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 2010-11-04 16:12:12.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-12-09 09:31:27.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-06-15 22:03:14.000000000 -0700
@@ -29,6 +29,7 @@
import java.rmi.*;
@@ -2706,7 +2706,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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-07-04 09:30:46.000000000 -0700
@@ -30,10 +30,8 @@
import sun.jvm.hotspot.debugger.cdbg.*;
@@ -2733,7 +2733,7 @@
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-07-04 09:30:46.000000000 -0700
@@ -26,9 +26,7 @@
@@ -2756,7 +2756,7 @@
} else {
throw new RuntimeException("cpu " + cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -2805,7 +2805,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,81 +0,0 @@
-/*
@@ -2889,7 +2889,7 @@
- private Address sp;
- private BsdDebugger dbg;
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -2938,7 +2938,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-12-09 09:31:48.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-06-15 22:03:17.000000000 -0700
@@ -37,6 +37,8 @@
import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
@@ -2963,7 +2963,7 @@
}
if (access == null) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-07-04 09:31:12.000000000 -0700
@@ -28,37 +28,36 @@
private static String[] signalNames = {
@@ -3025,7 +3025,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,137 +0,0 @@
-/*
@@ -3165,7 +3165,7 @@
- return debugger.getThreadForIdentifierAddress(pthreadIdAddr);
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,165 +0,0 @@
-/*
@@ -3333,7 +3333,7 @@
-
-
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-07-04 09:31:25.000000000 -0700
@@ -28,37 +28,36 @@
private static String[] signalNames = {
@@ -3395,7 +3395,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-12-09 09:31:55.000000000 -0800
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-06-15 22:03:18.000000000 -0700
@@ -37,6 +37,14 @@
return "solaris";
@@ -3412,7 +3412,7 @@
} else if (os.startsWith("Windows")) {
return "win32";
} else {
---- ./hotspot/make/Makefile 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/make/Makefile 2010-12-09 09:31:58.000000000 -0800
+++ ./hotspot/make/Makefile 2010-10-31 14:22:38.000000000 -0700
@@ -321,28 +321,28 @@
ifneq ($(OSNAME),windows)
@@ -3453,8 +3453,8 @@
$(install-file)
endif
endif
---- ./hotspot/make/bsd/Makefile 2010-11-07 17:21:37.000000000 -0800
-+++ ./hotspot/make/bsd/Makefile 2010-10-31 14:26:55.000000000 -0700
+--- ./hotspot/make/bsd/Makefile 2010-12-13 23:06:09.000000000 -0800
++++ ./hotspot/make/bsd/Makefile 2010-12-04 08:30:56.000000000 -0800
@@ -39,11 +39,11 @@
# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
# an architecture that differs from the target architecture, as long
@@ -3469,7 +3469,7 @@
# Along with VM, Serviceability Agent (SA) is built for SA/JDI binding.
# JDI binding on SA produces two binaries:
-@@ -92,7 +92,7 @@
+@@ -94,7 +94,7 @@
#
# We only do this on SunOS variants, for a couple of reasons:
# * It is extremely rare that source trees exist on other systems
@@ -3478,7 +3478,7 @@
# changing GAMMADIR in a way that exercises the automounter could
# prove to be a source of unreliability in the build process.
# Obviously, this Makefile is only relevant on SunOS boxes to begin
-@@ -224,11 +224,12 @@
+@@ -226,11 +226,12 @@
checks: check_os_version check_j2se_version
@@ -3493,7 +3493,7 @@
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
---- ./hotspot/make/bsd/makefiles/buildtree.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/buildtree.make 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/buildtree.make 2010-10-31 14:26:55.000000000 -0700
@@ -287,10 +287,11 @@
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
@@ -3508,7 +3508,7 @@
) > $@
env.csh: env.sh
---- ./hotspot/make/bsd/makefiles/cscope.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/cscope.make 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/cscope.make 2010-07-04 09:31:25.000000000 -0700
@@ -71,7 +71,7 @@
# OS-specific files for other systems are excluded by default. Use CS_OS=yes
@@ -3519,7 +3519,7 @@
CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
endif
---- ./hotspot/make/bsd/makefiles/defs.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/defs.make 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/defs.make 2010-10-31 14:48:17.000000000 -0700
@@ -72,8 +72,8 @@
HS_ARCH = sparc
@@ -3627,7 +3627,7 @@
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
-
-
---- ./hotspot/make/bsd/makefiles/gcc.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/gcc.make 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/gcc.make 2010-10-31 15:24:40.000000000 -0700
@@ -22,18 +22,22 @@
#
@@ -3750,7 +3750,7 @@
#------------------------------------------------------------------------
# Debug flags
---- ./hotspot/make/bsd/makefiles/jsig.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/jsig.make 2010-12-13 23:06:09.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/jsig.make 2010-07-04 09:31:25.000000000 -0700
@@ -25,11 +25,16 @@
# Rules to build signal interposition library, used by vm.make
@@ -3791,7 +3791,7 @@
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
install_jsig: $(LIBJSIG)
---- ./hotspot/make/bsd/makefiles/launcher.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/launcher.make 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/launcher.make 2010-07-04 09:31:25.000000000 -0700
@@ -46,7 +46,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
@@ -3802,7 +3802,7 @@
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
---- ./hotspot/make/bsd/makefiles/sa.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/sa.make 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/sa.make 2010-10-31 14:26:55.000000000 -0700
@@ -45,8 +45,8 @@
@@ -3815,7 +3815,7 @@
AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
---- ./hotspot/make/bsd/makefiles/saproc.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/saproc.make 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/saproc.make 2010-10-31 14:26:55.000000000 -0700
@@ -25,23 +25,34 @@
# Rules to build serviceability agent library, used by vm.make
@@ -3884,7 +3884,7 @@
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
install_saproc: checkAndBuildSA
---- ./hotspot/make/bsd/makefiles/vm.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/vm.make 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/vm.make 2010-10-31 14:26:55.000000000 -0700
@@ -90,6 +90,10 @@
${JRE_VERSION} \
@@ -4003,7 +4003,7 @@
}
DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
---- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/zeroshark.make 2010-07-04 09:31:26.000000000 -0700
@@ -40,4 +40,23 @@
CFLAGS += -D_LP64=1
@@ -4029,7 +4029,7 @@
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
OPT_CFLAGS/compactingPermGenGen.o = -O1
---- ./hotspot/make/bsd/platform_amd64 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/platform_amd64 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/platform_amd64 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4037,7 +4037,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_amd64.suncc 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/platform_amd64.suncc 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/platform_amd64.suncc 2010-01-17 15:46:11.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4045,7 +4045,7 @@
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_i486 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/platform_i486 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/platform_i486 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4053,7 +4053,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_i486.suncc 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/platform_i486.suncc 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/platform_i486.suncc 2010-01-17 15:46:11.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4061,7 +4061,7 @@
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_ia64 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/platform_ia64 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/platform_ia64 2010-01-17 15:46:11.000000000 -0800
@@ -10,6 +10,6 @@
@@ -4071,7 +4071,7 @@
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP
mark_style = alignment
---- ./hotspot/make/bsd/platform_sparc 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/platform_sparc 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/platform_sparc 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4079,7 +4079,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_sparcv9 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/platform_sparcv9 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/platform_sparcv9 2010-01-17 15:46:11.000000000 -0800
@@ -12,4 +12,4 @@
@@ -4087,7 +4087,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_zero.in 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/make/bsd/platform_zero.in 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/make/bsd/platform_zero.in 2009-11-04 19:52:29.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4095,7 +4095,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/defs.make 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/make/defs.make 2010-12-09 09:31:58.000000000 -0800
+++ ./hotspot/make/defs.make 2010-10-31 14:03:01.000000000 -0700
@@ -119,13 +119,23 @@
# Windows should have OS predefined
@@ -4123,7 +4123,7 @@
else
OSNAME=solaris
endif
---- ./hotspot/make/linux/makefiles/defs.make 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/make/linux/makefiles/defs.make 2010-12-09 09:31:58.000000000 -0800
+++ ./hotspot/make/linux/makefiles/defs.make 2010-10-31 14:24:05.000000000 -0700
@@ -116,33 +116,36 @@
@@ -4167,7 +4167,7 @@
$(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
---- ./hotspot/make/sa.files 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/make/sa.files 2010-12-09 09:32:02.000000000 -0800
+++ ./hotspot/make/sa.files 2010-06-15 22:03:19.000000000 -0700
@@ -50,6 +50,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
@@ -4189,7 +4189,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 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/make/solaris/makefiles/defs.make 2010-12-09 09:32:02.000000000 -0800
+++ ./hotspot/make/solaris/makefiles/defs.make 2010-10-31 14:25:25.000000000 -0700
@@ -61,34 +61,37 @@
@@ -4242,7 +4242,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/windows/makefiles/defs.make 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/make/windows/makefiles/defs.make 2010-12-09 09:32:05.000000000 -0800
+++ ./hotspot/make/windows/makefiles/defs.make 2010-07-10 12:30:12.000000000 -0700
@@ -109,6 +109,9 @@
@@ -4285,7 +4285,18 @@
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2010-12-09 09:32:08.000000000 -0800
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2010-11-13 14:40:43.000000000 -0800
+@@ -63,4 +63,8 @@
+ define_pd_global(bool, RewriteBytecodes, true);
+ define_pd_global(bool, RewriteFrequentPairs, true);
+
++#ifdef _ALLBSD_SOURCE
++define_pd_global(bool, UseMembar, true);
++#else
+ define_pd_global(bool, UseMembar, false);
++#endif
+--- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-12-09 09:32:10.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-10-31 14:03:01.000000000 -0700
@@ -469,8 +469,8 @@
// Fetch the exception from TLS and clear out exception related thread state
@@ -4298,7 +4309,18 @@
__ bind(_unwind_handler_entry);
__ verify_not_null_oop(rax);
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2010-12-09 09:32:11.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2010-11-13 14:40:31.000000000 -0800
+@@ -64,4 +64,8 @@
+ define_pd_global(bool, RewriteBytecodes, true);
+ define_pd_global(bool, RewriteFrequentPairs, true);
+
++#ifdef _ALLBSD_SOURCE
++define_pd_global(bool, UseMembar, true);
++#else
+ define_pd_global(bool, UseMembar, false);
++#endif
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-12-09 09:32:11.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-10-31 14:03:01.000000000 -0700
@@ -1153,7 +1153,7 @@
int recvr_offset = in_bytes(VirtualCallData::receiver_offset(start_row));
@@ -4318,7 +4340,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/jni_x86.h 2010-11-04 16:12:13.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-12-09 09:32:11.000000000 -0800
+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-06-15 22:03:21.000000000 -0700
@@ -26,7 +26,7 @@
#ifndef _JAVASOFT_JNI_MD_H_
@@ -4329,7 +4351,18 @@
#define JNIEXPORT
#define JNIIMPORT
#define JNICALL
---- ./hotspot/src/os/bsd/launcher/java_md.c 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2010-12-09 09:32:13.000000000 -0800
++++ ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2010-11-13 14:40:56.000000000 -0800
+@@ -46,4 +46,8 @@
+ define_pd_global(bool, RewriteBytecodes, true);
+ define_pd_global(bool, RewriteFrequentPairs, true);
+
++#ifdef _ALLBSD_SOURCE
++define_pd_global(bool, UseMembar, true);
++#else
+ define_pd_global(bool, UseMembar, false);
++#endif
+--- ./hotspot/src/os/bsd/launcher/java_md.c 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/launcher/java_md.c 2010-10-31 14:26:55.000000000 -0700
@@ -45,8 +45,15 @@
#include "version_comp.h"
@@ -4468,8 +4501,8 @@
result = bsd_i586_ServerClassMachine();
#else
if (_launcher_debug) {
---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-11-07 17:21:37.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-10-31 14:58:17.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-12-13 23:06:10.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-11-13 14:35:21.000000000 -0800
@@ -334,6 +334,15 @@
// get the credentials of the peer and check the effective uid/guid
@@ -4524,7 +4557,7 @@
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
---- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
@@ -28,6 +28,14 @@
# include <sys/param.h>
@@ -4555,7 +4588,7 @@
#endif
*(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */
---- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
@@ -36,7 +36,7 @@
// HPI_FileInterface
@@ -4607,7 +4640,7 @@
}
---- ./hotspot/src/os/bsd/vm/jsig.c 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/jsig.c 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/jsig.c 2010-07-04 09:31:26.000000000 -0700
@@ -143,7 +143,8 @@
}
@@ -4619,7 +4652,7 @@
}
static int call_os_sigaction(int sig, const struct sigaction *act,
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
@@ -144,38 +144,31 @@
"ILL", SIGILL, /* Illegal instruction (ANSI). */
@@ -4670,7 +4703,7 @@
};
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-07-04 09:31:26.000000000 -0700
@@ -51,7 +51,11 @@
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
@@ -4705,7 +4738,88 @@
#endif /* JVM_MD_H */
// Reconciliation History
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/objectMonitor_bsd.cpp 1969-12-31 16:00:00.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/objectMonitor_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
+@@ -0,0 +1,24 @@
++
++/*
++ * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ *
++ */
+--- ./hotspot/src/os/bsd/vm/objectMonitor_bsd.hpp 1969-12-31 16:00:00.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/objectMonitor_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
+@@ -0,0 +1,25 @@
++/*
++ * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ *
++ */
++
++ private:
+--- ./hotspot/src/os/bsd/vm/objectMonitor_bsd.inline.hpp 1969-12-31 16:00:00.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/objectMonitor_bsd.inline.hpp 2010-07-04 09:31:26.000000000 -0700
+@@ -0,0 +1,23 @@
++/*
++ * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ *
++ */
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
@@ -28,8 +28,8 @@
@@ -4718,7 +4832,7 @@
_siginfo = NULL;
_ucontext = NULL;
_expanding_stack = 0;
---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
@@ -36,6 +36,12 @@
@@ -4777,8 +4891,8 @@
pthread_t pthread_id() const {
return _pthread_id;
}
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-11-07 17:21:37.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-10-31 15:03:20.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-12-13 23:06:10.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-11-13 14:36:41.000000000 -0800
@@ -46,20 +46,42 @@
# include <sys/utsname.h>
# include <sys/socket.h>
@@ -5032,7 +5146,7 @@
// initialize signal mask for this thread
os::Bsd::hotspot_sigmask(thread);
-@@ -851,17 +940,22 @@
+@@ -853,17 +942,22 @@
// let pthread_create() pick the default value.
}
@@ -5055,7 +5169,7 @@
pthread_t tid;
int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
-@@ -875,7 +969,9 @@
+@@ -877,7 +971,9 @@
// Need to clean up stuff we've allocated so far
thread->set_osthread(NULL);
delete osthread;
@@ -5065,7 +5179,7 @@
return false;
}
-@@ -891,9 +987,11 @@
+@@ -893,9 +989,11 @@
}
}
@@ -5077,7 +5191,7 @@
}
// Aborted due to thread limit being reached
-@@ -931,7 +1029,11 @@
+@@ -933,7 +1031,11 @@
}
// Store pthread info into the OSThread
@@ -5089,7 +5203,7 @@
osthread->set_pthread_id(::pthread_self());
// initialize floating point control register
-@@ -942,6 +1044,7 @@
+@@ -944,6 +1046,7 @@
thread->set_osthread(osthread);
@@ -5097,7 +5211,7 @@
if (UseNUMA) {
int lgrp_id = os::numa_get_group_id();
if (lgrp_id != -1) {
-@@ -968,6 +1071,7 @@
+@@ -970,6 +1073,7 @@
os::Bsd::manually_expand_stack(jt, addr);
osthread->clear_expanding_stack();
}
@@ -5105,7 +5219,7 @@
// initialize signal mask for this thread
// and save the caller's signal mask
-@@ -1026,6 +1130,7 @@
+@@ -1028,6 +1132,7 @@
//////////////////////////////////////////////////////////////////////////////
// initial thread
@@ -5113,7 +5227,7 @@
// Check if current thread is the initial thread, similar to Solaris thr_main.
bool os::Bsd::is_initial_thread(void) {
char dummy;
-@@ -1262,6 +1367,7 @@
+@@ -1264,6 +1369,7 @@
_initial_thread_stack_size = align_size_down(_initial_thread_stack_size, page_size());
_initial_thread_stack_bottom = (address)stack_top - _initial_thread_stack_size;
}
@@ -5121,7 +5235,7 @@
////////////////////////////////////////////////////////////////////////////////
// time support
-@@ -1283,9 +1389,7 @@
+@@ -1285,9 +1391,7 @@
return (1000 * 1000);
}
@@ -5132,7 +5246,7 @@
bool os::supports_vtime() { return false; }
bool os::enable_vtime() { return false; }
bool os::vtime_enabled() { return false; }
-@@ -1305,6 +1409,21 @@
+@@ -1307,6 +1411,21 @@
#define CLOCK_MONOTONIC (1)
#endif
@@ -5154,7 +5268,7 @@
void os::Bsd::clock_init() {
// we do dlopen's in this particular order due to bug in bsd
// dynamical loader (see 6348968) leading to crash on exit
-@@ -1340,7 +1459,9 @@
+@@ -1342,7 +1461,9 @@
}
}
}
@@ -5164,7 +5278,7 @@
#ifndef SYS_clock_getres
#if defined(IA32) || defined(AMD64)
-@@ -1381,6 +1502,7 @@
+@@ -1383,6 +1504,7 @@
_pthread_getcpuclockid = pthread_getcpuclockid_func;
}
}
@@ -5172,7 +5286,7 @@
jlong os::javaTimeNanos() {
if (Bsd::supports_monotonic_clock()) {
-@@ -1531,7 +1653,14 @@
+@@ -1533,7 +1655,14 @@
// DLL functions
@@ -5188,7 +5302,7 @@
const char* os::get_temp_directory() {
const char *prop = Arguments::get_property("java.io.tmpdir");
-@@ -1552,13 +1681,13 @@
+@@ -1554,13 +1683,13 @@
const size_t pnamelen = pname ? strlen(pname) : 0;
// Quietly truncate on buffer overflow. Should be an error.
@@ -5204,7 +5318,7 @@
} else if (strchr(pname, *os::path_separator()) != NULL) {
int n;
char** pelements = split_path(pname, &n);
-@@ -1567,7 +1696,8 @@
+@@ -1569,7 +1698,8 @@
if (pelements[i] == NULL || strlen(pelements[i]) == 0) {
continue; // skip the empty path values
}
@@ -5214,7 +5328,7 @@
if (file_exists(buffer)) {
break;
}
-@@ -1582,7 +1712,7 @@
+@@ -1584,7 +1714,7 @@
FREE_C_HEAP_ARRAY(char*, pelements);
}
} else {
@@ -5223,7 +5337,7 @@
}
}
-@@ -1623,6 +1753,23 @@
+@@ -1625,6 +1755,23 @@
}
}
@@ -5247,7 +5361,7 @@
struct _address_to_library_name {
address addr; // input : memory address
size_t buflen; // size of fname
-@@ -1697,11 +1844,27 @@
+@@ -1699,11 +1846,27 @@
return false;
}
}
@@ -5275,7 +5389,7 @@
void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
{
void * result= ::dlopen(filename, RTLD_LAZY);
-@@ -1754,6 +1917,26 @@
+@@ -1756,6 +1919,26 @@
#define EM_486 6 /* Intel 80486 */
#endif
@@ -5302,7 +5416,7 @@
static const arch_t arch_array[]={
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
{EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
-@@ -1857,17 +2040,11 @@
+@@ -1859,17 +2042,11 @@
return NULL;
}
@@ -5323,7 +5437,7 @@
}
-@@ -1890,7 +2067,51 @@
+@@ -1892,7 +2069,51 @@
void os::print_dll_info(outputStream *st) {
st->print_cr("Dynamic libraries:");
@@ -5376,7 +5490,7 @@
char fname[32];
pid_t pid = os::Bsd::gettid();
-@@ -1899,6 +2120,7 @@
+@@ -1901,6 +2122,7 @@
if (!_print_ascii_file(fname, st)) {
st->print("Can not get library information for pid = %d\n", pid);
}
@@ -5384,7 +5498,7 @@
}
-@@ -1933,6 +2155,7 @@
+@@ -1935,6 +2157,7 @@
st->print(name.machine);
st->cr();
@@ -5392,7 +5506,7 @@
// Print warning if unsafe chroot environment detected
if (unsafe_chroot_detected) {
st->print("WARNING!! ");
-@@ -1947,6 +2170,7 @@
+@@ -1949,6 +2172,7 @@
st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed");
}
st->cr();
@@ -5400,7 +5514,7 @@
// rlimit
st->print("rlimit:");
-@@ -1972,6 +2196,7 @@
+@@ -1974,6 +2198,7 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -5408,7 +5522,7 @@
st->print(", AS ");
getrlimit(RLIMIT_AS, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
-@@ -1984,11 +2209,7 @@
+@@ -1986,11 +2211,7 @@
os::loadavg(loadavg, 3);
st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]);
st->cr();
@@ -5421,7 +5535,7 @@
}
void os::print_memory_info(outputStream* st) {
-@@ -1996,18 +2217,27 @@
+@@ -1998,18 +2219,27 @@
st->print("Memory:");
st->print(" %dk page", os::vm_page_size()>>10);
@@ -5449,7 +5563,7 @@
st->cr();
}
-@@ -2250,19 +2480,29 @@
+@@ -2252,19 +2482,29 @@
static volatile jint pending_signals[NSIG+1] = { 0 };
// Bsd(POSIX) specific hand shaking semaphore.
@@ -5481,7 +5595,7 @@
}
static int check_pending_signals(bool wait) {
-@@ -2284,7 +2524,7 @@
+@@ -2286,7 +2526,7 @@
do {
thread->set_suspend_equivalent();
// cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
@@ -5490,7 +5604,7 @@
// were we externally suspended while we were waiting?
threadIsSuspended = thread->handle_special_suspend_equivalent_condition();
-@@ -2295,7 +2535,7 @@
+@@ -2297,7 +2537,7 @@
// while suspended because that would surprise the thread that
// suspended us.
//
@@ -5499,7 +5613,7 @@
thread->java_suspend_self();
}
-@@ -2339,10 +2579,10 @@
+@@ -2341,10 +2581,10 @@
return;
}
@@ -5512,7 +5626,7 @@
os::get_temp_directory(), os::current_process_id(), num);
unlink(buf);
-@@ -2368,9 +2608,14 @@
+@@ -2370,9 +2610,14 @@
// problem.
bool os::commit_memory(char* addr, size_t size, bool exec) {
int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
@@ -5527,7 +5641,7 @@
}
bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
-@@ -2386,36 +2631,27 @@
+@@ -2388,36 +2633,27 @@
}
void os::numa_make_global(char *addr, size_t bytes) {
@@ -5569,7 +5683,7 @@
}
bool os::get_page_info(char *start, page_info* info) {
-@@ -2426,6 +2662,7 @@
+@@ -2428,6 +2664,7 @@
return end;
}
@@ -5577,7 +5691,7 @@
extern "C" void numa_warn(int number, char *where, ...) { }
extern "C" void numa_error(char *where) { }
-@@ -2527,104 +2764,26 @@
+@@ -2529,104 +2766,26 @@
os::Bsd::numa_tonode_memory_func_t os::Bsd::_numa_tonode_memory;
os::Bsd::numa_interleave_memory_func_t os::Bsd::_numa_interleave_memory;
unsigned long* os::Bsd::_numa_all_nodes;
@@ -5689,7 +5803,7 @@
return os::uncommit_memory(addr, size);
}
-@@ -2729,6 +2888,9 @@
+@@ -2731,6 +2890,9 @@
static size_t _large_page_size = 0;
bool os::large_page_init() {
@@ -5699,7 +5813,7 @@
if (!UseLargePages) return false;
if (LargePageSizeInBytes) {
-@@ -2786,6 +2948,7 @@
+@@ -2788,6 +2950,7 @@
// We optimistically assume the support is available. If later it turns out
// not true, VM will automatically switch to use regular page size.
return true;
@@ -5707,7 +5821,7 @@
}
#ifndef SHM_HUGETLB
-@@ -2962,7 +3125,7 @@
+@@ -2964,7 +3127,7 @@
}
size_t os::read(int fd, void *buf, unsigned int nBytes) {
@@ -5716,7 +5830,7 @@
}
// TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation.
-@@ -3098,6 +3261,44 @@
+@@ -3100,6 +3263,44 @@
// this reason, the code should not be used as default (ThreadPriorityPolicy=0).
// It is only used when ThreadPriorityPolicy=1 and requires root privilege.
@@ -5761,7 +5875,7 @@
int os::java_to_os_priority[MaxPriority + 1] = {
19, // 0 Entry should never be used
-@@ -3115,6 +3316,7 @@
+@@ -3117,6 +3318,7 @@
-5 // 10 MaxPriority
};
@@ -5769,7 +5883,7 @@
static int prio_init() {
if (ThreadPriorityPolicy == 1) {
-@@ -3134,8 +3336,28 @@
+@@ -3136,8 +3338,28 @@
OSReturn os::set_native_priority(Thread* thread, int newpri) {
if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK;
@@ -5798,7 +5912,7 @@
}
OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
-@@ -3145,7 +3367,17 @@
+@@ -3147,7 +3369,17 @@
}
errno = 0;
@@ -5816,7 +5930,7 @@
return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
}
-@@ -3255,7 +3487,7 @@
+@@ -3257,7 +3489,7 @@
/* Get signal number to use for suspend/resume */
if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
int sig = ::strtol(s, 0, 10);
@@ -5825,7 +5939,7 @@
SR_signum = sig;
}
}
-@@ -3599,6 +3831,28 @@
+@@ -3601,6 +3833,28 @@
set_signal_handler(SIGFPE, true);
set_signal_handler(SIGXFSZ, true);
@@ -5854,7 +5968,7 @@
if (libjsig_is_loaded) {
// Tell libjsig jvm finishes setting signal handlers
(*end_signal_setting)();
-@@ -3619,6 +3873,7 @@
+@@ -3621,6 +3875,7 @@
}
}
@@ -5862,7 +5976,7 @@
// This is the fastest way to get thread cpu time on Bsd.
// Returns cpu time (user+sys) for any thread, not only for current.
// POSIX compliant clocks are implemented in the kernels 2.6.16+.
-@@ -3633,6 +3888,7 @@
+@@ -3635,6 +3890,7 @@
return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
}
@@ -5870,7 +5984,7 @@
/////
// glibc on Bsd platform uses non-documented flag
-@@ -3854,13 +4110,13 @@
+@@ -3856,13 +4112,13 @@
_initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid();
@@ -5886,7 +6000,7 @@
if (Bsd::page_size() == -1) {
fatal(err_msg("os_bsd.cpp: os::init: sysconf failed (%s)",
strerror(errno)));
-@@ -3874,7 +4130,16 @@
+@@ -3876,7 +4132,16 @@
Bsd::clock_init();
initial_time_count = os::elapsed_counter();
@@ -5904,7 +6018,7 @@
}
// To install functions for atexit system call
-@@ -3887,7 +4152,9 @@
+@@ -3889,7 +4154,9 @@
// this is called _after_ the global arguments have been parsed
jint os::init_2(void)
{
@@ -5914,7 +6028,7 @@
// Allocate a single page and mark it as readable for safepoint polling
address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-@@ -3936,6 +4203,7 @@
+@@ -3947,6 +4214,7 @@
JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes,
vm_page_size()));
@@ -5922,7 +6036,7 @@
Bsd::capture_initial_stack(JavaThread::stack_size_at_create());
Bsd::libpthread_init();
-@@ -3958,6 +4226,7 @@
+@@ -3969,6 +4237,7 @@
UseNUMA = true;
}
}
@@ -5930,7 +6044,7 @@
if (MaxFDLimit) {
// set the number of file descriptors to max. print out error
-@@ -3969,6 +4238,14 @@
+@@ -3980,6 +4249,14 @@
perror("os::init_2 getrlimit failed");
} else {
nbr_files.rlim_cur = nbr_files.rlim_max;
@@ -5945,7 +6059,7 @@
status = setrlimit(RLIMIT_NOFILE, &nbr_files);
if (status != 0) {
if (PrintMiscellaneous && (Verbose || WizardMode))
-@@ -3977,8 +4254,10 @@
+@@ -3988,8 +4265,10 @@
}
}
@@ -5956,7 +6070,7 @@
// Initialize HPI.
jint hpi_result = hpi::initialize();
-@@ -4029,11 +4308,15 @@
+@@ -4040,11 +4319,15 @@
};
int os::active_processor_count() {
@@ -5972,7 +6086,7 @@
}
bool os::distribute_processes(uint length, uint* distribution) {
-@@ -4075,6 +4358,9 @@
+@@ -4086,6 +4369,9 @@
int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
{
@@ -5982,7 +6096,7 @@
if (is_NPTL()) {
return pthread_cond_timedwait(_cond, _mutex, _abstime);
} else {
-@@ -4090,6 +4376,7 @@
+@@ -4101,6 +4387,7 @@
#endif // IA64
return status;
}
@@ -5990,7 +6104,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-@@ -4222,17 +4509,17 @@
+@@ -4233,17 +4520,17 @@
if (!rewrite_existing) {
oflags |= O_EXCL;
}
@@ -6011,7 +6125,7 @@
}
// Map a block of memory.
-@@ -4282,6 +4569,7 @@
+@@ -4293,6 +4580,7 @@
return munmap(addr, bytes) == 0;
}
@@ -6019,7 +6133,7 @@
static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
static clockid_t thread_cpu_clockid(Thread* thread) {
-@@ -4293,6 +4581,7 @@
+@@ -4304,6 +4592,7 @@
assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
return clockid;
}
@@ -6027,7 +6141,7 @@
// current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
// are used by JVM M&M and JVMTI to get user+sys or user CPU time
-@@ -4302,39 +4591,71 @@
+@@ -4313,39 +4602,71 @@
// the fast estimate available on the platform.
jlong os::current_thread_cpu_time() {
@@ -6099,7 +6213,7 @@
//
// -1 on error.
//
-@@ -4424,6 +4745,7 @@
+@@ -4435,6 +4756,7 @@
return (jlong)user_time * (1000000000 / clock_tics_per_sec);
}
}
@@ -6107,7 +6221,7 @@
void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits
-@@ -4440,7 +4762,13 @@
+@@ -4451,7 +4773,13 @@
}
bool os::is_thread_cpu_time_supported() {
@@ -6121,7 +6235,7 @@
}
// System loadavg support. Returns -1 if load average cannot be obtained.
-@@ -4573,7 +4901,7 @@
+@@ -4584,7 +4912,7 @@
// abstime will be the absolute timeout time
// TODO: replace compute_abstime() with unpackTime()
@@ -6130,7 +6244,7 @@
if (millis < 0) millis = 0;
struct timeval now;
int status = gettimeofday(&now, NULL);
-@@ -4625,7 +4953,7 @@
+@@ -4636,7 +4964,7 @@
status = pthread_cond_wait(_cond, _mutex);
// for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
// Treat this the same as if the wait was interrupted
@@ -6139,7 +6253,7 @@
assert_status(status == 0 || status == EINTR, status, "cond_wait");
}
-- _nParked ;
-@@ -4683,10 +5011,10 @@
+@@ -4694,10 +5022,10 @@
pthread_cond_init (_cond, NULL) ;
}
assert_status(status == 0 || status == EINTR ||
@@ -6152,7 +6266,7 @@
// We consume and ignore EINTR and spurious wakeups.
}
--_nParked ;
-@@ -4778,7 +5106,7 @@
+@@ -4789,7 +5117,7 @@
* years from "now".
*/
@@ -6161,16 +6275,16 @@
assert (time > 0, "convertTime");
struct timeval now;
-@@ -4838,7 +5166,7 @@
+@@ -4849,7 +5177,7 @@
}
// Next, demultiplex/decode time arguments
- timespec absTime;
+ struct timespec absTime;
- if (time < 0) { // don't wait at all
+ if (time < 0 || (isAbsolute && time == 0) ) { // don't wait at all
return;
}
-@@ -4892,7 +5220,7 @@
+@@ -4903,7 +5231,7 @@
}
}
assert_status(status == 0 || status == EINTR ||
@@ -6179,7 +6293,7 @@
status, "cond_timedwait");
#ifdef ASSERT
-@@ -4935,14 +5263,12 @@
+@@ -4946,14 +5274,12 @@
}
@@ -6199,7 +6313,7 @@
#endif
// Run the specified command in a separate process. Return its exit value,
-@@ -4957,8 +5283,7 @@
+@@ -4968,8 +5294,7 @@
// separate process to execve. Make a direct syscall to fork process.
// On IA64 there's no fork syscall, we have to use fork() and hope for
// the best...
@@ -6209,7 +6323,7 @@
if (pid < 0) {
// fork failed
-@@ -4974,8 +5299,7 @@
+@@ -4985,8 +5310,7 @@
// in the new process, so make a system call directly.
// IA64 should use normal execve() from glibc to match the glibc fork()
// above.
@@ -6219,7 +6333,7 @@
// execve failed
_exit(-1);
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
@@ -27,6 +27,12 @@
/* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
@@ -6357,7 +6471,7 @@
// Stack repair handling
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-07-04 09:31:26.000000000 -0700
@@ -61,7 +61,15 @@
@@ -6375,7 +6489,7 @@
}
---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
@@ -241,7 +241,7 @@
@@ -6434,7 +6548,7 @@
+// Reconciliation History
+// vtune_solaris.cpp 1.8 99/07/12 23:54:21
+// End
---- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,45 +0,0 @@
-/*
@@ -6482,7 +6596,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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,206 +0,0 @@
-/*
@@ -6691,7 +6805,7 @@
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) {
- return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value);
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-//
@@ -6721,7 +6835,7 @@
-//
-
-// SPARC Bsd Architecture Description File
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800
@@ -1,105 +0,0 @@
-#
@@ -6829,7 +6943,7 @@
- ta 0x03
- retl
- mov %fp, %o0
---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,36 +0,0 @@
-/*
@@ -6868,7 +6982,7 @@
-define_pd_global(uintx, HeapBaseMinAddress, 4*G);
-// Only used on 64 bit Windows platforms
-define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,102 +0,0 @@
-/*
@@ -6973,11 +7087,11 @@
-
-inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); }
-inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,648 +0,0 @@
+@@ -1,724 +0,0 @@
-/*
-- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
@@ -7178,6 +7292,18 @@
- sigcontext* sc = (sigcontext*)context;
- st->print_cr("Registers:");
-
+- st->print_cr(" G1=" INTPTR_FORMAT " G2=" INTPTR_FORMAT
+- " G3=" INTPTR_FORMAT " G4=" INTPTR_FORMAT,
+- SIG_REGS(sc).u_regs[CON_G1],
+- SIG_REGS(sc).u_regs[CON_G2],
+- SIG_REGS(sc).u_regs[CON_G3],
+- SIG_REGS(sc).u_regs[CON_G4]);
+- st->print_cr(" G5=" INTPTR_FORMAT " G6=" INTPTR_FORMAT
+- " G7=" INTPTR_FORMAT " Y=" INTPTR_FORMAT,
+- SIG_REGS(sc).u_regs[CON_G5],
+- SIG_REGS(sc).u_regs[CON_G6],
+- SIG_REGS(sc).u_regs[CON_G7],
+- SIG_REGS(sc).y);
- st->print_cr(" O0=" INTPTR_FORMAT " O1=" INTPTR_FORMAT
- " O2=" INTPTR_FORMAT " O3=" INTPTR_FORMAT,
- SIG_REGS(sc).u_regs[CON_O0],
@@ -7191,18 +7317,32 @@
- SIG_REGS(sc).u_regs[CON_O6],
- SIG_REGS(sc).u_regs[CON_O7]);
-
-- st->print_cr(" G1=" INTPTR_FORMAT " G2=" INTPTR_FORMAT
-- " G3=" INTPTR_FORMAT " G4=" INTPTR_FORMAT,
-- SIG_REGS(sc).u_regs[CON_G1],
-- SIG_REGS(sc).u_regs[CON_G2],
-- SIG_REGS(sc).u_regs[CON_G3],
-- SIG_REGS(sc).u_regs[CON_G4]);
-- st->print_cr(" G5=" INTPTR_FORMAT " G6=" INTPTR_FORMAT
-- " G7=" INTPTR_FORMAT " Y=" INTPTR_FORMAT,
-- SIG_REGS(sc).u_regs[CON_G5],
-- SIG_REGS(sc).u_regs[CON_G6],
-- SIG_REGS(sc).u_regs[CON_G7],
-- SIG_REGS(sc).y);
+-
+- intptr_t *sp = (intptr_t *)os::Bsd::ucontext_get_sp(uc);
+- st->print_cr(" L0=" INTPTR_FORMAT " L1=" INTPTR_FORMAT
+- " L2=" INTPTR_FORMAT " L3=" INTPTR_FORMAT,
+- sp[L0->sp_offset_in_saved_window()],
+- sp[L1->sp_offset_in_saved_window()],
+- sp[L2->sp_offset_in_saved_window()],
+- sp[L3->sp_offset_in_saved_window()]);
+- st->print_cr(" L4=" INTPTR_FORMAT " L5=" INTPTR_FORMAT
+- " L6=" INTPTR_FORMAT " L7=" INTPTR_FORMAT,
+- sp[L4->sp_offset_in_saved_window()],
+- sp[L5->sp_offset_in_saved_window()],
+- sp[L6->sp_offset_in_saved_window()],
+- sp[L7->sp_offset_in_saved_window()]);
+- st->print_cr(" I0=" INTPTR_FORMAT " I1=" INTPTR_FORMAT
+- " I2=" INTPTR_FORMAT " I3=" INTPTR_FORMAT,
+- sp[I0->sp_offset_in_saved_window()],
+- sp[I1->sp_offset_in_saved_window()],
+- sp[I2->sp_offset_in_saved_window()],
+- sp[I3->sp_offset_in_saved_window()]);
+- st->print_cr(" I4=" INTPTR_FORMAT " I5=" INTPTR_FORMAT
+- " I6=" INTPTR_FORMAT " I7=" INTPTR_FORMAT,
+- sp[I4->sp_offset_in_saved_window()],
+- sp[I5->sp_offset_in_saved_window()],
+- sp[I6->sp_offset_in_saved_window()],
+- sp[I7->sp_offset_in_saved_window()]);
-
- st->print_cr(" PC=" INTPTR_FORMAT " nPC=" INTPTR_FORMAT,
- SIG_PC(sc),
@@ -7210,7 +7350,6 @@
- st->cr();
- st->cr();
-
-- intptr_t *sp = (intptr_t *)os::Bsd::ucontext_get_sp(uc);
- st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", sp);
- print_hex_dump(st, (address)sp, (address)(sp + 32), sizeof(intptr_t));
- st->cr();
@@ -7220,7 +7359,58 @@
- // this at the end, and hope for the best.
- address pc = os::Bsd::ucontext_get_pc(uc);
- st->print_cr("Instructions: (pc=" PTR_FORMAT ")", pc);
-- print_hex_dump(st, pc - 16, pc + 16, sizeof(char));
+- print_hex_dump(st, pc - 32, pc + 32, sizeof(char));
+-}
+-
+-
+-void os::print_register_info(outputStream *st, void *context) {
+- if (context == NULL) return;
+-
+- ucontext_t *uc = (ucontext_t*)context;
+- intptr_t *sp = (intptr_t *)os::Bsd::ucontext_get_sp(uc);
+-
+- st->print_cr("Register to memory mapping:");
+- st->cr();
+-
+- // this is only for the "general purpose" registers
+- st->print("G1="); print_location(st, SIG_REGS(sc).u_regs[CON__G1]);
+- st->print("G2="); print_location(st, SIG_REGS(sc).u_regs[CON__G2]);
+- st->print("G3="); print_location(st, SIG_REGS(sc).u_regs[CON__G3]);
+- st->print("G4="); print_location(st, SIG_REGS(sc).u_regs[CON__G4]);
+- st->print("G5="); print_location(st, SIG_REGS(sc).u_regs[CON__G5]);
+- st->print("G6="); print_location(st, SIG_REGS(sc).u_regs[CON__G6]);
+- st->print("G7="); print_location(st, SIG_REGS(sc).u_regs[CON__G7]);
+- st->cr();
+-
+- st->print("O0="); print_location(st, SIG_REGS(sc).u_regs[CON__O0]);
+- st->print("O1="); print_location(st, SIG_REGS(sc).u_regs[CON__O1]);
+- st->print("O2="); print_location(st, SIG_REGS(sc).u_regs[CON__O2]);
+- st->print("O3="); print_location(st, SIG_REGS(sc).u_regs[CON__O3]);
+- st->print("O4="); print_location(st, SIG_REGS(sc).u_regs[CON__O4]);
+- st->print("O5="); print_location(st, SIG_REGS(sc).u_regs[CON__O5]);
+- st->print("O6="); print_location(st, SIG_REGS(sc).u_regs[CON__O6]);
+- st->print("O7="); print_location(st, SIG_REGS(sc).u_regs[CON__O7]);
+- st->cr();
+-
+- st->print("L0="); print_location(st, sp[L0->sp_offset_in_saved_window()]);
+- st->print("L1="); print_location(st, sp[L1->sp_offset_in_saved_window()]);
+- st->print("L2="); print_location(st, sp[L2->sp_offset_in_saved_window()]);
+- st->print("L3="); print_location(st, sp[L3->sp_offset_in_saved_window()]);
+- st->print("L4="); print_location(st, sp[L4->sp_offset_in_saved_window()]);
+- st->print("L5="); print_location(st, sp[L5->sp_offset_in_saved_window()]);
+- st->print("L6="); print_location(st, sp[L6->sp_offset_in_saved_window()]);
+- st->print("L7="); print_location(st, sp[L7->sp_offset_in_saved_window()]);
+- st->cr();
+-
+- st->print("I0="); print_location(st, sp[I0->sp_offset_in_saved_window()]);
+- st->print("I1="); print_location(st, sp[I1->sp_offset_in_saved_window()]);
+- st->print("I2="); print_location(st, sp[I2->sp_offset_in_saved_window()]);
+- st->print("I3="); print_location(st, sp[I3->sp_offset_in_saved_window()]);
+- st->print("I4="); print_location(st, sp[I4->sp_offset_in_saved_window()]);
+- st->print("I5="); print_location(st, sp[I5->sp_offset_in_saved_window()]);
+- st->print("I6="); print_location(st, sp[I6->sp_offset_in_saved_window()]);
+- st->print("I7="); print_location(st, sp[I7->sp_offset_in_saved_window()]);
+- st->cr();
-}
-
-
@@ -7624,7 +7814,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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,44 +0,0 @@
-/*
@@ -7671,7 +7861,7 @@
- // Used to register dynamic code cache area with the OS
- // Note: Currently only used in 64 bit Windows implementations
- static bool register_code_area(char *low, char *high) { return true; }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,40 +0,0 @@
-/*
@@ -7714,7 +7904,7 @@
-inline void Prefetch::write(void *loc, intx interval) {}
-
-#endif
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,37 +0,0 @@
-/*
@@ -7754,7 +7944,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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,28 +0,0 @@
-/*
@@ -7785,7 +7975,7 @@
- static Thread* thread() {
- return (Thread*) os::thread_local_storage_at(thread_index());
- }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,110 +0,0 @@
-/*
@@ -7898,7 +8088,7 @@
-
-void JavaThread::cache_global_variables() { }
-
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,98 +0,0 @@
-/*
@@ -7999,7 +8189,7 @@
- static bool register_stack_overflow() { return false; }
- static void enable_register_stack_guard() {}
- static void disable_register_stack_guard() {}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,69 +0,0 @@
-/*
@@ -8071,7 +8261,7 @@
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,61 +0,0 @@
-/*
@@ -8135,7 +8325,7 @@
-
- return features;
-}
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-07-24 14:30:52.000000000 -0700
@@ -21,6 +21,17 @@
# questions.
@@ -8337,7 +8527,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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-07-04 09:32:22.000000000 -0700
@@ -21,6 +21,14 @@
# questions.
@@ -8486,7 +8676,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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-07-04 09:32:22.000000000 -0700
@@ -22,7 +22,33 @@
*
@@ -8522,7 +8712,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 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700
@@ -22,9 +22,10 @@
*
@@ -8550,8 +8740,8 @@
+define_pd_global(uintx, HeapBaseMinAddress, 2*G);
// Only used on 64 bit Windows platforms
define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-11-07 17:21:37.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-10-31 15:11:36.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-12-13 23:06:10.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-12-04 09:53:21.000000000 -0800
@@ -44,23 +44,202 @@
# include <sys/wait.h>
# include <pwd.h>
@@ -9009,9 +9199,9 @@
assert(os::current_stack_pointer() >= *bottom &&
os::current_stack_pointer() < *bottom + *size, "just checking");
}
-@@ -724,34 +986,32 @@
- // we can't just iterate through the gregs area
-
+@@ -719,46 +981,44 @@
+ ucontext_t *uc = (ucontext_t*)context;
+ st->print_cr("Registers:");
#ifdef AMD64
- st->print( "RAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RAX]);
- st->print(", RBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RBX]);
@@ -9034,12 +9224,25 @@
- st->print(", R15=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R15]);
- st->cr();
- st->print( "RIP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RIP]);
-- st->print(", EFL=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EFL]);
+- st->print(", EFLAGS=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EFL]);
- st->print(", CSGSFS=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_CSGSFS]);
- st->print(", ERR=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ERR]);
- st->cr();
- st->print(" TRAPNO=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_TRAPNO]);
--
+-#else
+- st->print( "EAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EAX]);
+- st->print(", EBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBX]);
+- st->print(", ECX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ECX]);
+- st->print(", EDX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDX]);
+- st->cr();
+- st->print( "ESP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_UESP]);
+- st->print(", EBP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBP]);
+- st->print(", ESI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ESI]);
+- st->print(", EDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDI]);
+- st->cr();
+- st->print( "EIP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EIP]);
+- st->print(", EFLAGS=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EFL]);
+- st->print(", CR2=" INTPTR_FORMAT, uc->uc_mcontext.cr2);
+ st->print( "RAX=" INTPTR_FORMAT, uc->context_rax);
+ st->print(", RBX=" INTPTR_FORMAT, uc->context_rbx);
+ st->print(", RCX=" INTPTR_FORMAT, uc->context_rcx);
@@ -9061,108 +9264,11 @@
+ st->print(", R15=" INTPTR_FORMAT, uc->context_r15);
+ st->cr();
+ st->print( "RIP=" INTPTR_FORMAT, uc->context_rip);
-+ st->print(", EFL=" INTPTR_FORMAT, uc->context_flags);
++ st->print(", EFLAGS=" INTPTR_FORMAT, uc->context_flags);
+ st->print(", ERR=" INTPTR_FORMAT, uc->context_err);
- st->cr();
++ st->cr();
+ st->print(" TRAPNO=" INTPTR_FORMAT, uc->context_trapno);
-+ st->cr();
- st->cr();
-
- st->print_cr("Register to memory mapping:");
-@@ -759,68 +1019,67 @@
-
- // this is only for the "general purpose" registers
-
-- st->print_cr("RAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RAX]);
-- print_location(st, uc->uc_mcontext.gregs[REG_RAX]);
-+ st->print_cr("RAX=" INTPTR_FORMAT, uc->context_rax);
-+ print_location(st, uc->context_rax);
- st->cr();
-- st->print_cr("RBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RBX]);
-- print_location(st, uc->uc_mcontext.gregs[REG_RBX]);
-+ st->print_cr("RBX=" INTPTR_FORMAT, uc->context_rbx);
-+ print_location(st, uc->context_rbx);
- st->cr();
-- st->print_cr("RCX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RCX]);
-- print_location(st, uc->uc_mcontext.gregs[REG_RCX]);
-+ st->print_cr("RCX=" INTPTR_FORMAT, uc->context_rcx);
-+ print_location(st, uc->context_rcx);
- st->cr();
-- st->print_cr("RDX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RDX]);
-- print_location(st, uc->uc_mcontext.gregs[REG_RDX]);
-+ st->print_cr("RDX=" INTPTR_FORMAT, uc->context_rdx);
-+ print_location(st, uc->context_rdx);
- st->cr();
-- st->print_cr("RSP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RSP]);
-- print_location(st, uc->uc_mcontext.gregs[REG_RSP]);
-+ st->print_cr("RSP=" INTPTR_FORMAT, uc->context_rsp);
-+ print_location(st, uc->context_rsp);
- st->cr();
-- st->print_cr("RBP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RBP]);
-- print_location(st, uc->uc_mcontext.gregs[REG_RBP]);
-+ st->print_cr("RBP=" INTPTR_FORMAT, uc->context_rbp);
-+ print_location(st, uc->context_rbp);
- st->cr();
-- st->print_cr("RSI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RSI]);
-- print_location(st, uc->uc_mcontext.gregs[REG_RSI]);
-+ st->print_cr("RSI=" INTPTR_FORMAT, uc->context_rsi);
-+ print_location(st, uc->context_rsi);
- st->cr();
-- st->print_cr("RDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RDI]);
-- print_location(st, uc->uc_mcontext.gregs[REG_RDI]);
-+ st->print_cr("RDI=" INTPTR_FORMAT, uc->context_rdi);
-+ print_location(st, uc->context_rdi);
- st->cr();
-- st->print_cr("R8 =" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R8]);
-- print_location(st, uc->uc_mcontext.gregs[REG_R8]);
-+ st->print_cr("R8 =" INTPTR_FORMAT, uc->context_r8);
-+ print_location(st, uc->context_r8);
- st->cr();
-- st->print_cr("R9 =" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R9]);
-- print_location(st, uc->uc_mcontext.gregs[REG_R9]);
-+ st->print_cr("R9 =" INTPTR_FORMAT, uc->context_r9);
-+ print_location(st, uc->context_r9);
- st->cr();
-- st->print_cr("R10=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R10]);
-- print_location(st, uc->uc_mcontext.gregs[REG_R10]);
-+ st->print_cr("R10=" INTPTR_FORMAT, uc->context_r10);
-+ print_location(st, uc->context_r10);
- st->cr();
-- st->print_cr("R11=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R11]);
-- print_location(st, uc->uc_mcontext.gregs[REG_R11]);
-+ st->print_cr("R11=" INTPTR_FORMAT, uc->context_r11);
-+ print_location(st, uc->context_r11);
- st->cr();
-- st->print_cr("R12=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R12]);
-- print_location(st, uc->uc_mcontext.gregs[REG_R12]);
-+ st->print_cr("R12=" INTPTR_FORMAT, uc->context_r12);
-+ print_location(st, uc->context_r12);
- st->cr();
-- st->print_cr("R13=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R13]);
-- print_location(st, uc->uc_mcontext.gregs[REG_R13]);
-+ st->print_cr("R13=" INTPTR_FORMAT, uc->context_r13);
-+ print_location(st, uc->context_r13);
- st->cr();
-- st->print_cr("R14=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R14]);
-- print_location(st, uc->uc_mcontext.gregs[REG_R14]);
-+ st->print_cr("R14=" INTPTR_FORMAT, uc->context_r14);
-+ print_location(st, uc->context_r14);
- st->cr();
-- st->print_cr("R15=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R15]);
-- print_location(st, uc->uc_mcontext.gregs[REG_R15]);
-+ st->print_cr("R15=" INTPTR_FORMAT, uc->context_r15);
-+ print_location(st, uc->context_r15);
-
- #else
-- st->print( "EAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EAX]);
-- st->print(", EBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBX]);
-- st->print(", ECX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ECX]);
-- st->print(", EDX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDX]);
-- st->cr();
-- st->print( "ESP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_UESP]);
-- st->print(", EBP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBP]);
-- st->print(", ESI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ESI]);
-- st->print(", EDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDI]);
++#else
+ st->print( "EAX=" INTPTR_FORMAT, uc->context_eax);
+ st->print(", EBX=" INTPTR_FORMAT, uc->context_ebx);
+ st->print(", ECX=" INTPTR_FORMAT, uc->context_ecx);
@@ -9172,62 +9278,70 @@
+ st->print(", EBP=" INTPTR_FORMAT, uc->context_ebp);
+ st->print(", ESI=" INTPTR_FORMAT, uc->context_esi);
+ st->print(", EDI=" INTPTR_FORMAT, uc->context_edi);
- st->cr();
-- st->print( "EIP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EIP]);
-- st->print(", CR2=" INTPTR_FORMAT, uc->uc_mcontext.cr2);
-- st->print(", EFLAGS=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EFL]);
++ st->cr();
+ st->print( "EIP=" INTPTR_FORMAT, uc->context_eip);
+ st->print(", EFLAGS=" INTPTR_FORMAT, uc->context_eflags);
-
+ #endif // AMD64
st->cr();
st->cr();
-@@ -830,29 +1089,29 @@
-
+@@ -791,31 +1051,31 @@
// this is only for the "general purpose" registers
-- st->print_cr("EAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EAX]);
-- print_location(st, uc->uc_mcontext.gregs[REG_EAX]);
-+ st->print_cr("EAX=" INTPTR_FORMAT, uc->context_eax);
-+ print_location(st, uc->context_eax);
- st->cr();
-- st->print_cr("EBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBX]);
-- print_location(st, uc->uc_mcontext.gregs[REG_EBX]);
-+ st->print_cr("EBX=" INTPTR_FORMAT, uc->context_ebx);
-+ print_location(st, uc->context_ebx);
- st->cr();
-- st->print_cr("ECX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ECX]);
-- print_location(st, uc->uc_mcontext.gregs[REG_ECX]);
-+ st->print_cr("ECX=" INTPTR_FORMAT, uc->context_ecx);
-+ print_location(st, uc->context_ecx);
- st->cr();
-- st->print_cr("EDX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDX]);
-- print_location(st, uc->uc_mcontext.gregs[REG_EDX]);
-+ st->print_cr("EDX=" INTPTR_FORMAT, uc->context_edx);
-+ print_location(st, uc->context_edx);
- st->cr();
-- st->print_cr("ESP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ESP]);
-- print_location(st, uc->uc_mcontext.gregs[REG_ESP]);
-+ st->print_cr("ESP=" INTPTR_FORMAT, uc->context_esp);
-+ print_location(st, uc->context_esp);
- st->cr();
-- st->print_cr("EBP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBP]);
-- print_location(st, uc->uc_mcontext.gregs[REG_EBP]);
-+ st->print_cr("EBP=" INTPTR_FORMAT, uc->context_ebp);
-+ print_location(st, uc->context_ebp);
- st->cr();
-- st->print_cr("ESI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ESI]);
-- print_location(st, uc->uc_mcontext.gregs[REG_ESI]);
-+ st->print_cr("ESI=" INTPTR_FORMAT, uc->context_esi);
-+ print_location(st, uc->context_esi);
- st->cr();
-- st->print_cr("EDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDI]);
-- print_location(st, uc->uc_mcontext.gregs[REG_EDI]);
-+ st->print_cr("EDI=" INTPTR_FORMAT, uc->context_edi);
-+ print_location(st, uc->context_edi);
-
+ #ifdef AMD64
+- st->print("RAX="); print_location(st, uc->uc_mcontext.gregs[REG_RAX]);
+- st->print("RBX="); print_location(st, uc->uc_mcontext.gregs[REG_RBX]);
+- st->print("RCX="); print_location(st, uc->uc_mcontext.gregs[REG_RCX]);
+- st->print("RDX="); print_location(st, uc->uc_mcontext.gregs[REG_RDX]);
+- st->print("RSP="); print_location(st, uc->uc_mcontext.gregs[REG_RSP]);
+- st->print("RBP="); print_location(st, uc->uc_mcontext.gregs[REG_RBP]);
+- st->print("RSI="); print_location(st, uc->uc_mcontext.gregs[REG_RSI]);
+- st->print("RDI="); print_location(st, uc->uc_mcontext.gregs[REG_RDI]);
+- st->print("R8 ="); print_location(st, uc->uc_mcontext.gregs[REG_R8]);
+- st->print("R9 ="); print_location(st, uc->uc_mcontext.gregs[REG_R9]);
+- st->print("R10="); print_location(st, uc->uc_mcontext.gregs[REG_R10]);
+- st->print("R11="); print_location(st, uc->uc_mcontext.gregs[REG_R11]);
+- st->print("R12="); print_location(st, uc->uc_mcontext.gregs[REG_R12]);
+- st->print("R13="); print_location(st, uc->uc_mcontext.gregs[REG_R13]);
+- st->print("R14="); print_location(st, uc->uc_mcontext.gregs[REG_R14]);
+- st->print("R15="); print_location(st, uc->uc_mcontext.gregs[REG_R15]);
+-#else
+- st->print("EAX="); print_location(st, uc->uc_mcontext.gregs[REG_EAX]);
+- st->print("EBX="); print_location(st, uc->uc_mcontext.gregs[REG_EBX]);
+- st->print("ECX="); print_location(st, uc->uc_mcontext.gregs[REG_ECX]);
+- st->print("EDX="); print_location(st, uc->uc_mcontext.gregs[REG_EDX]);
+- st->print("ESP="); print_location(st, uc->uc_mcontext.gregs[REG_ESP]);
+- st->print("EBP="); print_location(st, uc->uc_mcontext.gregs[REG_EBP]);
+- st->print("ESI="); print_location(st, uc->uc_mcontext.gregs[REG_ESI]);
+- st->print("EDI="); print_location(st, uc->uc_mcontext.gregs[REG_EDI]);
++ st->print("RAX="); print_location(st, uc->context_rax);
++ st->print("RBX="); print_location(st, uc->context_rbx);
++ st->print("RCX="); print_location(st, uc->context_rcx);
++ st->print("RDX="); print_location(st, uc->context_rdx);
++ st->print("RSP="); print_location(st, uc->context_rsp);
++ st->print("RBP="); print_location(st, uc->context_rbp);
++ st->print("RSI="); print_location(st, uc->context_rsi);
++ st->print("RDI="); print_location(st, uc->context_rdi);
++ st->print("R8 ="); print_location(st, uc->context_r8);
++ st->print("R9 ="); print_location(st, uc->context_r9);
++ st->print("R10="); print_location(st, uc->context_r10);
++ st->print("R11="); print_location(st, uc->context_r11);
++ st->print("R12="); print_location(st, uc->context_r12);
++ st->print("R13="); print_location(st, uc->context_r13);
++ st->print("R14="); print_location(st, uc->context_r14);
++ st->print("R15="); print_location(st, uc->context_r15);
++#else
++ st->print("EAX="); print_location(st, uc->context_eax);
++ st->print("EBX="); print_location(st, uc->context_ebx);
++ st->print("ECX="); print_location(st, uc->context_ecx);
++ st->print("EDX="); print_location(st, uc->context_edx);
++ st->print("ESP="); print_location(st, uc->context_esp);
++ st->print("EBP="); print_location(st, uc->context_ebp);
++ st->print("ESI="); print_location(st, uc->context_esi);
++ st->print("EDI="); print_location(st, uc->context_edi);
#endif // AMD64
+
st->cr();
---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700
@@ -27,8 +27,10 @@
#ifndef AMD64
@@ -9240,7 +9354,7 @@
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
#endif // !AMD64
---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-11-07 17:21:37.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700
@@ -31,7 +31,7 @@
/******************************/ \
@@ -9251,7 +9365,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 2010-11-07 17:21:38.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700
@@ -23,136 +23,441 @@
*
@@ -9925,7 +10039,7 @@
- (intptr_t) compare_value);
+ return atomic_cas_ptr((volatile void *)dest, compare_value, exchange_value);
}
---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-11-07 17:21:38.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700
@@ -25,16 +25,23 @@
// Efficient swapping of data bytes from Java byte
@@ -9955,7 +10069,7 @@
- return bswap_64(x);
+ return bswap64(x);
}
---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-11-07 17:21:38.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700
@@ -40,7 +40,12 @@
@@ -9970,7 +10084,7 @@
#ifdef PPC
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-11-07 17:21:38.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-12-13 23:06:10.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-10-31 14:26:55.000000000 -0700
@@ -23,6 +23,10 @@
*
@@ -10087,7 +10201,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 2010-11-04 16:12:14.000000000 -0700
+--- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-12-09 09:32:39.000000000 -0800
+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2010-06-15 22:03:24.000000000 -0700
@@ -69,9 +69,9 @@
#endif
@@ -10101,7 +10215,7 @@
// Macros
#define uint32 unsigned int
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-11-04 16:12:14.000000000 -0700
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-12-09 09:32:44.000000000 -0800
+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-10-31 14:03:01.000000000 -0700
@@ -952,7 +952,7 @@
}
@@ -10112,7 +10226,7 @@
}
}
---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-11-04 16:12:14.000000000 -0700
+--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-12-09 09:32:54.000000000 -0800
+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-08-06 22:02:53.000000000 -0700
@@ -83,7 +83,7 @@
// the incoming method. We could lose a line of trace output.
@@ -10132,7 +10246,7 @@
if (Verbose) {
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
---- ./hotspot/src/share/vm/prims/forte.cpp 2010-11-04 16:12:15.000000000 -0700
+--- ./hotspot/src/share/vm/prims/forte.cpp 2010-12-09 09:33:03.000000000 -0800
+++ ./hotspot/src/share/vm/prims/forte.cpp 2010-06-15 22:03:31.000000000 -0700
@@ -629,6 +629,11 @@
// Method to let libcollector know about a dynamically loaded function.
@@ -10154,19 +10268,8 @@
#endif // !_WINDOWS
} // end extern "C"
---- ./hotspot/src/share/vm/runtime/globals.hpp 2010-11-04 16:12:15.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-10-31 14:03:02.000000000 -0700
-@@ -327,7 +327,7 @@
- /* UseMembar is theoretically a temp flag used for memory barrier \
- * removal testing. It was supposed to be removed before FCS but has \
- * been re-added (see 6401008) */ \
-- product(bool, UseMembar, false, \
-+ product(bool, UseMembar, true, \
- "(Unstable) Issues membars on thread state transitions") \
- \
- /* Temporary: See 6948537 */ \
---- ./hotspot/src/share/vm/runtime/os.cpp 2010-11-04 16:12:15.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/os.cpp 2010-10-31 14:03:02.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/os.cpp 2010-12-09 09:33:07.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/os.cpp 2010-12-04 08:27:38.000000000 -0800
@@ -79,7 +79,11 @@
assert(false, "Failed localtime_pd");
return NULL;
@@ -10179,7 +10282,7 @@
// If daylight savings time is in effect,
// we are 1 hour East of our time zone
---- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-11-04 16:12:15.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-12-09 09:33:09.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-10-31 14:03:02.000000000 -0700
@@ -149,7 +149,8 @@
@@ -10191,7 +10294,7 @@
#ifdef ZERO
#define CPU ZERO_LIBARCH
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-11-04 16:12:15.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-12-09 09:33:11.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-10-31 14:03:02.000000000 -0700
@@ -71,12 +71,25 @@
# include <sys/procfs.h>
@@ -10259,7 +10362,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/macros.hpp 2010-11-04 16:12:15.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/macros.hpp 2010-12-09 09:33:12.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/macros.hpp 2010-10-31 14:03:02.000000000 -0700
@@ -158,6 +158,14 @@
#define NOT_WINDOWS(code) code
@@ -10276,7 +10379,7 @@
#if defined(IA32) || defined(AMD64)
#define X86
#define X86_ONLY(code) code
---- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-11-04 16:12:15.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-12-09 09:33:12.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2010-06-15 22:03:33.000000000 -0700
@@ -848,7 +848,7 @@
@@ -10287,8 +10390,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-11-04 16:12:15.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-10-31 14:03:03.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-12-09 09:33:12.000000000 -0800
++++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-12-04 08:27:38.000000000 -0800
@@ -31,13 +31,18 @@
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
"JAVA_COMPILER", "PATH", "USERNAME",
@@ -10309,7 +10412,7 @@
// defined on Windows
"OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR",
-@@ -859,7 +864,7 @@
+@@ -875,7 +880,7 @@
const char* ptr = OnError;
while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
out.print_raw ("# Executing ");
@@ -10318,8 +10421,8 @@
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
---- ./hotspot/test/Makefile 2010-11-04 16:12:15.000000000 -0700
-+++ ./hotspot/test/Makefile 2010-06-15 22:03:33.000000000 -0700
+--- ./hotspot/test/Makefile 2010-12-09 09:33:12.000000000 -0800
++++ ./hotspot/test/Makefile 2010-12-04 08:29:05.000000000 -0800
@@ -44,6 +44,22 @@
ARCH = i586
endif
@@ -10343,16 +10446,7 @@
ifeq ($(OSNAME), Windows_NT)
PLATFORM = windows
SLASH_JAVA = J:
-@@ -78,7 +94,7 @@
- TEST_ROOT := $(shell pwd)
-
- # Root of all test results
--ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)
-+ABS_BUILD_ROOT = $(TEST_ROOT)/../../build/$(PLATFORM)-$(ARCH)
- ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput
-
- # Expect JPRT to set PRODUCT_HOME (the product or jdk in this case to test)
-@@ -139,7 +155,7 @@
+@@ -143,7 +159,7 @@
endif
# Expect JPRT to set TESTDIRS to the jtreg test dirs
@@ -10361,7 +10455,7 @@
ifdef TESTDIRS
JTREG_TESTDIRS = $(TESTDIRS)
endif
---- ./hotspot/test/jprt.config 2010-11-04 16:12:15.000000000 -0700
+--- ./hotspot/test/jprt.config 2010-12-09 09:33:16.000000000 -0800
+++ ./hotspot/test/jprt.config 2010-06-15 22:03:33.000000000 -0700
@@ -75,8 +75,8 @@
@@ -10430,7 +10524,7 @@
# Export PATH setting
PATH="${path4sdk}"
---- ./hotspot/test/runtime/6929067/Test6929067.sh 2010-11-04 16:12:15.000000000 -0700
+--- ./hotspot/test/runtime/6929067/Test6929067.sh 2010-12-09 09:33:16.000000000 -0800
+++ ./hotspot/test/runtime/6929067/Test6929067.sh 2010-04-20 20:10:00.000000000 -0700
@@ -29,7 +29,7 @@
PS=":"
@@ -10441,40 +10535,40 @@
NULL=NUL
PS=";"
FS="\\"
---- ./jaxp/.hgtags 2010-11-04 16:12:20.000000000 -0700
-+++ ./jaxp/.hgtags 2010-11-06 22:59:40.000000000 -0700
-@@ -91,3 +91,4 @@
- d57197d22c2bfc39d1a860040f655b466ab46f52 jdk7-b114
- dc1612e1d3ac08eb8fcad764daff21c9247d33c9 jdk7-b115
- f8d4e6c6cfce1cda23fcbd144628a9791a9e1a63 jdk7-b116
-+9ee4d96e893436a48607924227dadd2d93b9b00d jdk7-b117
---- ./jaxp/.jcheck/conf 2010-11-04 16:12:20.000000000 -0700
+--- ./jaxp/.hgtags 2010-12-09 09:35:13.000000000 -0800
++++ ./jaxp/.hgtags 2010-12-11 09:07:09.000000000 -0800
+@@ -95,3 +95,4 @@
+ b2f6d9c4f12ffd307a5de40455b2b61b31a5cb79 jdk7-b118
+ 9ee900f01c5872551c06f33ae909662ffd8463ac jdk7-b119
+ 4821de0908defe647fcdaab4485f98873e24dea0 jdk7-b120
++63dae40fa19fd3bf4689ea2f3c1d9d690e1abcee jdk7-b121
+--- ./jaxp/.jcheck/conf 2010-12-09 09:35:13.000000000 -0800
+++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jaxws/.hgtags 2010-11-04 16:12:25.000000000 -0700
-+++ ./jaxws/.hgtags 2010-11-06 22:59:44.000000000 -0700
-@@ -91,3 +91,4 @@
- 400f494c81c5ec87714b705648afbb3cb680bf73 jdk7-b114
- 824cc44bd6eba9abae07cc420f7fe3926c1adbd9 jdk7-b115
- 376ac153078dd3b5f6d4a0981feee092c1492c96 jdk7-b116
-+1320fb3bb588298c79716bd2d10b5b4afacb9370 jdk7-b117
---- ./jaxws/.jcheck/conf 2010-11-04 16:12:25.000000000 -0700
+--- ./jaxws/.hgtags 2010-12-09 09:42:14.000000000 -0800
++++ ./jaxws/.hgtags 2010-12-11 09:07:12.000000000 -0800
+@@ -95,3 +95,4 @@
+ 19a2fab3f91a275f90791c15d1c21a24e820ff2d jdk7-b118
+ 41fa02b3663795ddf529690df7aa6714210093ec jdk7-b119
+ a4f2e1ca67163ef79555082809d7cd719893c338 jdk7-b120
++0fa950117faac7bdbc94e6c46b88f6f892031c17 jdk7-b121
+--- ./jaxws/.jcheck/conf 2010-12-09 09:42:14.000000000 -0800
+++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/.hgtags 2010-11-04 16:13:15.000000000 -0700
-+++ ./jdk/.hgtags 2010-11-06 22:59:50.000000000 -0700
-@@ -91,3 +91,4 @@
- e250cef36ea05e627e7e6f7d75e5e19f529e2ba3 jdk7-b114
- 449bad8d67b5808ecf0f927683acc0a5940f8c85 jdk7-b115
- 1657ed4e1d86c8aa2028ab5a41f9da1ac4a369f8 jdk7-b116
-+3e6726bbf80a4254ecd01051c8ed77ee19325e46 jdk7-b117
---- ./jdk/.jcheck/conf 2010-11-04 16:13:15.000000000 -0700
+--- ./jdk/.hgtags 2010-12-09 09:51:10.000000000 -0800
++++ ./jdk/.hgtags 2010-12-11 09:07:22.000000000 -0800
+@@ -95,3 +95,4 @@
+ b357910aa04aead2a16b6d6ff395a8df4b51d1dd jdk7-b118
+ ecab7eefb8f2326fd90fb632f47f1b6f81e928f8 jdk7-b119
+ 37d74e29687cf07c2bf9411af58c7e42440855c3 jdk7-b120
++a661d8587b5d8986aacae086f5df66af9e1a96b1 jdk7-b121
+--- ./jdk/.jcheck/conf 2010-12-09 09:51:10.000000000 -0800
+++ ./jdk/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/make/com/sun/java/pack/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/com/sun/java/pack/Makefile 2010-12-09 09:51:10.000000000 -0800
+++ ./jdk/make/com/sun/java/pack/Makefile 2010-06-15 22:06:15.000000000 -0700
@@ -62,6 +62,7 @@
@@ -10507,7 +10601,7 @@
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
---- ./jdk/make/com/sun/nio/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/com/sun/nio/Makefile 2010-12-09 09:51:11.000000000 -0800
+++ ./jdk/make/com/sun/nio/Makefile 2010-06-15 22:06:16.000000000 -0700
@@ -30,7 +30,16 @@
BUILDDIR = ../../..
@@ -10526,7 +10620,7 @@
include $(BUILDDIR)/common/Subdirs.gmk
all build clean clobber::
---- ./jdk/make/com/sun/nio/sctp/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile 2010-12-09 09:51:11.000000000 -0800
+++ ./jdk/make/com/sun/nio/sctp/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -60,15 +60,11 @@
-I$(PLATFORM_SRC)/native/java/net \
@@ -10546,7 +10640,7 @@
else # windows
include $(BUILDDIR)/common/Classes.gmk
---- ./jdk/make/com/sun/security/auth/module/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile 2010-12-09 09:51:12.000000000 -0800
+++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-06-15 22:06:16.000000000 -0700
@@ -68,7 +68,7 @@
include FILES_c_solaris.gmk
@@ -10557,7 +10651,7 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-12-09 09:51:12.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-06-15 22:06:16.000000000 -0700
@@ -43,5 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
@@ -10569,7 +10663,7 @@
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-12-09 09:51:12.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-06-15 22:06:16.000000000 -0700
@@ -39,4 +39,7 @@
LinuxVirtualMachine.c
@@ -10580,7 +10674,7 @@
+FILES_c = \
+ BsdVirtualMachine.c
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-12-09 09:51:12.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-06-15 22:06:16.000000000 -0700
@@ -43,6 +43,11 @@
sun/tools/attach/LinuxAttachProvider.java
@@ -10594,7 +10688,7 @@
#
# Files that need to be copied
#
---- ./jdk/make/com/sun/tools/attach/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile 2010-12-09 09:51:13.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/Makefile 2010-06-15 22:06:16.000000000 -0700
@@ -37,6 +37,9 @@
ifeq ($(PLATFORM), linux)
@@ -10606,7 +10700,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-07-04 12:38:37.000000000 -0700
@@ -30,14 +30,12 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
@@ -10624,7 +10718,7 @@
local:
*;
};
---- ./jdk/make/common/Defs-bsd.gmk 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/make/common/Defs-bsd.gmk 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/make/common/Defs-bsd.gmk 2010-07-10 13:11:34.000000000 -0700
@@ -25,7 +25,7 @@
@@ -10824,7 +10918,7 @@
ifeq ($(ARCH), ia64)
INCLUDE_SA = false
else
---- ./jdk/make/common/Defs-linux.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/Defs-linux.gmk 2010-12-09 09:51:13.000000000 -0800
+++ ./jdk/make/common/Defs-linux.gmk 2010-07-10 13:10:56.000000000 -0700
@@ -322,9 +322,10 @@
override LIBSOCKET =
@@ -10838,7 +10932,7 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs-solaris.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/Defs-solaris.gmk 2010-12-09 09:51:13.000000000 -0800
+++ ./jdk/make/common/Defs-solaris.gmk 2010-07-10 13:11:24.000000000 -0700
@@ -648,6 +648,9 @@
# Network Services library
@@ -10850,9 +10944,9 @@
# GLOBAL_KPIC: If set means all libraries are PIC, position independent code
# EXCEPT for select compiles
# If a .o file is compiled non-PIC then it should be forced
---- ./jdk/make/common/Defs.gmk 2010-11-04 16:13:16.000000000 -0700
-+++ ./jdk/make/common/Defs.gmk 2010-10-31 14:12:34.000000000 -0700
-@@ -181,6 +181,36 @@
+--- ./jdk/make/common/Defs.gmk 2010-12-09 09:51:13.000000000 -0800
++++ ./jdk/make/common/Defs.gmk 2010-12-11 09:07:22.000000000 -0800
+@@ -186,6 +186,36 @@
endif
endif # OPENJDK
@@ -10889,7 +10983,7 @@
#
# Get platform definitions
#
-@@ -216,6 +246,7 @@
+@@ -221,6 +251,7 @@
ifdef ALT_FREETYPE_LIB_PATH
FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
@@ -10897,7 +10991,7 @@
else
ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
-@@ -280,6 +311,10 @@
+@@ -285,6 +316,10 @@
LDLIBS_COMMON = -ldl
endif
@@ -10908,7 +11002,7 @@
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./jdk/make/common/Program.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/Program.gmk 2010-12-09 09:51:13.000000000 -0800
+++ ./jdk/make/common/Program.gmk 2010-06-15 22:06:16.000000000 -0700
@@ -65,11 +65,27 @@
# Create a dependency on libjli (Java Launcher Infrastructure)
@@ -10970,7 +11064,7 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/Release.gmk 2010-12-09 09:51:13.000000000 -0800
+++ ./jdk/make/common/Release.gmk 2010-10-31 14:12:34.000000000 -0700
@@ -154,14 +154,13 @@
tnameserv.1 \
@@ -11031,7 +11125,7 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-12-09 09:51:13.000000000 -0800
+++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-06-15 22:06:16.000000000 -0700
@@ -49,8 +49,6 @@
com/sun/jmx/snmp/SnmpDataTypeEnums.class \
@@ -11120,7 +11214,7 @@
import-binary-plug-jar \
import-binary-plugs-completed
---- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-12-09 09:51:14.000000000 -0800
+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-06-15 22:06:16.000000000 -0700
@@ -72,6 +72,24 @@
@@ -11147,7 +11241,7 @@
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./jdk/make/common/shared/Defs-bsd.gmk 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/make/common/shared/Defs-bsd.gmk 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-07-04 12:38:37.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -11187,7 +11281,7 @@
# Import JDK images allow for partial builds, components not built are
# imported (or copied from) these import areas when needed.
---- ./jdk/make/common/shared/Defs-utils.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk 2010-12-09 09:51:14.000000000 -0800
+++ ./jdk/make/common/shared/Defs-utils.gmk 2010-10-31 14:12:34.000000000 -0700
@@ -67,6 +67,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
@@ -11243,7 +11337,7 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/shared/Defs.gmk 2010-12-09 09:51:14.000000000 -0800
+++ ./jdk/make/common/shared/Defs.gmk 2010-10-31 14:12:34.000000000 -0700
@@ -613,8 +613,8 @@
override CC_VERSION = sun
@@ -11256,7 +11350,7 @@
override CC_VERSION = gcc
endif
---- ./jdk/make/common/shared/Platform.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/shared/Platform.gmk 2010-12-09 09:51:14.000000000 -0800
+++ ./jdk/make/common/shared/Platform.gmk 2010-06-15 22:06:17.000000000 -0700
@@ -82,7 +82,7 @@
SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
@@ -11403,7 +11497,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-Settings.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-12-09 09:51:14.000000000 -0800
+++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-06-15 22:06:17.000000000 -0700
@@ -244,6 +244,7 @@
ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
@@ -11413,8 +11507,8 @@
ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS)
ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
---- ./jdk/make/common/shared/Sanity.gmk 2010-11-04 16:13:16.000000000 -0700
-+++ ./jdk/make/common/shared/Sanity.gmk 2010-06-15 22:06:17.000000000 -0700
+--- ./jdk/make/common/shared/Sanity.gmk 2010-12-09 09:51:14.000000000 -0800
++++ ./jdk/make/common/shared/Sanity.gmk 2010-12-11 09:07:22.000000000 -0800
@@ -142,6 +142,11 @@
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
endif
@@ -11446,7 +11540,7 @@
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
---- ./jdk/make/java/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/Makefile 2010-12-09 09:51:15.000000000 -0800
+++ ./jdk/make/java/Makefile 2010-06-15 22:06:17.000000000 -0700
@@ -53,7 +53,7 @@
endif
@@ -11457,7 +11551,7 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/hpi/hpi_common.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/hpi/hpi_common.gmk 2010-12-09 09:51:15.000000000 -0800
+++ ./jdk/make/java/hpi/hpi_common.gmk 2010-07-10 12:44:13.000000000 -0700
@@ -86,5 +86,5 @@
# Things that must be linked in.
@@ -11466,7 +11560,7 @@
-OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) -ldl
+OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) $(LIBDL)
endif
---- ./jdk/make/java/hpi/native/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/hpi/native/Makefile 2010-12-09 09:51:15.000000000 -0800
+++ ./jdk/make/java/hpi/native/Makefile 2010-06-15 22:06:17.000000000 -0700
@@ -73,16 +73,25 @@
ifeq ($(MOOT_PRIORITIES),true)
@@ -11494,7 +11588,7 @@
ifeq ($(HAVE_FILIOH),true)
OTHER_CPPFLAGS += -DHAVE_FILIOH
endif
---- ./jdk/make/java/instrument/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/instrument/Makefile 2010-12-09 09:51:15.000000000 -0800
+++ ./jdk/make/java/instrument/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -103,9 +103,29 @@
# equivalent of strcasecmp is stricmp on Windows
@@ -11535,7 +11629,7 @@
#
# Library to compile.
---- ./jdk/make/java/java/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/java/Makefile 2010-12-09 09:51:15.000000000 -0800
+++ ./jdk/make/java/java/Makefile 2010-07-10 12:44:56.000000000 -0700
@@ -166,8 +166,10 @@
# Is the altzone extern documented in ctime(3C) available?
@@ -11557,7 +11651,7 @@
-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
endif
---- ./jdk/make/java/java/genlocales.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/java/genlocales.gmk 2010-12-09 09:51:15.000000000 -0800
+++ ./jdk/make/java/java/genlocales.gmk 2010-06-15 22:06:17.000000000 -0700
@@ -76,10 +76,14 @@
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
@@ -11578,7 +11672,7 @@
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
---- ./jdk/make/java/java/localegen.sh 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/java/localegen.sh 2010-12-09 09:51:15.000000000 -0800
+++ ./jdk/make/java/java/localegen.sh 2010-06-15 22:06:17.000000000 -0700
@@ -55,9 +55,9 @@
for FILE in $RESOURCE_NAMES
@@ -11592,7 +11686,7 @@
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
---- ./jdk/make/java/java_hprof_demo/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/java_hprof_demo/Makefile 2010-12-09 09:51:16.000000000 -0800
+++ ./jdk/make/java/java_hprof_demo/Makefile 2010-07-10 12:45:09.000000000 -0700
@@ -84,7 +84,7 @@
ifeq ($(PLATFORM), windows)
@@ -11603,8 +11697,8 @@
endif
#
---- ./jdk/make/java/jli/Makefile 2010-11-04 16:13:16.000000000 -0700
-+++ ./jdk/make/java/jli/Makefile 2010-08-06 21:58:27.000000000 -0700
+--- ./jdk/make/java/jli/Makefile 2010-12-09 09:51:16.000000000 -0800
++++ ./jdk/make/java/jli/Makefile 2010-11-13 12:00:16.000000000 -0800
@@ -45,7 +45,9 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -11665,7 +11759,7 @@
#
# Library to compile.
-@@ -163,7 +173,28 @@
+@@ -158,7 +168,28 @@
endif # PLATFORM
@@ -11695,7 +11789,7 @@
+ vpath %.c $(ZIP_SRC)
+endif
+
---- ./jdk/make/java/management/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/management/Makefile 2010-12-09 09:51:16.000000000 -0800
+++ ./jdk/make/java/management/Makefile 2010-06-15 22:06:17.000000000 -0700
@@ -86,6 +86,11 @@
OTHER_INCLUDES += \
@@ -11709,7 +11803,7 @@
ifeq ($(PLATFORM),windows)
OTHER_LDLIBS += $(JVMLIB)
endif
---- ./jdk/make/java/net/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/net/FILES_c.gmk 2010-12-09 09:51:16.000000000 -0800
+++ ./jdk/make/java/net/FILES_c.gmk 2010-10-31 14:12:34.000000000 -0700
@@ -43,6 +43,10 @@
FILES_c += linux_close.c
@@ -11722,7 +11816,7 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/net/Makefile 2010-12-09 09:51:16.000000000 -0800
+++ ./jdk/make/java/net/Makefile 2010-10-31 14:12:34.000000000 -0700
@@ -96,14 +96,21 @@
@@ -11747,7 +11841,7 @@
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
---- ./jdk/make/java/nio/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/nio/Makefile 2010-12-09 09:51:16.000000000 -0800
+++ ./jdk/make/java/nio/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -261,6 +261,69 @@
sun/nio/fs/UnixConstants.java
@@ -11863,7 +11957,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
---- ./jdk/make/java/nio/mapfile-bsd 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/make/java/nio/mapfile-bsd 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/make/java/nio/mapfile-bsd 2010-10-31 14:19:20.000000000 -0700
@@ -36,25 +36,6 @@
Java_sun_nio_ch_DatagramDispatcher_readv0;
@@ -11922,7 +12016,7 @@
Java_sun_nio_fs_UnixNativeDispatcher_init;
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
Java_sun_nio_fs_UnixNativeDispatcher_strerror;
---- ./jdk/make/java/npt/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/npt/Makefile 2010-12-09 09:51:17.000000000 -0800
+++ ./jdk/make/java/npt/Makefile 2010-06-15 22:06:18.000000000 -0700
@@ -68,6 +68,18 @@
OTHER_LCF += -export:nptInitialize -export:nptTerminate
@@ -11943,7 +12037,7 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/redist/fonts/Makefile 2010-12-09 09:51:18.000000000 -0800
+++ ./jdk/make/java/redist/fonts/Makefile 2010-06-15 22:06:18.000000000 -0700
@@ -43,7 +43,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
@@ -11972,7 +12066,7 @@
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/java/security/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/security/Makefile 2010-12-09 09:51:18.000000000 -0800
+++ ./jdk/make/java/security/Makefile 2010-07-24 14:31:27.000000000 -0700
@@ -50,7 +50,15 @@
ifneq ($(ARCH_DATA_MODEL), 64)
@@ -11990,7 +12084,7 @@
endif # PLATFORM
---- ./jdk/make/java/zip/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/zip/FILES_c.gmk 2010-12-09 09:51:18.000000000 -0800
+++ ./jdk/make/java/zip/FILES_c.gmk 2010-06-15 22:06:18.000000000 -0700
@@ -29,7 +29,10 @@
Deflater.c \
@@ -12011,7 +12105,7 @@
- zutil.c
+ zutil.c
+endif
---- ./jdk/make/java/zip/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/java/zip/Makefile 2010-12-09 09:51:18.000000000 -0800
+++ ./jdk/make/java/zip/Makefile 2010-06-15 22:06:18.000000000 -0700
@@ -72,16 +72,28 @@
CPPFLAGS += -UDEBUG
@@ -12043,7 +12137,7 @@
OTHER_LDLIBS = $(JVMLIB)
+endif
+
---- ./jdk/make/javax/sound/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/javax/sound/FILES_c.gmk 2010-12-09 09:51:19.000000000 -0800
+++ ./jdk/make/javax/sound/FILES_c.gmk 2010-06-15 22:06:18.000000000 -0700
@@ -34,6 +34,8 @@
@@ -12054,7 +12148,7 @@
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
---- ./jdk/make/javax/sound/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/javax/sound/Makefile 2010-12-09 09:51:19.000000000 -0800
+++ ./jdk/make/javax/sound/Makefile 2010-06-15 22:06:18.000000000 -0700
@@ -108,6 +108,16 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
@@ -12073,7 +12167,7 @@
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk 2010-12-09 09:51:19.000000000 -0800
+++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-06-15 22:06:18.000000000 -0700
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
@@ -12086,7 +12180,7 @@
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
---- ./jdk/make/jpda/back/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/jpda/back/Makefile 2010-12-09 09:51:19.000000000 -0800
+++ ./jdk/make/jpda/back/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -50,7 +50,7 @@
-I$(GENNATIVESRCDIR)/jdwp
@@ -12097,7 +12191,7 @@
endif # PLATFORM
#
---- ./jdk/make/jpda/transport/socket/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile 2010-12-09 09:51:20.000000000 -0800
+++ ./jdk/make/jpda/transport/socket/Makefile 2010-07-10 12:31:09.000000000 -0700
@@ -41,6 +41,11 @@
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
@@ -12111,7 +12205,7 @@
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET)
endif
---- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-12-09 09:51:22.000000000 -0800
+++ ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -37,12 +37,11 @@
@@ -12130,7 +12224,7 @@
endif
#
---- ./jdk/make/sun/awt/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/awt/Makefile 2010-12-09 09:51:27.000000000 -0800
+++ ./jdk/make/sun/awt/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -94,7 +94,7 @@
ifeq ($(PLATFORM), solaris)
@@ -12211,7 +12305,7 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-07-04 12:38:37.000000000 -0700
@@ -533,11 +533,11 @@
@@ -12230,7 +12324,7 @@
# CDE private entry point
Java_sun_awt_motif_XsessionWMcommand;
---- ./jdk/make/sun/awt/mawt.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/awt/mawt.gmk 2010-12-09 09:51:27.000000000 -0800
+++ ./jdk/make/sun/awt/mawt.gmk 2010-08-06 21:58:27.000000000 -0700
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
@@ -12294,7 +12388,7 @@
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
---- ./jdk/make/sun/font/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/font/Makefile 2010-12-09 09:51:28.000000000 -0800
+++ ./jdk/make/sun/font/Makefile 2010-06-15 22:06:20.000000000 -0700
@@ -174,6 +174,15 @@
# Libraries to link, and other C flags.
@@ -12320,7 +12414,7 @@
endif # PLATFORM
---- ./jdk/make/sun/image/generic/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/image/generic/Makefile 2010-12-09 09:51:28.000000000 -0800
+++ ./jdk/make/sun/image/generic/Makefile 2010-10-31 14:16:39.000000000 -0700
@@ -71,6 +71,6 @@
OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
@@ -12330,7 +12424,7 @@
+ OTHER_LDLIBS = $(LIBM) $(LIBDL)
endif
---- ./jdk/make/sun/image/vis/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/image/vis/Makefile 2010-12-09 09:51:28.000000000 -0800
+++ ./jdk/make/sun/image/vis/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -69,5 +69,5 @@
CFLAGS += $(CFLAGS_$(ARCH)) $(INLINE) -I$(PLATFORM_SRC)/native/sun/awt/medialib -I$(SHARE_SRC)/native/sun/awt/medialib
@@ -12339,7 +12433,7 @@
-OTHER_LDLIBS = $(LIBM) -ldl
+OTHER_LDLIBS = $(LIBM) $(LIBDL)
---- ./jdk/make/sun/jawt/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/jawt/Makefile 2010-12-09 09:51:29.000000000 -0800
+++ ./jdk/make/sun/jawt/Makefile 2010-06-15 22:06:20.000000000 -0700
@@ -93,8 +93,7 @@
#
@@ -12368,7 +12462,7 @@
OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
endif # PLATFORM
---- ./jdk/make/sun/jdga/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/jdga/Makefile 2010-12-09 09:51:29.000000000 -0800
+++ ./jdk/make/sun/jdga/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -56,7 +56,7 @@
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
@@ -12379,7 +12473,7 @@
CPPFLAGS += \
-I$(SHARE_SRC)/javavm/export \
---- ./jdk/make/sun/security/ec/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/security/ec/Makefile 2010-12-09 09:51:31.000000000 -0800
+++ ./jdk/make/sun/security/ec/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -193,7 +193,7 @@
ifeq ($(PLATFORM), windows)
@@ -12390,7 +12484,7 @@
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-12-09 09:51:31.000000000 -0800
+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -72,6 +72,6 @@
#
@@ -12401,7 +12495,7 @@
+ifeq ($(PLATFORM), windows)
+OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
endif
---- ./jdk/make/sun/security/krb5/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/security/krb5/Makefile 2010-12-09 09:51:31.000000000 -0800
+++ ./jdk/make/sun/security/krb5/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -76,7 +76,7 @@
ifeq ($(PLATFORM), windows)
@@ -12412,7 +12506,7 @@
endif
build:
---- ./jdk/make/sun/security/pkcs11/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/security/pkcs11/Makefile 2010-12-09 09:51:31.000000000 -0800
+++ ./jdk/make/sun/security/pkcs11/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -157,10 +157,10 @@
#
@@ -12427,7 +12521,7 @@
endif
# Other config files
---- ./jdk/make/sun/security/smartcardio/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/security/smartcardio/Makefile 2010-12-09 09:51:31.000000000 -0800
+++ ./jdk/make/sun/security/smartcardio/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -76,6 +76,6 @@
ifeq ($(PLATFORM), windows)
@@ -12437,7 +12531,7 @@
+ OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
OTHER_CFLAGS = -D__sun_jdk
endif
---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-12-09 09:51:31.000000000 -0800
+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-06-15 22:06:21.000000000 -0700
@@ -49,18 +49,6 @@
dgif_lib.c \
@@ -12477,7 +12571,7 @@
+ zcrc32.c \
+ zutil.c
+endif
---- ./jdk/make/sun/splashscreen/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/splashscreen/Makefile 2010-12-09 09:51:31.000000000 -0800
+++ ./jdk/make/sun/splashscreen/Makefile 2010-06-15 22:06:21.000000000 -0700
@@ -64,8 +64,24 @@
@@ -12529,7 +12623,7 @@
# Shun the less than portable MMX assembly code in pnggccrd.c,
# and use alternative implementations in C.
---- ./jdk/make/sun/tracing/dtrace/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/tracing/dtrace/Makefile 2010-12-09 09:51:32.000000000 -0800
+++ ./jdk/make/sun/tracing/dtrace/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -56,7 +56,7 @@
FILES_export = $(FILES_java)
@@ -12540,7 +12634,7 @@
endif
#
---- ./jdk/make/sun/xawt/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/sun/xawt/Makefile 2010-12-09 09:51:32.000000000 -0800
+++ ./jdk/make/sun/xawt/Makefile 2010-07-10 13:26:05.000000000 -0700
@@ -48,6 +48,9 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -12610,7 +12704,7 @@
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
---- ./jdk/make/tools/freetypecheck/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/tools/freetypecheck/Makefile 2010-12-09 09:51:40.000000000 -0800
+++ ./jdk/make/tools/freetypecheck/Makefile 2010-06-15 22:06:21.000000000 -0700
@@ -49,8 +49,15 @@
# Add runtime lib search path to ensure test will be runnable
@@ -12629,7 +12723,7 @@
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
---- ./jdk/make/tools/reorder/Makefile 2010-11-04 16:13:16.000000000 -0700
+--- ./jdk/make/tools/reorder/Makefile 2010-12-09 09:51:40.000000000 -0800
+++ ./jdk/make/tools/reorder/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -187,11 +187,11 @@
@@ -13048,7 +13142,7 @@
+¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢UNIX ¤Î
+.BI ps
+¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢¹¶·â¼Ô¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
---- ./jdk/src/share/back/commonRef.c 2010-11-04 16:13:17.000000000 -0700
+--- ./jdk/src/share/back/commonRef.c 2010-12-09 09:51:54.000000000 -0800
+++ ./jdk/src/share/back/commonRef.c 2010-06-15 22:06:23.000000000 -0700
@@ -23,6 +23,10 @@
* questions.
@@ -13061,11 +13155,11 @@
#include "util.h"
#include "commonRef.h"
---- ./jdk/src/share/bin/java.c 2010-11-04 16:13:17.000000000 -0700
-+++ ./jdk/src/share/bin/java.c 2010-10-31 14:12:34.000000000 -0700
-@@ -66,6 +66,10 @@
- static jboolean printUsage = JNI_FALSE; /* print and exit*/
+--- ./jdk/src/share/bin/java.c 2010-12-09 09:51:55.000000000 -0800
++++ ./jdk/src/share/bin/java.c 2010-12-11 09:07:22.000000000 -0800
+@@ -67,6 +67,10 @@
static jboolean printXUsage = JNI_FALSE; /* print and exit*/
+ static char *showSettings = NULL; /* print but continue */
+#ifdef __APPLE__
+static jboolean continueInSameThread = JNI_FALSE; /* start VM in current thread */
@@ -13074,7 +13168,7 @@
static const char *_program_name;
static const char *_launcher_name;
static jboolean _is_java_args = JNI_FALSE;
-@@ -115,6 +119,10 @@
+@@ -117,6 +121,10 @@
static void DumpState();
static jboolean RemovableOption(char *option);
@@ -13085,7 +13179,7 @@
/* Maximum supported entries from jvm.cfg. */
#define INIT_MAX_KNOWN_VMS 10
-@@ -300,9 +308,16 @@
+@@ -303,9 +311,16 @@
/* Show the splash screen if needed */
ShowSplashScreen();
@@ -13104,7 +13198,7 @@
}
/*
* Always detach the main thread so that it appears to have ended when
-@@ -1015,6 +1030,12 @@
+@@ -1028,6 +1043,12 @@
} else if (JLI_StrCmp(arg, "-X") == 0) {
printXUsage = JNI_TRUE;
return JNI_TRUE;
@@ -13115,9 +13209,9 @@
+ // XXXDARWIN: Apple VM supports configuration of Dock icon and name via -Xdock:
+#endif
/*
- * The following case provide backward compatibility with old-style
- * command line options.
-@@ -1901,6 +1922,44 @@
+ * The following case checks for -XshowSettings OR -XshowSetting:SUBOPT.
+ * In the latter case, any SUBOPT value not recognized will default to "all"
+@@ -1942,6 +1963,44 @@
}
}
@@ -13162,7 +13256,7 @@
static void
DumpState()
{
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-11-04 16:13:17.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-12-09 09:52:02.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-06-15 22:06:25.000000000 -0700
@@ -477,6 +477,10 @@
String[] dirs = new String[] {
@@ -13175,7 +13269,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 2010-11-04 16:13:17.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-12-09 09:52:18.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-06-15 22:06:27.000000000 -0700
@@ -78,6 +78,9 @@
*/
@@ -13187,7 +13281,7 @@
/**
---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 1969-12-31 16:00:00.000000000 -0800
@@ -1,6 +0,0 @@
-# service provider file for Bsd: with DirectAudioDeviceProvider
@@ -13196,7 +13290,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 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13392,7 +13486,7 @@
- }
-
-}
---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-11-04 16:13:18.000000000 -0700
+--- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-12-09 09:53:02.000000000 -0800
+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-06-15 22:06:34.000000000 -0700
@@ -172,7 +172,12 @@
} else {
@@ -13408,9 +13502,9 @@
(System.getenv("DISPLAY") == null));
}
} else if (nm.equals("true")) {
---- ./jdk/src/share/classes/java/util/TimeZone.java 2010-11-04 16:13:20.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-10-31 14:12:35.000000000 -0700
-@@ -810,15 +810,13 @@
+--- ./jdk/src/share/classes/java/util/TimeZone.java 2010-12-09 09:53:49.000000000 -0800
++++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-11-13 12:00:16.000000000 -0800
+@@ -805,15 +805,13 @@
}
int gmtOffset = (hours * 60 + num) * 60 * 1000;
@@ -13427,7 +13521,7 @@
}
return zi;
}
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-11-04 16:13:22.000000000 -0700
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-12-09 09:55:07.000000000 -0800
+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-06-15 22:06:56.000000000 -0700
@@ -1122,7 +1122,7 @@
*/
@@ -13447,7 +13541,7 @@
errors++;
}
}
---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-11-04 16:13:22.000000000 -0700
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-12-09 09:55:08.000000000 -0800
+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-06-15 22:06:56.000000000 -0700
@@ -39,6 +39,7 @@
WINDOWS,
@@ -13472,7 +13566,7 @@
// determine another OS here
}
---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-11-04 16:13:22.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-12-09 09:55:16.000000000 -0800
+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-10-31 14:12:35.000000000 -0700
@@ -46,6 +46,8 @@
@@ -13495,7 +13589,7 @@
String t2kStr = System.getProperty("sun.java2d.font.scaler");
if (t2kStr != null) {
useT2K = "t2k".equals(t2kStr);
---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-11-04 16:13:22.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-12-09 09:55:16.000000000 -0800
+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-06-15 22:06:58.000000000 -0700
@@ -413,7 +413,7 @@
* registerFonts method as on-screen these JRE fonts
@@ -13506,7 +13600,7 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,190 +0,0 @@
-/*
@@ -13699,7 +13793,7 @@
- return charOff - outOff;
- }
-}
---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13895,7 +13989,7 @@
- return 2;
- }
-}
---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,370 +0,0 @@
-/*
@@ -14268,7 +14362,7 @@
- }
- }
-}
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-11-04 16:13:23.000000000 -0700
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-12-09 09:55:50.000000000 -0800
+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-06-15 22:07:04.000000000 -0700
@@ -1534,7 +1534,9 @@
pFlags |= NOSHEET;
@@ -14281,7 +14375,7 @@
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-11-04 16:13:23.000000000 -0700
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-12-09 09:56:02.000000000 -0800
+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-06-15 22:07:06.000000000 -0700
@@ -83,7 +83,9 @@
String osname = System.getProperty("os.name");
@@ -14294,14 +14388,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 2010-11-04 16:13:24.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-12-09 09:56:24.000000000 -0800
+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-06-15 22:07:11.000000000 -0700
@@ -30,3 +30,4 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[bsd]sun.tools.attach.BsdAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-11-04 16:13:24.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-12-09 09:56:24.000000000 -0800
+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-06-15 22:07:11.000000000 -0700
@@ -50,6 +50,7 @@
String zname = "";
@@ -14373,7 +14467,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 2010-11-04 16:13:24.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-12-09 09:56:24.000000000 -0800
+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-06-15 22:07:11.000000000 -0700
@@ -44,6 +44,8 @@
{0} : could not create directory
@@ -14384,7 +14478,7 @@
out.added.manifest=\
added manifest
out.update.manifest=\
---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-11-04 16:13:24.000000000 -0700
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-12-09 09:56:54.000000000 -0800
+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-06-15 22:07:15.000000000 -0700
@@ -38,6 +38,7 @@
# gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
@@ -14424,7 +14518,7 @@
# Common -I options
CFLAGS += -I.
CFLAGS += -I../agent_util
---- ./jdk/src/share/hpi/include/hpi_impl.h 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/hpi/include/hpi_impl.h 2010-12-09 09:56:59.000000000 -0800
+++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-06-15 22:07:16.000000000 -0700
@@ -138,7 +138,11 @@
int sysBind(int fd, struct sockaddr *him, int len);
@@ -14711,7 +14805,7 @@
+# Example,
+# ocsp.responderCertSerialNumber=2A:FF:00
+
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-12-09 09:57:01.000000000 -0800
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-06-15 22:07:17.000000000 -0700
@@ -32,6 +32,10 @@
#include <unistd.h>
@@ -14738,7 +14832,7 @@
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-12-09 09:57:01.000000000 -0800
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-06-15 22:07:17.000000000 -0700
@@ -22,6 +22,9 @@
* or visit www.oracle.com if you need additional information or have any
@@ -14780,7 +14874,7 @@
true));
}
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-12-09 09:57:02.000000000 -0800
+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-06-15 22:07:17.000000000 -0700
@@ -33,7 +33,11 @@
@@ -14794,7 +14888,7 @@
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-12-09 09:57:02.000000000 -0800
+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-06-15 22:07:17.000000000 -0700
@@ -99,5 +99,17 @@
return com_sun_media_sound_Platform_LIB_ALSA;
@@ -14814,7 +14908,7 @@
+#endif
return 0;
}
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-12-09 09:57:02.000000000 -0800
+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-15 22:07:17.000000000 -0700
@@ -31,6 +31,7 @@
#define X_WINDOWS 1
@@ -14843,7 +14937,7 @@
+
+
#endif // __SOUNDDEFS_INCLUDED__
---- ./jdk/src/share/native/common/check_code.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/common/check_code.c 2010-12-09 09:57:02.000000000 -0800
+++ ./jdk/src/share/native/common/check_code.c 2010-10-31 14:12:35.000000000 -0700
@@ -1067,7 +1067,7 @@
* Make sure that branches don't go into the middle of nowhere.
@@ -14906,7 +15000,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 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/java/io/io_util.h 2010-12-09 09:57:03.000000000 -0800
+++ ./jdk/src/share/native/java/io/io_util.h 2010-06-15 22:07:17.000000000 -0700
@@ -29,7 +29,15 @@
extern jfieldID IO_fd_fdID;
@@ -14925,7 +15019,7 @@
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-12-09 09:57:03.000000000 -0800
+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-10-31 14:12:35.000000000 -0700
@@ -24,6 +24,15 @@
* questions.
@@ -14953,7 +15047,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 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-12-09 09:57:03.000000000 -0800
+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-06-15 22:07:17.000000000 -0700
@@ -61,7 +61,7 @@
#define log1p jlog1p
@@ -14964,8 +15058,8 @@
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_acosh __j__ieee754_acosh
---- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-11-04 16:13:25.000000000 -0700
-+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-10-31 14:12:36.000000000 -0700
+--- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-12-09 09:57:06.000000000 -0800
++++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-12-11 09:07:22.000000000 -0800
@@ -67,6 +67,10 @@
return jlong_zero;
} else {
@@ -14977,7 +15071,7 @@
switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) {
case Z_OK:
return ptr_to_jlong(strm);
-@@ -213,6 +217,10 @@
+@@ -215,6 +219,10 @@
if (inflateReset(jlong_to_ptr(addr)) != Z_OK) {
JNU_ThrowInternalError(env, 0);
}
@@ -14988,8 +15082,8 @@
}
JNIEXPORT void JNICALL
---- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-11-04 16:13:25.000000000 -0700
-+++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-06-15 22:07:18.000000000 -0700
+--- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-12-09 09:57:06.000000000 -0800
++++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-12-11 09:07:22.000000000 -0800
@@ -46,6 +46,10 @@
#include "zip_util.h"
#include "zlib.h"
@@ -15001,7 +15095,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 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-12-09 09:57:07.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-06-15 22:07:18.000000000 -0700
@@ -50,7 +50,9 @@
#include <stdio.h>
@@ -15013,7 +15107,7 @@
#include <limits.h>
/* keep these after the other headers */
---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-12-09 09:57:08.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-10-31 14:12:36.000000000 -0700
@@ -24,7 +24,11 @@
*/
@@ -15027,7 +15121,7 @@
#include "sun_awt_image_BufImgSurfaceData.h"
---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-12-09 09:57:08.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-06-15 22:07:18.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
@@ -15041,7 +15135,7 @@
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-12-09 09:57:17.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-06-15 22:07:19.000000000 -0700
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -15082,7 +15176,7 @@
#endif /* _NO_LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-06-15 22:07:20.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15123,7 +15217,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-06-15 22:07:20.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15164,7 +15258,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-06-15 22:07:20.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15205,7 +15299,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-06-15 22:07:20.000000000 -0700
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15246,7 +15340,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-06-15 22:07:20.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15287,7 +15381,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-06-15 22:07:20.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15328,7 +15422,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-06-15 22:07:20.000000000 -0700
@@ -95,7 +95,7 @@
dst = dp[0];
@@ -15549,7 +15643,7 @@
}
#else /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-10-31 14:12:36.000000000 -0700
@@ -168,7 +168,7 @@
}
@@ -15831,7 +15925,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-12-09 09:57:18.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-06-15 22:07:20.000000000 -0700
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -15984,7 +16078,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 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-12-09 09:57:19.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-06-15 22:07:20.000000000 -0700
@@ -30,7 +30,7 @@
typedef union {
@@ -15995,7 +16089,7 @@
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-12-09 09:57:19.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-06-15 22:07:21.000000000 -0700
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
@@ -16095,7 +16189,7 @@
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-12-09 09:57:19.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-06-15 22:07:21.000000000 -0700
@@ -120,7 +120,7 @@
} \
@@ -17329,7 +17423,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-12-09 09:57:19.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-06-15 22:07:21.000000000 -0700
@@ -27,6 +27,16 @@
#ifndef MLIB_IMAGE_H
@@ -17348,7 +17442,7 @@
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-12-09 09:57:20.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-06-15 22:07:21.000000000 -0700
@@ -26,9 +26,15 @@
@@ -17380,7 +17474,7 @@
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-12-09 09:57:20.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-06-15 22:07:21.000000000 -0700
@@ -59,7 +59,10 @@
@@ -17394,7 +17488,7 @@
#include <stdint.h> /* for uintptr_t */
#include <malloc.h> /* for ptrdiff_t */
#else
---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-12-09 09:57:20.000000000 -0800
+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-06-15 22:07:21.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
@@ -17408,7 +17502,7 @@
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-12-09 09:57:20.000000000 -0800
+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-06-15 22:07:21.000000000 -0700
@@ -26,7 +26,11 @@
#include "jlong.h"
@@ -17422,7 +17516,7 @@
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
---- ./jdk/src/share/native/sun/font/sunFont.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/font/sunFont.c 2010-12-09 09:57:27.000000000 -0800
+++ ./jdk/src/share/native/sun/font/sunFont.c 2010-06-15 22:07:22.000000000 -0700
@@ -24,7 +24,9 @@
*/
@@ -17434,7 +17528,7 @@
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-12-09 09:57:27.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-06-15 22:07:22.000000000 -0700
@@ -28,7 +28,11 @@
#include "jni_util.h"
@@ -17448,7 +17542,7 @@
#include "string.h"
/**
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-12-09 09:57:31.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-06-15 22:07:23.000000000 -0700
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
@@ -17460,7 +17554,7 @@
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-12-09 09:57:31.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-06-15 22:07:23.000000000 -0700
@@ -25,7 +25,11 @@
@@ -17474,7 +17568,7 @@
#include "sun_java2d_pipe_BufferedOpCodes.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-12-09 09:57:31.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-06-15 22:07:23.000000000 -0700
@@ -25,7 +25,11 @@
@@ -17488,7 +17582,7 @@
#include <math.h>
#include <jlong.h>
---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-12-09 09:57:32.000000000 -0800
+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-06-15 22:07:24.000000000 -0700
@@ -28,6 +28,7 @@
#include <winsock2.h>
@@ -17498,7 +17592,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-12-09 09:57:33.000000000 -0800
+++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-06-15 22:07:24.000000000 -0700
@@ -78,6 +78,14 @@
typedef enum { B_FALSE, B_TRUE } boolean_t;
@@ -17515,7 +17609,7 @@
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-12-09 09:57:33.000000000 -0800
+++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-06-15 22:07:24.000000000 -0700
@@ -60,9 +60,9 @@
#include <sys/types.h>
@@ -17529,7 +17623,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-12-09 09:57:33.000000000 -0800
+++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-06-15 22:07:24.000000000 -0700
@@ -59,9 +59,9 @@
#include <sys/types.h>
@@ -17543,7 +17637,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-11-04 16:13:25.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-12-09 09:57:33.000000000 -0800
+++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-06-15 22:07:24.000000000 -0700
@@ -64,9 +64,9 @@
#include <sys/types.h>
@@ -17557,7 +17651,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/transport/socket/socketTransport.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/share/transport/socket/socketTransport.c 2010-12-09 09:57:38.000000000 -0800
+++ ./jdk/src/share/transport/socket/socketTransport.c 2010-06-15 22:07:27.000000000 -0700
@@ -65,6 +65,9 @@
#define HEADER_SIZE 11
@@ -17646,7 +17740,7 @@
return res;
} else if (res == 0) {
break; /* eof, return nbytes which is less than len */
---- ./jdk/src/solaris/back/exec_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/back/exec_md.c 2010-12-09 09:57:38.000000000 -0800
+++ ./jdk/src/solaris/back/exec_md.c 2010-06-15 22:07:27.000000000 -0700
@@ -30,7 +30,7 @@
#include "sys.h"
@@ -17657,7 +17751,7 @@
/* Linux */
#define FORK() fork()
#else
---- ./jdk/src/solaris/back/linker_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/back/linker_md.c 2010-12-09 09:57:38.000000000 -0800
+++ ./jdk/src/solaris/back/linker_md.c 2010-06-15 22:07:27.000000000 -0700
@@ -48,6 +48,12 @@
#include "threads_md.h"
@@ -17684,7 +17778,7 @@
}
}
---- ./jdk/src/solaris/back/util_md.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/back/util_md.h 2010-12-09 09:57:38.000000000 -0800
+++ ./jdk/src/solaris/back/util_md.h 2010-06-15 22:07:27.000000000 -0700
@@ -31,6 +31,11 @@
@@ -17707,7 +17801,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.c 2010-12-09 09:57:38.000000000 -0800
+++ ./jdk/src/solaris/bin/ergo.c 2010-06-15 22:07:27.000000000 -0700
@@ -71,14 +71,39 @@
/* Compute physical memory by asking the OS */
@@ -17751,7 +17845,7 @@
return result;
+#endif /* _ALLBSD_SOURCE */
}
---- ./jdk/src/solaris/bin/ergo.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.h 2010-12-09 09:57:38.000000000 -0800
+++ ./jdk/src/solaris/bin/ergo.h 2010-06-15 22:07:27.000000000 -0700
@@ -33,6 +33,10 @@
#include <sys/stat.h>
@@ -17764,7 +17858,7 @@
#include "java.h"
---- ./jdk/src/solaris/bin/ergo_i586.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo_i586.c 2010-12-09 09:57:38.000000000 -0800
+++ ./jdk/src/solaris/bin/ergo_i586.c 2010-06-15 22:07:27.000000000 -0700
@@ -106,7 +106,7 @@
@@ -17846,8 +17940,8 @@
JLI_TraceLauncher("physical processors: %lu\n", result);
return result;
}
---- ./jdk/src/solaris/bin/java_md.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/bin/java_md.c 2010-10-31 14:12:36.000000000 -0700
+--- ./jdk/src/solaris/bin/java_md.c 2010-12-09 09:57:38.000000000 -0800
++++ ./jdk/src/solaris/bin/java_md.c 2010-11-13 12:00:17.000000000 -0800
@@ -24,6 +24,7 @@
*/
@@ -17956,7 +18050,7 @@
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./jdk/src/solaris/bin/java_md.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/bin/java_md.h 2010-12-09 09:57:38.000000000 -0800
+++ ./jdk/src/solaris/bin/java_md.h 2010-06-15 22:07:27.000000000 -0700
@@ -47,10 +47,14 @@
#include <sys/time.h>
@@ -17974,7 +18068,7 @@
/*
* Function prototypes.
---- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2010-12-09 09:57:43.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2010-10-31 13:48:56.000000000 -0700
@@ -101,7 +101,8 @@
ICE_WM = 10,
@@ -18024,7 +18118,7 @@
} else if (doIsIceWM && isIceWM()) {
awt_wmgr = XWM.ICE_WM;
}
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-12-09 09:57:44.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-01-30 09:28:31.000000000 -0800
@@ -213,7 +213,7 @@
if (fontID != null) {
@@ -18053,7 +18147,7 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,377 +0,0 @@
-#
@@ -18433,7 +18527,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 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,154 +0,0 @@
-#
@@ -18590,7 +18684,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 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,348 +0,0 @@
-#
@@ -18941,9 +19035,9 @@
-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,99 +0,0 @@
+@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -18975,7 +19069,6 @@
-import java.nio.channels.spi.AsynchronousChannelProvider;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadFactory;
--import java.net.ProtocolFamily;
-import java.io.IOException;
-
-public class BsdAsynchronousChannelProvider
@@ -19034,16 +19127,8 @@
- {
- return new UnixAsynchronousSocketChannelImpl(toPort(group));
- }
--
-- @Override
-- public AsynchronousDatagramChannel openAsynchronousDatagramChannel(ProtocolFamily family,
-- AsynchronousChannelGroup group)
-- throws IOException
-- {
-- return new SimpleAsynchronousDatagramChannelImpl(family, toPort(group));
-- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,288 +0,0 @@
-/*
@@ -19334,7 +19419,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-10-31 14:19:20.000000000 -0700
@@ -36,10 +36,6 @@
class BsdFileStore
@@ -19414,7 +19499,7 @@
return super.supportsFileAttributeView(name);
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-07-04 12:40:24.000000000 -0700
@@ -31,49 +31,23 @@
import java.util.*;
@@ -19548,7 +19633,7 @@
@Override
FileStore getFileStore(UnixPath path) throws IOException {
return new BsdFileStore(path);
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-07-04 12:45:14.000000000 -0700
@@ -36,84 +36,23 @@
private BsdNativeDispatcher() { }
@@ -19653,7 +19738,7 @@
+ initIDs();
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,350 +0,0 @@
-/*
@@ -20006,7 +20091,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,466 +0,0 @@
-/*
@@ -20475,7 +20560,7 @@
- init();
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-12-09 09:57:48.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-06-15 22:07:32.000000000 -0700
@@ -68,6 +68,8 @@
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
@@ -20486,7 +20571,7 @@
throw new AssertionError("Platform not recognized");
}
}
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-12-09 09:57:49.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-06-15 22:07:32.000000000 -0700
@@ -119,7 +119,11 @@
}
@@ -20521,7 +20606,7 @@
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-07-10 13:22:31.000000000 -0700
@@ -40,9 +40,6 @@
// temp directory for socket file
@@ -20620,7 +20705,7 @@
- isBsdThreads = isBsdThreads();
}
}
---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-12-09 09:57:49.000000000 -0800
+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-06-15 22:07:33.000000000 -0700
@@ -33,7 +33,7 @@
#include <sys/stat.h>
@@ -20687,7 +20772,7 @@
}
}
---- ./jdk/src/solaris/hpi/include/interrupt.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/include/interrupt.h 2010-12-09 09:57:52.000000000 -0800
+++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-06-15 22:07:33.000000000 -0700
@@ -75,7 +75,7 @@
* N_INTERRUPTS - The number of interrupt channels. These
@@ -20709,7 +20794,7 @@
#ifdef SA_SIGINFO
/* Thread implementation dependent interrupt dispatcher. */
void intrDispatchMD(int sig, siginfo_t *info, void *uc);
---- ./jdk/src/solaris/hpi/include/largefile.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/include/largefile.h 2010-12-09 09:57:52.000000000 -0800
+++ ./jdk/src/solaris/hpi/include/largefile.h 2010-06-15 22:07:33.000000000 -0700
@@ -34,6 +34,10 @@
#include "largefile_linux.h"
@@ -20722,7 +20807,7 @@
/*
* Prototypes for wrappers that we define. These wrapper functions
* are low-level I/O routines that will use 64 bit versions if
---- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-07-04 12:40:44.000000000 -0700
@@ -26,11 +26,29 @@
#ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_
@@ -20758,7 +20843,7 @@
+#define pwrite64 pwrite
+
#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */
---- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-12-09 09:57:52.000000000 -0800
+++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-06-15 22:07:33.000000000 -0700
@@ -36,6 +36,8 @@
#define N_TRACED_REGS 12
@@ -20806,7 +20891,7 @@
#ifdef __linux__
extern thread_key_t intrJmpbufkey;
---- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-12-09 09:57:52.000000000 -0800
+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-06-15 22:07:33.000000000 -0700
@@ -58,7 +58,7 @@
{
@@ -20817,7 +20902,7 @@
err = pthread_cond_destroy((cond_t *) &condvar->cond);
#else
err = cond_destroy((cond_t *) condvar);
---- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-12-09 09:57:52.000000000 -0800
+++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-06-15 22:07:33.000000000 -0700
@@ -147,7 +147,7 @@
mid->monitor_owner = self;
@@ -20828,7 +20913,7 @@
if (mid->monitor_owner == self) {
mid->entry_count++;
return SYS_OK;
---- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-10-31 13:48:56.000000000 -0700
@@ -1,5 +1,5 @@
/*
@@ -21522,7 +21607,7 @@
+ pthread_attr_destroy(&attr);
+#endif
}
---- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-12-09 09:57:52.000000000 -0800
+++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-06-15 22:07:34.000000000 -0700
@@ -54,6 +54,10 @@
#error That can NOT possibly be right.
@@ -21605,7 +21690,7 @@
info.isMP = (cpus < 0) ? 1 : (cpus > 1);
info.name = "native threads";
---- ./jdk/src/solaris/hpi/src/linker_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/src/linker_md.c 2010-12-09 09:57:53.000000000 -0800
+++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-06-15 22:07:34.000000000 -0700
@@ -44,11 +44,19 @@
#include "threads_md.h"
@@ -21673,7 +21758,7 @@
#endif
/*
* This is a bit of bulletproofing to catch the commonly occurring
---- ./jdk/src/solaris/hpi/src/memory_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/src/memory_md.c 2010-12-09 09:57:53.000000000 -0800
+++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-06-15 22:07:34.000000000 -0700
@@ -50,12 +50,24 @@
#include <stdlib.h>
@@ -21764,7 +21849,7 @@
ret = committedAddr;
#else
ret = requestedAddr;
---- ./jdk/src/solaris/hpi/src/system_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/hpi/src/system_md.c 2010-12-09 09:57:53.000000000 -0800
+++ ./jdk/src/solaris/hpi/src/system_md.c 2010-06-15 22:07:34.000000000 -0700
@@ -41,6 +41,7 @@
#include <dlfcn.h>
@@ -21819,7 +21904,7 @@
fd = open64_w(path, oflag, mode);
if (delete != 0) {
unlink(path);
---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-12-09 09:57:53.000000000 -0800
+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-06-15 22:07:34.000000000 -0700
@@ -28,7 +28,10 @@
#include <string.h>
@@ -21850,7 +21935,7 @@
/* Open conversion descriptors */
iconvToPlatform = iconv_open(codeset, "UTF-8");
---- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-12-09 09:57:53.000000000 -0800
+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-06-15 22:07:34.000000000 -0700
@@ -41,7 +41,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
@@ -21876,8 +21961,8 @@
/* Signals */
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-06-15 22:07:34.000000000 -0700
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-12-09 09:57:53.000000000 -0800
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-12-13 00:54:13.000000000 -0800
@@ -32,10 +32,16 @@
#include <sys/types.h>
@@ -22003,7 +22088,7 @@
+#ifdef _ALLBSD_SOURCE
+ jlong result;
+ int mib[2];
-+ int rlen;
++ size_t rlen;
+
+ mib[0] = CTL_HW;
+ mib[1] = HW_PHYSMEM;
@@ -22040,7 +22125,7 @@
}
JNIEXPORT jlong JNICALL
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-12-13 23:06:10.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,180 +0,0 @@
-/*
@@ -22223,7 +22308,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,82 +0,0 @@
-/*
@@ -22308,7 +22393,7 @@
-
-
-#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,322 +0,0 @@
-/*
@@ -22633,7 +22718,7 @@
-}
-
-#endif /* USE_PLATFORM_MIDI_IN */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,179 +0,0 @@
-/*
@@ -22815,7 +22900,7 @@
-
-
-#endif /* USE_PLATFORM_MIDI_OUT */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,480 +0,0 @@
-/*
@@ -23298,7 +23383,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,85 +0,0 @@
-/*
@@ -23386,7 +23471,7 @@
-INT64 getMidiTimestamp(MidiDeviceHandle* handle);
-
-#endif // PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,938 +0,0 @@
-/*
@@ -24327,7 +24412,7 @@
-
-
-#endif // USE_DAUDIO
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,291 +0,0 @@
-/*
@@ -24621,7 +24706,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,72 +0,0 @@
-/*
@@ -24696,7 +24781,7 @@
- int isSigned, int isBigEndian, int enc);
-
-#endif // PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,723 +0,0 @@
-/*
@@ -25422,7 +25507,7 @@
-
-
-#endif // USE_PORTS
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-10-31 14:12:36.000000000 -0700
@@ -41,6 +41,12 @@
#include "java_io_FileSystem.h"
@@ -25445,7 +25530,7 @@
JNIEXPORT jboolean JNICALL
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-10-31 14:12:37.000000000 -0700
@@ -33,7 +33,9 @@
#include <sys/stat.h>
@@ -25457,7 +25542,7 @@
/* Note: The comments in this file use the terminology
---- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-10-31 14:12:37.000000000 -0700
@@ -36,7 +36,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
@@ -25468,7 +25553,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-06-15 22:07:34.000000000 -0700
@@ -28,6 +28,11 @@
#include "jni.h"
@@ -25510,7 +25595,7 @@
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-06-15 22:07:34.000000000 -0700
@@ -40,7 +40,11 @@
#include <stdlib.h>
@@ -25614,8 +25699,8 @@
if (envp == NULL || (char **) envp == environ) {
execvp(file, (char **) argv);
return;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-10-31 14:17:47.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-12-09 09:57:55.000000000 -0800
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-12-11 09:07:22.000000000 -0800
@@ -23,7 +23,7 @@
* questions.
*/
@@ -25651,7 +25736,7 @@
/* Take an array of string pairs (map of key->value) and a string (key).
* Examine each pair in the map to see if the first string (key) matches the
-@@ -375,6 +384,13 @@
+@@ -397,6 +406,13 @@
sprops.display_variant = sprops.variant;
sprops.sun_jnu_encoding = sprops.encoding;
@@ -25665,7 +25750,7 @@
#ifdef __linux__
#if __BYTE_ORDER == __LITTLE_ENDIAN
sprops.unicode_encoding = "UnicodeLittle";
-@@ -384,6 +400,7 @@
+@@ -406,6 +422,7 @@
#else
sprops.unicode_encoding = "UnicodeBig";
#endif
@@ -25673,7 +25758,7 @@
/* user properties */
{
-@@ -420,12 +437,14 @@
+@@ -442,12 +459,14 @@
sprops.path_separator = ":";
sprops.line_separator = "\n";
@@ -25688,8 +25773,8 @@
return &sprops;
}
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-06-15 22:07:34.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-12-09 09:57:55.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-11-13 12:00:17.000000000 -0800
@@ -36,12 +36,288 @@
#include <stdlib.h>
#include <ctype.h>
@@ -26040,8 +26125,8 @@
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-12-09 09:57:55.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-11-13 12:00:17.000000000 -0800
@@ -33,6 +33,9 @@
#include <strings.h>
#include <stdlib.h>
@@ -26082,7 +26167,7 @@
}
return (*env)->NewStringUTF(env, hostname);
}
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-10-31 13:48:56.000000000 -0700
@@ -26,6 +26,9 @@
@@ -26441,7 +26526,7 @@
+}
+
+#endif
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-10-31 14:12:37.000000000 -0700
@@ -23,12 +23,12 @@
* questions.
@@ -26549,7 +26634,7 @@
}
}
}
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-10-31 14:12:37.000000000 -0700
@@ -483,9 +483,11 @@
if (connect_rv == JVM_IO_INTR) {
@@ -26572,7 +26657,7 @@
int port;
jobject iaObj;
jclass iaCntrClass;
---- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-07-04 12:40:44.000000000 -0700
@@ -57,7 +57,7 @@
/*
@@ -26609,12 +26694,15 @@
}
int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
---- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-10-31 14:12:37.000000000 -0700
-@@ -34,6 +34,15 @@
+--- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-12-09 09:57:55.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-12-11 09:46:10.000000000 -0800
+@@ -33,7 +33,16 @@
+ #include <netdb.h>
#include <stdlib.h>
#include <dlfcn.h>
-
+-#include <values.h>
++#include <limits.h>
++
+#ifdef _ALLBSD_SOURCE
+#include <sys/param.h>
+#include <sys/sysctl.h>
@@ -26623,11 +26711,19 @@
+#ifdef __OpenBSD__
+#include <sys/socketvar.h>
+#endif
-+
+
#ifdef __solaris__
#include <sys/sockio.h>
- #include <stropts.h>
-@@ -220,6 +229,14 @@
+@@ -127,7 +136,7 @@
+
+ static int findMaxBuf(int fd, int opt, int sotype) {
+ int a = 0;
+- int b = MAXINT;
++ int b = INT_MAX;
+ int initial_guess;
+ int limit = -1;
+
+@@ -272,6 +281,14 @@
return (*env)->GetFieldID(env, cls, "fd", "I");
}
@@ -26642,7 +26738,7 @@
jint IPv6_supported()
{
#ifndef AF_INET6
-@@ -358,6 +375,7 @@
+@@ -410,6 +427,7 @@
return JNI_TRUE;
#endif /* AF_INET6 */
}
@@ -26650,7 +26746,7 @@
void ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
const char* hostname,
-@@ -720,6 +738,10 @@
+@@ -772,6 +790,10 @@
him6->sin6_family = AF_INET6;
*len = sizeof(struct sockaddr_in6) ;
@@ -26661,7 +26757,7 @@
/*
* On Linux if we are connecting to a link-local address
* we need to specify the interface in the scope_id (2.4 kernel only)
-@@ -1126,7 +1148,6 @@
+@@ -1178,7 +1200,6 @@
*len = socklen;
}
#endif
@@ -26669,7 +26765,7 @@
if (rv < 0) {
return rv;
}
-@@ -1173,6 +1194,24 @@
+@@ -1224,6 +1245,24 @@
#define IPTOS_PREC_MASK 0xe0
#endif
@@ -26694,7 +26790,7 @@
/*
* IPPROTO/IP_TOS :-
* 1. IPv6 on Solaris: no-op and will be set in flowinfo
-@@ -1205,6 +1244,10 @@
+@@ -1256,6 +1295,10 @@
*iptos &= (IPTOS_TOS_MASK | IPTOS_PREC_MASK);
}
@@ -26705,17 +26801,17 @@
/*
* SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On Solaris we may need to clamp
* the value when it exceeds the system limit.
-@@ -1212,7 +1255,8 @@
+@@ -1263,7 +1306,8 @@
#ifdef __solaris__
if (level == SOL_SOCKET) {
if (opt == SO_SNDBUF || opt == SO_RCVBUF) {
-- int sotype, arglen;
-+ int sotype;
+- int sotype=0, arglen;
++ int sotype = 0;
+ socklen_t arglen;
int *bufsize, maxbuf;
int ret;
-@@ -1259,6 +1303,84 @@
+@@ -1329,6 +1373,84 @@
}
#endif
@@ -26800,7 +26896,7 @@
return setsockopt(fd, level, opt, arg, len);
}
-@@ -1309,7 +1431,8 @@
+@@ -1379,7 +1501,8 @@
* corresponding IPv4 port is in use.
*/
if (ipv6_available()) {
@@ -26810,7 +26906,7 @@
len = sizeof(arg);
if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg,
---- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-10-31 14:12:37.000000000 -0700
@@ -37,7 +37,7 @@
#endif
@@ -26821,7 +26917,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-06-15 22:07:35.000000000 -0700
@@ -47,8 +47,11 @@
return (jint) result;
@@ -26860,7 +26956,7 @@
if (rc < 0) {
close(fd);
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-06-15 22:07:35.000000000 -0700
@@ -31,7 +31,7 @@
#include <errno.h>
@@ -26998,7 +27094,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-12-09 09:57:55.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-06-15 22:07:35.000000000 -0700
@@ -25,6 +25,7 @@
@@ -27022,7 +27118,7 @@
if (handle == NULL) {
return JNI_FALSE;
}
---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-06-15 22:07:35.000000000 -0700
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -27036,7 +27132,7 @@
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-06-15 22:07:35.000000000 -0700
@@ -33,7 +33,9 @@
#include <math.h>
@@ -27048,7 +27144,7 @@
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-06-15 22:07:35.000000000 -0700
@@ -31,7 +31,11 @@
#include <Xm/XmP.h>
@@ -27062,7 +27158,7 @@
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-06-15 22:07:35.000000000 -0700
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
@@ -27073,7 +27169,7 @@
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-06-15 22:07:35.000000000 -0700
@@ -40,6 +40,7 @@
#include <jni.h>
@@ -27202,7 +27298,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-10-31 14:18:11.000000000 -0700
@@ -67,7 +67,7 @@
XIMPreeditDrawCallbackStruct *);
@@ -27443,7 +27539,7 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-06-15 22:07:36.000000000 -0700
@@ -143,7 +143,11 @@
(*env)->DeleteLocalRef(env, propname);
@@ -27457,8 +27553,8 @@
JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
"(Ljava/lang/String;)V",
---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-06-15 22:07:36.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-12-09 09:57:56.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-12-04 08:27:53.000000000 -0800
@@ -63,8 +63,9 @@
extern JavaVM *jvm;
@@ -27479,7 +27575,7 @@
statusWindowEventHandler(xev);
#endif
xembed_eventHandler(&xev);
---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-06-15 22:07:36.000000000 -0700
@@ -32,6 +32,7 @@
#include <dlfcn.h>
@@ -27503,7 +27599,7 @@
}
if (handle == NULL) {
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-12-09 09:57:56.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-10-31 14:12:37.000000000 -0700
@@ -45,7 +45,7 @@
#include "wsutils.h"
@@ -27514,7 +27610,7 @@
#include <sys/socket.h>
#endif
---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-12-09 09:57:57.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-06-15 22:07:36.000000000 -0700
@@ -187,15 +187,20 @@
#ifdef __solaris__
@@ -27538,7 +27634,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-12-09 09:57:57.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-06-15 22:07:36.000000000 -0700
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -27637,7 +27733,7 @@
awt_wmgr = OPENLOOK_WM;
}
else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-12-09 09:57:57.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-06-15 22:07:36.000000000 -0700
@@ -45,7 +45,10 @@
KDE2_WM,
@@ -27651,7 +27747,7 @@
};
extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-12-09 09:57:57.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-06-15 22:07:36.000000000 -0700
@@ -58,7 +58,7 @@
*/
@@ -27668,8 +27764,8 @@
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-06-15 22:07:36.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-12-09 09:57:57.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-12-04 08:27:53.000000000 -0800
@@ -23,7 +23,7 @@
* questions.
*/
@@ -27806,7 +27902,7 @@
}
#endif
#endif /* !HEADLESS */
-@@ -604,7 +638,7 @@
+@@ -605,7 +639,7 @@
}
#include <dlfcn.h>
@@ -27815,7 +27911,7 @@
#include <link.h>
#endif
-@@ -650,9 +684,9 @@
+@@ -651,9 +685,9 @@
* certain symbols - and functionality - to be available.
* Also add explicit search for .so.1 in case .so symlink doesn't exist.
*/
@@ -27827,8 +27923,8 @@
if (libfontconfig == NULL) {
return NULL;
}
---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-12-09 09:57:57.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-12-11 09:07:22.000000000 -0800
@@ -30,9 +30,12 @@
#include <string.h>
#include "gtk2_interface.h"
@@ -27883,7 +27979,7 @@
if (setjmp(j) == 0)
{
---- ./jdk/src/solaris/native/sun/awt/list.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/list.c 2010-12-09 09:57:58.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/list.c 2010-06-15 22:07:37.000000000 -0700
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -27897,7 +27993,7 @@
#include "list.h"
---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-12-09 09:58:06.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-06-15 22:07:37.000000000 -0700
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
@@ -27909,7 +28005,7 @@
#include "robot_common.h"
/*
---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-12-09 09:58:07.000000000 -0800
+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-06-15 22:07:37.000000000 -0700
@@ -32,7 +32,11 @@
* into X11FontScaler_md.c, which is compiled into another library.
@@ -27923,7 +28019,7 @@
#include <ctype.h>
#include <sys/utsname.h>
---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-12-09 09:58:07.000000000 -0800
+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-06-15 22:07:37.000000000 -0700
@@ -39,7 +39,11 @@
#include "GraphicsPrimitiveMgr.h"
@@ -27937,7 +28033,7 @@
JNIEXPORT void JNICALL AWTDrawGlyphList
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-12-09 09:58:08.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-06-15 22:07:37.000000000 -0700
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -27954,7 +28050,7 @@
typedef unsigned char jubyte;
typedef unsigned short jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-12-09 09:58:08.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-06-15 22:07:38.000000000 -0700
@@ -63,6 +63,10 @@
* MLIB_EDGE_SRC_PADDED
@@ -28061,7 +28157,7 @@
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-12-09 09:58:09.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-06-15 22:07:38.000000000 -0700
@@ -794,7 +794,7 @@
static int initialized;
@@ -28072,7 +28168,7 @@
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-12-09 09:58:10.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-06-15 22:07:38.000000000 -0700
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
@@ -28094,7 +28190,7 @@
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-12-09 09:58:10.000000000 -0800
+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-07-24 14:31:30.000000000 -0700
@@ -32,6 +32,7 @@
#include "gdefs.h"
@@ -28113,7 +28209,7 @@
}
if (lib != NULL) {
---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-12-09 09:58:10.000000000 -0800
+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-06-15 22:07:38.000000000 -0700
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
@@ -28137,7 +28233,7 @@
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-12-09 09:58:10.000000000 -0800
+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-06-15 22:07:38.000000000 -0700
@@ -26,6 +26,10 @@
#include <sys/types.h>
@@ -28150,7 +28246,7 @@
#include "jni.h"
#include "jni_util.h"
#include "sun_management_FileSystemImpl.h"
---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-12-09 09:58:10.000000000 -0800
+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-06-15 22:07:38.000000000 -0700
@@ -33,7 +33,7 @@
#include <strings.h>
@@ -28161,7 +28257,7 @@
#include <string.h>
#endif
---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-12-09 09:58:10.000000000 -0800
+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-10-31 14:12:37.000000000 -0700
@@ -26,11 +26,12 @@
#include "jni.h"
@@ -28189,7 +28285,7 @@
gconf_ver = 2;
}
if (gconf_ver > 0) {
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-12-09 09:58:10.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-06-15 22:07:38.000000000 -0700
@@ -35,7 +35,7 @@
#include <string.h>
@@ -28240,7 +28336,7 @@
}
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-12-09 09:58:10.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-06-15 22:07:38.000000000 -0700
@@ -73,7 +73,7 @@
m.msg_accrightslen = 0;
@@ -28260,7 +28356,7 @@
m.msg_control = NULL;
m.msg_controllen = 0;
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-06-15 22:07:38.000000000 -0700
@@ -26,15 +26,21 @@
#include "jni.h"
@@ -28377,7 +28473,7 @@
+#endif
+#endif
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-06-15 22:07:38.000000000 -0700
@@ -33,9 +33,13 @@
#include <sys/socket.h>
@@ -28417,7 +28513,7 @@
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-06-15 22:07:38.000000000 -0700
@@ -30,6 +30,10 @@
#include "nio_util.h"
@@ -28430,7 +28526,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-10-31 14:12:37.000000000 -0700
@@ -116,6 +116,47 @@
@@ -28582,7 +28678,7 @@
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-06-15 22:07:38.000000000 -0700
@@ -67,7 +67,7 @@
@@ -28632,7 +28728,7 @@
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-06-15 22:07:38.000000000 -0700
@@ -337,11 +337,11 @@
break;
@@ -28648,7 +28744,7 @@
}
addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-10-31 14:12:37.000000000 -0700
@@ -58,6 +58,7 @@
*/
@@ -28666,7 +28762,7 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-07-04 12:49:46.000000000 -0700
@@ -28,23 +28,35 @@
#include "jvm.h"
@@ -28948,7 +29044,7 @@
+ free(iter);
+ }
}
---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,195 +0,0 @@
-/*
@@ -29146,7 +29242,7 @@
-
-
-}
---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-06-15 22:07:39.000000000 -0700
@@ -30,7 +30,9 @@
@@ -29158,7 +29254,7 @@
#ifdef __solaris__
#include <strings.h>
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-06-15 22:07:39.000000000 -0700
@@ -49,6 +49,11 @@
#include <mntent.h>
@@ -29218,7 +29314,7 @@
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-06-15 22:07:39.000000000 -0700
@@ -63,7 +63,12 @@
DEFX(O_EXCL);
@@ -29246,7 +29342,7 @@
DEF(ERANGE);
// flags used with openat/unlinkat/etc.
---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-06-15 22:07:39.000000000 -0700
@@ -26,7 +26,9 @@
#include <stdio.h>
@@ -29258,7 +29354,7 @@
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-15 22:07:39.000000000 -0700
@@ -28,12 +28,19 @@
#include <string.h>
@@ -29302,7 +29398,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-06-15 22:07:39.000000000 -0700
@@ -64,7 +64,9 @@
#include <assert.h>
@@ -29314,7 +29410,7 @@
#include <jni.h>
---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-12-09 09:58:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-06-15 22:07:39.000000000 -0700
@@ -29,7 +29,9 @@
#include <assert.h>
@@ -29326,7 +29422,7 @@
#include <winscard.h>
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-10-31 13:48:56.000000000 -0700
@@ -1,12 +1,12 @@
/*
@@ -29661,8 +29757,8 @@
+ JNU_ReleaseStringPlatformChars(env, path, _path);
+ }
+}
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-11-04 16:13:26.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-12-09 09:58:12.000000000 -0800
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-12-04 08:27:53.000000000 -0800
@@ -228,10 +228,10 @@
{java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
@@ -29678,7 +29774,7 @@
/* Other vendor-specific Triangular Navigation Block */
{java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
-@@ -865,7 +865,7 @@
+@@ -867,7 +867,7 @@
{
KeySym originalKeysym = *keysym;
@@ -29687,7 +29783,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-12-09 09:58:12.000000000 -0800
+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-10-31 14:12:37.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -29735,7 +29831,7 @@
}
dlerror(); /* Clear errors */
gnome_url_show = (GNOME_URL_SHOW_TYPE*)dlsym(gnome_handle, "gnome_url_show");
---- ./jdk/src/solaris/npt/npt_md.h 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/npt/npt_md.h 2010-12-09 09:58:12.000000000 -0800
+++ ./jdk/src/solaris/npt/npt_md.h 2010-06-15 22:07:39.000000000 -0700
@@ -32,9 +32,10 @@
#include <string.h>
@@ -29759,7 +29855,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 2010-11-04 16:13:26.000000000 -0700
+--- ./jdk/src/solaris/transport/socket/socket_md.c 2010-12-09 09:58:12.000000000 -0800
+++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-06-15 22:07:39.000000000 -0700
@@ -36,7 +36,7 @@
#ifdef __solaris__
@@ -29779,7 +29875,7 @@
int
dbgsysTlsAlloc() {
pthread_key_t key;
---- ./jdk/test/Makefile 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/Makefile 2010-12-09 09:58:29.000000000 -0800
+++ ./jdk/test/Makefile 2010-07-24 14:31:30.000000000 -0700
@@ -79,6 +79,16 @@
endif
@@ -29798,7 +29894,7 @@
ifeq ($(OS_NAME),)
OS_NAME = windows
# GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-12-09 09:58:33.000000000 -0800
+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-06-15 22:07:44.000000000 -0700
@@ -56,7 +56,7 @@
@@ -29809,7 +29905,7 @@
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-12-09 09:58:34.000000000 -0800
+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-06-15 22:07:44.000000000 -0700
@@ -63,7 +63,7 @@
OS=`uname -s`
@@ -29820,7 +29916,7 @@
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-12-09 09:58:35.000000000 -0800
+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-06-15 22:07:45.000000000 -0700
@@ -121,10 +121,14 @@
esac
@@ -29838,7 +29934,7 @@
Windows*)
libloc=${jreloc}/bin
sep=';'
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-12-09 09:58:35.000000000 -0800
+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-08-14 11:45:21.000000000 -0700
@@ -292,7 +292,7 @@
psCmd=ps
@@ -29849,7 +29945,7 @@
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-12-09 09:58:35.000000000 -0800
+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-06-15 22:07:45.000000000 -0700
@@ -112,7 +112,7 @@
fi
@@ -29860,7 +29956,7 @@
pass "This test always passes on $OS"
;;
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-12-09 09:58:36.000000000 -0800
+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-06-15 22:07:45.000000000 -0700
@@ -45,10 +45,7 @@
@@ -29874,7 +29970,7 @@
PS=":"
;;
Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-12-09 09:58:38.000000000 -0800
+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-06-15 22:07:46.000000000 -0700
@@ -83,6 +83,10 @@
total_swap=`free -b | grep -i swap | awk '{print $2}'`
@@ -29887,7 +29983,7 @@
* )
runOne GetTotalSwapSpaceSize "sanity-only"
;;
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-12-09 09:58:38.000000000 -0800
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-06-15 22:07:46.000000000 -0700
@@ -48,7 +48,7 @@
@@ -29898,7 +29994,7 @@
runOne GetMaxFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-12-09 09:58:38.000000000 -0800
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-06-15 22:07:46.000000000 -0700
@@ -48,7 +48,7 @@
@@ -29909,7 +30005,7 @@
runOne GetOpenFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-11-04 16:13:27.000000000 -0700
+--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-12-09 09:58:44.000000000 -0800
+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-06-15 22:07:47.000000000 -0700
@@ -36,11 +36,7 @@
@@ -29924,7 +30020,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-11-04 16:13:28.000000000 -0700
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-12-09 09:58:54.000000000 -0800
+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-30 09:28:46.000000000 -0800
@@ -25,10 +25,11 @@
fi
@@ -29942,7 +30038,7 @@
# Windows
if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh 2010-11-04 16:13:28.000000000 -0700
+--- ./jdk/test/java/io/File/GetXSpace.sh 2010-12-09 09:59:12.000000000 -0800
+++ ./jdk/test/java/io/File/GetXSpace.sh 2010-06-15 22:07:52.000000000 -0700
@@ -26,7 +26,7 @@
# set platform-dependent variable
@@ -29953,7 +30049,7 @@
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-11-04 16:13:28.000000000 -0700
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-12-09 09:59:18.000000000 -0800
+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-06-15 22:07:53.000000000 -0700
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
@@ -29964,7 +30060,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-11-04 16:13:28.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-12-09 09:59:20.000000000 -0800
+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-06-15 22:07:54.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -29975,7 +30071,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-11-04 16:13:28.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-12-09 09:59:20.000000000 -0800
+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-06-15 22:07:54.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -29986,7 +30082,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-11-04 16:13:28.000000000 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-12-09 09:59:25.000000000 -0800
+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-06-15 22:07:55.000000000 -0700
@@ -49,10 +49,7 @@
# set platform-specific variables
@@ -30000,7 +30096,7 @@
FS="/"
;;
Windows* | CYGWIN* )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-12-09 09:59:29.000000000 -0800
+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-06-15 22:07:55.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -30011,7 +30107,7 @@
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-12-09 09:59:31.000000000 -0800
+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-06-15 22:07:56.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -30022,7 +30118,7 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-12-09 09:59:32.000000000 -0800
+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-06-15 22:07:56.000000000 -0700
@@ -49,7 +49,7 @@
@@ -30033,7 +30129,7 @@
PATHSEP=":"
;;
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-12-09 09:59:34.000000000 -0800
+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-06-15 22:07:56.000000000 -0700
@@ -35,11 +35,7 @@
@@ -30048,7 +30144,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-12-09 09:59:35.000000000 -0800
+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-06-15 22:07:57.000000000 -0700
@@ -61,10 +61,7 @@
while true; do
@@ -30062,7 +30158,7 @@
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-12-09 09:59:39.000000000 -0800
+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-06-15 22:07:58.000000000 -0700
@@ -26,7 +26,7 @@
@@ -30073,7 +30169,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-12-09 09:59:40.000000000 -0800
+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-06-15 22:07:58.000000000 -0700
@@ -27,11 +27,7 @@
# set platform-dependent variables
@@ -30088,7 +30184,7 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-12-09 09:59:43.000000000 -0800
+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-06-15 22:07:59.000000000 -0700
@@ -28,7 +28,7 @@
@@ -30099,7 +30195,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/net/URL/B5086147.sh 2010-12-09 09:59:44.000000000 -0800
+++ ./jdk/test/java/net/URL/B5086147.sh 2010-06-15 22:07:59.000000000 -0700
@@ -26,7 +26,7 @@
@@ -30110,7 +30206,7 @@
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/net/URL/runconstructor.sh 2010-12-09 09:59:45.000000000 -0800
+++ ./jdk/test/java/net/URL/runconstructor.sh 2010-06-15 22:07:59.000000000 -0700
@@ -27,7 +27,7 @@
#
@@ -30121,7 +30217,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-12-09 09:59:45.000000000 -0800
+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-06-15 22:07:59.000000000 -0700
@@ -34,11 +34,7 @@
@@ -30136,7 +30232,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-12-09 09:59:45.000000000 -0800
+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-06-15 22:07:59.000000000 -0700
@@ -27,11 +27,7 @@
@@ -30151,7 +30247,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-12-09 09:59:46.000000000 -0800
+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-06-15 22:07:59.000000000 -0700
@@ -33,11 +33,7 @@
@@ -30166,7 +30262,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-12-09 09:59:55.000000000 -0800
+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-01-30 09:28:55.000000000 -0800
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
@@ -30217,8 +30313,8 @@
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-11-04 16:13:29.000000000 -0700
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-12-09 09:59:55.000000000 -0800
+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-06-15 22:08:01.000000000 -0700
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -30288,7 +30384,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/charset/Charset/default.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/nio/charset/Charset/default.sh 2010-12-09 09:59:56.000000000 -0800
+++ ./jdk/test/java/nio/charset/Charset/default.sh 2010-06-15 22:08:01.000000000 -0700
@@ -41,10 +41,14 @@
fi
@@ -30309,7 +30405,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=$TESTJAVA/bin/java
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-12-09 09:59:56.000000000 -0800
+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-06-15 22:08:01.000000000 -0700
@@ -34,7 +34,7 @@
@@ -30320,7 +30416,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
# Skip locale test for Windows
Windows* )
echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/nio/charset/spi/basic.sh 2010-12-09 09:59:56.000000000 -0800
+++ ./jdk/test/java/nio/charset/spi/basic.sh 2010-06-15 22:08:01.000000000 -0700
@@ -70,10 +70,14 @@
L="$1"
@@ -30350,7 +30446,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
Windows* ) CPS=';' ;;
*) echo "Unknown platform: `uname`"; exit 1 ;;
esac
---- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-12-09 09:59:57.000000000 -0800
+++ ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-06-15 22:08:01.000000000 -0700
@@ -147,7 +147,8 @@
@@ -30362,7 +30458,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
posixAttributes = Attributes.readPosixFileAttributes(source, NOFOLLOW_LINKS);
basicAttributes = posixAttributes;
}
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-11-04 16:13:29.000000000 -0700
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-12-09 10:00:14.000000000 -0800
+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-06-15 22:08:03.000000000 -0700
@@ -84,14 +84,12 @@
@@ -30383,8 +30479,8 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
export PATH_SEP
mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-11-04 16:13:30.000000000 -0700
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-06-15 22:08:05.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-12-09 10:00:22.000000000 -0800
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-12-11 09:07:22.000000000 -0800
@@ -46,11 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30398,7 +30494,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-12-09 10:00:22.000000000 -0800
+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-06-15 22:08:05.000000000 -0700
@@ -34,11 +34,7 @@
# set platform-dependent variables
@@ -30413,7 +30509,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-12-09 10:00:23.000000000 -0800
+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-06-15 22:08:05.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -30428,7 +30524,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-12-09 10:00:23.000000000 -0800
+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-06-15 22:08:05.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -30443,7 +30539,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-12-09 10:00:28.000000000 -0800
+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-01-30 09:40:02.000000000 -0800
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -30454,7 +30550,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-12-09 10:00:32.000000000 -0800
+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-06-15 22:08:06.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -30465,7 +30561,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-12-09 10:00:34.000000000 -0800
+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-06-15 22:08:07.000000000 -0700
@@ -31,7 +31,7 @@
# set platform-dependent variables
@@ -30476,7 +30572,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-12-09 10:00:34.000000000 -0800
+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-06-15 22:08:07.000000000 -0700
@@ -75,7 +75,7 @@
SunOS)
@@ -30487,7 +30583,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
DEL=":"
HAS_S=YES
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-12-09 10:00:36.000000000 -0800
+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-06-15 22:08:07.000000000 -0700
@@ -42,9 +42,7 @@
@@ -30500,7 +30596,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-11-04 16:13:30.000000000 -0700
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-12-09 10:00:43.000000000 -0800
+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-06-15 22:08:09.000000000 -0700
@@ -51,7 +51,7 @@
# set platform-dependent variables
@@ -30511,7 +30607,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/script/CommonSetup.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/javax/script/CommonSetup.sh 2010-12-09 10:01:05.000000000 -0800
+++ ./jdk/test/javax/script/CommonSetup.sh 2010-06-15 22:08:11.000000000 -0700
@@ -36,11 +36,7 @@
@@ -30526,7 +30622,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-12-09 10:01:06.000000000 -0800
+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-06-15 22:08:11.000000000 -0700
@@ -33,12 +33,7 @@
# set platform-dependent variables
@@ -30542,7 +30638,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/jprt.config 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/jprt.config 2010-12-09 10:01:23.000000000 -0800
+++ ./jdk/test/jprt.config 2010-06-15 22:08:14.000000000 -0700
@@ -71,8 +71,8 @@
@@ -30611,7 +30707,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
# Export PATH setting
PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-12-09 10:01:23.000000000 -0800
+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-06-15 22:08:14.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -30622,7 +30718,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-12-09 10:01:25.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-06-15 22:08:15.000000000 -0700
@@ -45,37 +45,50 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
@@ -30700,7 +30796,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
#
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-12-09 10:01:25.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-06-15 22:08:15.000000000 -0700
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -30711,7 +30807,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-12-09 10:01:25.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-06-15 22:08:15.000000000 -0700
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -30730,7 +30826,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-12-09 10:01:26.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-06-15 22:08:15.000000000 -0700
@@ -70,10 +70,12 @@
# security the password file.
@@ -30749,7 +30845,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
# Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-12-09 10:01:26.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-06-15 22:08:15.000000000 -0700
@@ -69,10 +69,12 @@
# security the password file.
@@ -30768,8 +30864,8 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/Select
# Create management and SSL configuration files
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-11-04 16:13:31.000000000 -0700
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
+--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-12-09 10:01:27.000000000 -0800
+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-06-15 22:08:15.000000000 -0700
@@ -36,11 +36,7 @@
@@ -30784,7 +30880,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-12-09 10:01:29.000000000 -0800
+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-06-15 22:08:15.000000000 -0700
@@ -28,7 +28,7 @@
@@ -30795,7 +30891,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-12-09 10:01:29.000000000 -0800
+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-06-15 22:08:15.000000000 -0700
@@ -28,7 +28,7 @@
@@ -30806,7 +30902,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-12-09 10:01:31.000000000 -0800
+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-06-15 22:08:16.000000000 -0700
@@ -31,11 +31,7 @@
@@ -30821,7 +30917,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-11-04 16:13:31.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-12-09 10:01:32.000000000 -0800
+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-06-15 22:08:16.000000000 -0700
@@ -31,11 +31,7 @@
@@ -30836,7 +30932,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,79 +0,0 @@
-/*
@@ -30918,7 +31014,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
- System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
- if (failed > 0) throw new AssertionError("Some tests failed");}
-}
---- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-11-07 17:21:38.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-12-13 23:06:11.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,70 +0,0 @@
-/*
@@ -30991,7 +31087,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
- }
- }
-}
---- ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-11-04 16:13:32.000000000 -0700
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-12-09 10:01:48.000000000 -0800
+++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-06-15 22:08:18.000000000 -0700
@@ -58,6 +58,11 @@
FILESEP="/"
@@ -31005,7 +31101,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
CYGWIN* )
PATHSEP=";"
FILESEP="/"
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-11-04 16:13:32.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-12-09 10:01:49.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-06-15 22:08:18.000000000 -0700
@@ -131,6 +131,27 @@
;;
@@ -31035,7 +31131,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-11-04 16:13:32.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-12-09 10:01:49.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-06-15 22:08:19.000000000 -0700
@@ -92,6 +92,27 @@
;;
@@ -31065,7 +31161,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-11-04 16:13:32.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-12-09 10:01:50.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-06-15 22:08:19.000000000 -0700
@@ -50,13 +50,7 @@
@@ -31082,7 +31178,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-11-04 16:13:32.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-12-09 10:01:50.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-06-15 22:08:19.000000000 -0700
@@ -51,13 +51,7 @@
@@ -31099,22 +31195,22 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
-Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-11-04 16:13:32.000000000 -0700
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
+Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-12-09 10:01:57.000000000 -0800
+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-06-15 22:08:19.000000000 -0700
@@ -44,11 +44,7 @@
# set platform-dependent variables
@@ -31129,7 +31225,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-11-04 16:13:32.000000000 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-12-09 10:01:57.000000000 -0800
+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-06-15 22:08:19.000000000 -0700
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -31144,7 +31240,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-12-09 10:02:01.000000000 -0800
+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-06-15 22:08:20.000000000 -0700
@@ -42,7 +42,7 @@
@@ -31155,7 +31251,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FILESEP="/"
PATHSEP=":"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-12-09 10:02:04.000000000 -0800
+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-06-15 22:08:21.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -31166,7 +31262,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-12-09 10:02:04.000000000 -0800
+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-06-15 22:08:21.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -31177,7 +31273,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-12-09 10:02:04.000000000 -0800
+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-06-15 22:08:21.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31188,7 +31284,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-12-09 10:02:05.000000000 -0800
+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-06-15 22:08:21.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31199,7 +31295,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-12-09 10:02:05.000000000 -0800
+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-07-04 12:51:51.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -31210,7 +31306,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-12-09 10:02:05.000000000 -0800
+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-06-15 22:08:21.000000000 -0700
@@ -42,7 +42,7 @@
# set platform-dependent variables
@@ -31221,7 +31317,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-12-09 10:02:05.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-06-15 22:08:21.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31232,7 +31328,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-12-09 10:02:05.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-06-15 22:08:21.000000000 -0700
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -31247,7 +31343,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-12-09 10:02:05.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-06-15 22:08:21.000000000 -0700
@@ -45,7 +45,7 @@
# set platform-dependent variables
@@ -31258,7 +31354,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-12-09 10:02:05.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-06-15 22:08:21.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31269,7 +31365,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-12-09 10:02:05.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-06-15 22:08:21.000000000 -0700
@@ -72,6 +72,27 @@
;;
@@ -31299,7 +31395,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
* )
echo "Will not run test on: ${OS}"
exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-06-15 22:08:21.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31310,7 +31406,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-06-15 22:08:22.000000000 -0700
@@ -37,7 +37,7 @@
# set platform-dependent variables
@@ -31321,7 +31417,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2010-06-15 22:08:22.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -31332,7 +31428,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
FS="/"
TMP=/tmp
---- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2010-06-15 22:08:22.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -31343,7 +31439,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-06-15 22:08:22.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31354,7 +31450,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-06-15 22:08:22.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31365,7 +31461,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-06-15 22:08:22.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31376,7 +31472,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-06-15 22:08:22.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31387,7 +31483,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-06-15 22:08:22.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31398,7 +31494,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-06-15 22:08:22.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31409,7 +31505,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-12-09 10:02:06.000000000 -0800
+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-06-15 22:08:22.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -31420,7 +31516,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-12-09 10:02:08.000000000 -0800
+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-06-15 22:08:22.000000000 -0700
@@ -53,7 +53,7 @@
@@ -31431,7 +31527,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-12-09 10:02:08.000000000 -0800
+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-06-15 22:08:22.000000000 -0700
@@ -54,7 +54,7 @@
@@ -31442,7 +31538,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-12-09 10:02:12.000000000 -0800
+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-06-15 22:08:23.000000000 -0700
@@ -33,7 +33,7 @@
@@ -31453,7 +31549,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
esac
N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-11-04 16:13:33.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-12-09 10:02:12.000000000 -0800
+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-06-15 22:08:23.000000000 -0700
@@ -56,7 +56,7 @@
@@ -31464,18 +31560,18 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./langtools/.hgtags 2010-11-04 16:13:41.000000000 -0700
-+++ ./langtools/.hgtags 2010-11-06 22:59:55.000000000 -0700
-@@ -91,3 +91,4 @@
- e4e7408cdc5b3d91d39161e1e94aad576ecc2dcd jdk7-b114
- 01e8ac5fbefd35d2d9a0996213cf2390fd164e57 jdk7-b115
- 857bfcea3f30cb5f4ae96f46a53ae1c772f9b0e5 jdk7-b116
-+2129a046f117547fc8a5cb3397a767e6d528f5b6 jdk7-b117
---- ./langtools/.jcheck/conf 2010-11-04 16:13:41.000000000 -0700
+--- ./langtools/.hgtags 2010-12-09 10:05:13.000000000 -0800
++++ ./langtools/.hgtags 2010-12-11 09:07:26.000000000 -0800
+@@ -95,3 +95,4 @@
+ c491eec0acc73fa41b77e1619ed03e56d8a75b83 jdk7-b118
+ 814561077c448292f78de461b6de5d78d57c2089 jdk7-b119
+ 1dd813a529cfa06d850ee7dc42da42efb8f6af0e jdk7-b120
++1bf969e9792f977a8593496681539840a54fe644 jdk7-b121
+--- ./langtools/.jcheck/conf 2010-12-09 10:05:13.000000000 -0800
+++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./langtools/test/Makefile 2010-11-04 16:13:42.000000000 -0700
+--- ./langtools/test/Makefile 2010-12-09 10:05:32.000000000 -0800
+++ ./langtools/test/Makefile 2010-06-15 22:08:59.000000000 -0700
@@ -34,6 +34,22 @@
ARCH=i586
@@ -31520,7 +31616,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/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 2010-11-04 16:13:42.000000000 -0700
+--- ./langtools/test/jprt.config 2010-12-09 10:05:40.000000000 -0800
+++ ./langtools/test/jprt.config 2010-06-15 22:09:02.000000000 -0700
@@ -71,8 +71,8 @@
@@ -31589,7 +31685,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Export PATH setting
PATH="${path4sdk}"
---- ./langtools/test/tools/javac/4846262/Test.sh 2010-11-04 16:13:42.000000000 -0700
+--- ./langtools/test/tools/javac/4846262/Test.sh 2010-12-09 10:05:43.000000000 -0800
+++ ./langtools/test/tools/javac/4846262/Test.sh 2010-06-15 22:09:03.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -31600,7 +31696,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-11-04 16:13:42.000000000 -0700
+--- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-12-09 10:05:43.000000000 -0800
+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2010-06-15 22:09:03.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -31611,7 +31707,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-11-04 16:13:43.000000000 -0700
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-12-09 10:05:47.000000000 -0800
+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-06-15 22:09:04.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -31622,7 +31718,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-11-04 16:13:43.000000000 -0700
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-12-09 10:05:50.000000000 -0800
+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-06-15 22:09:04.000000000 -0700
@@ -54,7 +54,7 @@
# set platform-dependent variables
@@ -31633,7 +31729,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/MissingInclude.sh 2010-11-04 16:13:43.000000000 -0700
+--- ./langtools/test/tools/javac/MissingInclude.sh 2010-12-09 10:05:52.000000000 -0800
+++ ./langtools/test/tools/javac/MissingInclude.sh 2010-06-15 22:09:05.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31644,7 +31740,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-11-04 16:13:43.000000000 -0700
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-12-09 10:05:53.000000000 -0800
+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-06-15 22:09:05.000000000 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
@@ -31655,7 +31751,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-11-04 16:13:43.000000000 -0700
+--- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-12-09 10:05:55.000000000 -0800
+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2010-06-15 22:09:05.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31666,7 +31762,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/apt.sh 2010-11-04 16:13:43.000000000 -0700
+--- ./langtools/test/tools/javac/apt.sh 2010-12-09 10:06:02.000000000 -0800
+++ ./langtools/test/tools/javac/apt.sh 2010-06-15 22:09:06.000000000 -0700
@@ -38,7 +38,7 @@
# set platform-dependent variables
@@ -31677,7 +31773,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-11-04 16:13:43.000000000 -0700
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-12-09 10:06:03.000000000 -0800
+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-06-15 22:09:07.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31688,7 +31784,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-12-09 10:06:12.000000000 -0800
+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-06-15 22:09:07.000000000 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
@@ -31699,7 +31795,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-12-09 10:06:21.000000000 -0800
+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-06-15 22:09:09.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -31710,7 +31806,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javac/javazip/Test.sh 2010-12-09 10:06:21.000000000 -0800
+++ ./langtools/test/tools/javac/javazip/Test.sh 2010-06-15 22:09:10.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -31721,7 +31817,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
SCR=`pwd`
;;
---- ./langtools/test/tools/javac/links/links.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javac/links/links.sh 2010-12-09 10:06:22.000000000 -0800
+++ ./langtools/test/tools/javac/links/links.sh 2010-06-15 22:09:10.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -31732,7 +31828,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-12-09 10:06:24.000000000 -0800
+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2010-06-15 22:09:10.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -31743,7 +31839,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-12-09 10:06:27.000000000 -0800
+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-06-15 22:09:11.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -31754,7 +31850,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-12-09 10:06:28.000000000 -0800
+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-06-15 22:09:11.000000000 -0700
@@ -66,6 +66,17 @@
exit 0;
@@ -31774,7 +31870,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
Windows_98 | Windows_ME )
echo "As Windows 98/Me do not provide Unicode-aware file system, the compilation of the test case is expected to fail on these platforms. Ignoring this test."
exit 0;
---- ./langtools/test/tools/javah/6257087/foo.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javah/6257087/foo.sh 2010-12-09 10:06:31.000000000 -0800
+++ ./langtools/test/tools/javah/6257087/foo.sh 2010-06-15 22:09:12.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -31785,7 +31881,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-12-09 10:06:31.000000000 -0800
+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2010-06-15 22:09:12.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -31796,7 +31892,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-12-09 10:06:31.000000000 -0800
+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-06-15 22:09:12.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -31807,7 +31903,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ReadOldClass.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javah/ReadOldClass.sh 2010-12-09 10:06:31.000000000 -0800
+++ ./langtools/test/tools/javah/ReadOldClass.sh 2010-06-15 22:09:12.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -31818,7 +31914,7 @@ Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javap/pathsep.sh 2010-11-04 16:13:44.000000000 -0700
+--- ./langtools/test/tools/javap/pathsep.sh 2010-12-09 10:06:32.000000000 -0800
+++ ./langtools/test/tools/javap/pathsep.sh 2010-06-15 22:09:12.000000000 -0700
@@ -40,7 +40,7 @@
# set platform-dependent variables
diff --git a/java/openjdk7/files/patch-zzz-nio-kqueue b/java/openjdk7/files/patch-zzz-nio-kqueue
index d72f874e20f0..86ac1f474ef6 100644
--- a/java/openjdk7/files/patch-zzz-nio-kqueue
+++ b/java/openjdk7/files/patch-zzz-nio-kqueue
@@ -1120,7 +1120,7 @@
+}
--- jdk/src/solaris/classes/sun/nio/ch/FreeBSDAsynchronousChannelProvider.java (revision 0)
+++ jdk/src/solaris/classes/sun/nio/ch/FreeBSDAsynchronousChannelProvider.java (revision 16)
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,67 @@
+
+package sun.nio.ch;
+
@@ -1187,14 +1187,6 @@
+ {
+ return new UnixAsynchronousSocketChannelImpl(toPort(group));
+ }
-+
-+ @Override
-+ public AsynchronousDatagramChannel openAsynchronousDatagramChannel(ProtocolFamily family,
-+ AsynchronousChannelGroup group)
-+ throws IOException
-+ {
-+ return new SimpleAsynchronousDatagramChannelImpl(family, toPort(group));
-+ }
+}
$FreeBSD$
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-01 02:49:16 +0000