aboutsummaryrefslogtreecommitdiffstats
path: root/java/openjdk7
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2010-12-18 16:59:20 +0800
committerglewis <glewis@FreeBSD.org>2010-12-18 16:59:20 +0800
commit83937df9c0358e0d21e16b49e7bb54649c64c50f (patch)
tree3861c5a64d9a5672c9cbb5fb0ff5f5f99940b405 /java/openjdk7
parent6842289b3297076299e287f1a99e51025140c5b7 (diff)
downloadfreebsd-ports-gnome-83937df9c0358e0d21e16b49e7bb54649c64c50f.tar.gz
freebsd-ports-gnome-83937df9c0358e0d21e16b49e7bb54649c64c50f.tar.zst
freebsd-ports-gnome-83937df9c0358e0d21e16b49e7bb54649c64c50f.zip
. Update to Build 122.
Diffstat (limited to 'java/openjdk7')
-rw-r--r--java/openjdk7/Makefile4
-rw-r--r--java/openjdk7/distinfo4
-rw-r--r--java/openjdk7/files/patch-set1090
3 files changed, 550 insertions, 548 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 416ed779aa5a..e1a94d12d704 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= 121
-JDK_BUILD_DATE= 09_dec_2010
+JDK_BUILD_NUMBER= 122
+JDK_BUILD_DATE= 16_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 96c6352a3764..fc5b09a43a67 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openjdk-7-ea-src-b121-09_dec_2010.zip) = d45a1922b6a3083aba239d651325822e00f8d4b072efbed80139e9d9df0009d2
-SIZE (openjdk-7-ea-src-b121-09_dec_2010.zip) = 85655941
+SHA256 (openjdk-7-ea-src-b122-16_dec_2010.zip) = 1f61c6b83b0b0c15166bf0e486ba23d3202ca0eca1f865784d8801e671b0fb8e
+SIZE (openjdk-7-ea-src-b122-16_dec_2010.zip) = 85656129
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 331504557a0f..5aff016feadd 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,26 +1,28 @@
---- ./.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
+$FreeBSD$
+
+--- ./.hgtags 2010-12-16 13:48:11.000000000 -0800
++++ ./.hgtags 2010-12-17 23:32:51.000000000 -0800
+@@ -96,3 +96,4 @@
661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
-+2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
---- ./.jcheck/conf 2010-12-09 09:27:47.000000000 -0800
+ 2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
++f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122
+--- ./.jcheck/conf 2010-12-16 13:48:11.000000000 -0800
+++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./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
+--- ./corba/.hgtags 2010-12-16 13:48:46.000000000 -0800
++++ ./corba/.hgtags 2010-12-17 23:32:54.000000000 -0800
+@@ -96,3 +96,4 @@
39829414ae31a0080578a49b751899edd518cd7d jdk7-b119
cff5a173ec1e89013359e804a3e31736ef6fb462 jdk7-b120
-+2cc9f32992101732b23730b737740e64ebc5fa89 jdk7-b121
---- ./corba/.jcheck/conf 2010-12-09 09:28:19.000000000 -0800
+ 2cc9f32992101732b23730b737740e64ebc5fa89 jdk7-b121
++1523a060032c8a5b7840198da8911abeff88118f jdk7-b122
+--- ./corba/.jcheck/conf 2010-12-16 13:48:46.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-12-13 23:06:10.000000000 -0800
+--- ./corba/make/common/Defs-bsd.gmk 2010-12-18 00:00:04.000000000 -0800
+++ ./corba/make/common/Defs-bsd.gmk 2010-10-31 14:11:33.000000000 -0700
@@ -25,9 +25,18 @@
@@ -42,7 +44,7 @@
# Get shared JDK settings
include $(BUILDDIR)/common/shared/Defs.gmk
---- ./corba/make/common/Defs.gmk 2010-12-09 09:28:21.000000000 -0800
+--- ./corba/make/common/Defs.gmk 2010-12-16 13:48:49.000000000 -0800
+++ ./corba/make/common/Defs.gmk 2010-10-31 14:08:26.000000000 -0700
@@ -53,6 +53,28 @@
@@ -73,7 +75,7 @@
#
# Get platform definitions
#
---- ./corba/make/common/shared/Defs-bsd.gmk 2010-12-13 23:06:10.000000000 -0800
+--- ./corba/make/common/shared/Defs-bsd.gmk 2010-12-18 00:00:04.000000000 -0800
+++ ./corba/make/common/shared/Defs-bsd.gmk 2010-10-31 14:10:12.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -93,7 +95,7 @@
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
---- ./corba/make/common/shared/Defs-utils.gmk 2010-12-09 09:28:22.000000000 -0800
+--- ./corba/make/common/shared/Defs-utils.gmk 2010-12-16 13:48:50.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 +146,7 @@
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif
---- ./corba/make/common/shared/Platform.gmk 2010-12-09 09:28:22.000000000 -0800
+--- ./corba/make/common/shared/Platform.gmk 2010-12-16 13:48:50.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 +269,18 @@
REQUIRED_ZIP_VER = 2.2
REQUIRED_UNZIP_VER = 5.12
REQUIRED_MAKE_VER = 3.78
---- ./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
+--- ./hotspot/.hgtags 2010-12-16 13:50:59.000000000 -0800
++++ ./hotspot/.hgtags 2010-12-17 23:32:57.000000000 -0800
+@@ -134,3 +134,4 @@
5484e7c53fa7da5e869902437ee08a9ae10c1c69 jdk7-b119
f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120
-+3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121
---- ./hotspot/.jcheck/conf 2010-12-09 09:30:59.000000000 -0800
+ 3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121
++3a548dc9cb456110ca8fc1514441a8c3bda0014d jdk7-b122
+--- ./hotspot/.jcheck/conf 2010-12-16 13:50:59.000000000 -0800
+++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./hotspot/agent/make/Makefile 2010-12-09 09:31:00.000000000 -0800
+--- ./hotspot/agent/make/Makefile 2010-12-16 13:50:59.000000000 -0800
+++ ./hotspot/agent/make/Makefile 2010-06-15 22:03:11.000000000 -0700
@@ -52,6 +52,9 @@
sun.jvm.hotspot.compiler \
@@ -309,7 +311,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-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-07-04 09:30:36.000000000 -0700
@@ -22,6 +22,7 @@
*
@@ -450,7 +452,7 @@
#endif /* amd64 */
---- ./hotspot/agent/src/os/bsd/Makefile 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/Makefile 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/Makefile 2010-07-04 09:45:58.000000000 -0700
@@ -22,7 +22,7 @@
#
@@ -649,7 +651,7 @@
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+ return 0;
+}
---- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-12-18 00:00:03.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 +953,7 @@
+extern void hdestroy_r (struct hsearch_data *__htab);
+
+#endif /* _HSEARCH_R_H_ */
---- ./hotspot/agent/src/os/bsd/libproc.h 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/libproc.h 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/libproc.h 2010-07-04 09:30:36.000000000 -0700
@@ -27,7 +27,8 @@
@@ -1013,7 +1015,7 @@
// get number of shared objects
int get_num_libs(struct ps_prochandle* ph);
---- ./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-12-18 00:00:03.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 +1116,7 @@
+ print_debug("ps_pcontinue not implemented\n");
return PS_OK;
}
---- ./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-12-18 00:00:03.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 +1147,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-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/mapfile 2010-12-18 00:00:03.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 +1170,7 @@
# used by attach test program
init_libproc;
---- ./hotspot/agent/src/os/bsd/proc_service.h 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/proc_service.h 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,76 +0,0 @@
-/*
@@ -1247,7 +1249,7 @@
-ps_err_e ps_get_thread_area();
-
-#endif /* _PROC_SERVICE_H_ */
---- ./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-12-18 00:00:03.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/ps_core.c 2010-07-04 09:30:46.000000000 -0700
@@ -142,6 +142,7 @@
@@ -1560,7 +1562,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-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2010-10-31 14:26:55.000000000 -0700
@@ -22,20 +22,22 @@
*
@@ -2129,7 +2131,7 @@
- }
return ph;
}
---- ./hotspot/agent/src/os/bsd/salibelf.c 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/salibelf.c 2010-12-18 00:00:03.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 +2141,7 @@
extern void print_debug(const char*,...);
---- ./hotspot/agent/src/os/bsd/symtab.c 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/symtab.c 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/symtab.c 2010-07-04 09:30:46.000000000 -0700
@@ -23,10 +23,10 @@
*/
@@ -2540,7 +2542,7 @@
void destroy_symtab(struct symtab* symtab) {
if (!symtab) return;
if (symtab->strs) free(symtab->strs);
---- ./hotspot/agent/src/os/bsd/symtab.h 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/symtab.h 2010-12-18 00:00:03.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 +2553,7 @@
// destroy the symbol table
void destroy_symtab(struct symtab* symtab);
---- ./hotspot/agent/src/os/bsd/test.c 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/test.c 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/test.c 2010-07-04 09:30:46.000000000 -0700
@@ -44,7 +44,7 @@
}
@@ -2562,7 +2564,7 @@
return 1;
}
}
---- ./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-12-16 13:51:18.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 +2635,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-12-09 09:31:27.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-12-16 13:51:37.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 +2708,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-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-12-18 00:00:03.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 +2735,7 @@
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
---- ./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-12-18 00:00:03.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 +2758,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-12-13 23:06:09.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-12-18 00:00:03.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 +2807,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./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 2010-12-18 00:00:03.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 +2891,7 @@
- private Address sp;
- private BsdDebugger dbg;
-}
---- ./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 2010-12-18 00:00:03.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 +2940,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./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-12-16 13:51:59.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 +2965,7 @@
}
if (access == null) {
---- ./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-12-18 00:00:03.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 +3027,7 @@
};
public static String getSignalName(int sigNum) {
---- ./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 2010-12-18 00:00:03.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 +3167,7 @@
- return debugger.getThreadForIdentifierAddress(pthreadIdAddr);
- }
-}
---- ./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 2010-12-18 00:00:03.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 +3335,7 @@
-
-
-}
---- ./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-12-18 00:00:03.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 +3397,7 @@
};
public static String getSignalName(int sigNum) {
---- ./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-12-16 13:52:03.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 +3414,7 @@
} else if (os.startsWith("Windows")) {
return "win32";
} else {
---- ./hotspot/make/Makefile 2010-12-09 09:31:58.000000000 -0800
+--- ./hotspot/make/Makefile 2010-12-16 13:52:06.000000000 -0800
+++ ./hotspot/make/Makefile 2010-10-31 14:22:38.000000000 -0700
@@ -321,28 +321,28 @@
ifneq ($(OSNAME),windows)
@@ -3453,7 +3455,7 @@
$(install-file)
endif
endif
---- ./hotspot/make/bsd/Makefile 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/make/bsd/Makefile 2010-12-18 00:00:03.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
@@ -3493,7 +3495,7 @@
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
---- ./hotspot/make/bsd/makefiles/buildtree.make 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/buildtree.make 2010-12-18 00:00:03.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 +3510,7 @@
) > $@
env.csh: env.sh
---- ./hotspot/make/bsd/makefiles/cscope.make 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/cscope.make 2010-12-18 00:00:03.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 +3521,7 @@
CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
endif
---- ./hotspot/make/bsd/makefiles/defs.make 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/defs.make 2010-12-18 00:00:03.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 +3629,7 @@
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
-
-
---- ./hotspot/make/bsd/makefiles/gcc.make 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/gcc.make 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/gcc.make 2010-10-31 15:24:40.000000000 -0700
@@ -22,18 +22,22 @@
#
@@ -3750,7 +3752,7 @@
#------------------------------------------------------------------------
# Debug flags
---- ./hotspot/make/bsd/makefiles/jsig.make 2010-12-13 23:06:09.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/jsig.make 2010-12-18 00:00:03.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 +3793,7 @@
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
install_jsig: $(LIBJSIG)
---- ./hotspot/make/bsd/makefiles/launcher.make 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/launcher.make 2010-12-18 00:00:03.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 +3804,7 @@
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
---- ./hotspot/make/bsd/makefiles/sa.make 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/sa.make 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/sa.make 2010-10-31 14:26:55.000000000 -0700
@@ -45,8 +45,8 @@
@@ -3815,7 +3817,7 @@
AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
---- ./hotspot/make/bsd/makefiles/saproc.make 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/saproc.make 2010-12-18 00:00:03.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 +3886,7 @@
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
install_saproc: checkAndBuildSA
---- ./hotspot/make/bsd/makefiles/vm.make 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/vm.make 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/makefiles/vm.make 2010-10-31 14:26:55.000000000 -0700
@@ -90,6 +90,10 @@
${JRE_VERSION} \
@@ -4003,7 +4005,7 @@
}
DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
---- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-12-18 00:00:03.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 +4031,7 @@
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
OPT_CFLAGS/compactingPermGenGen.o = -O1
---- ./hotspot/make/bsd/platform_amd64 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/platform_amd64 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/platform_amd64 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4037,7 +4039,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_amd64.suncc 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/platform_amd64.suncc 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/platform_amd64.suncc 2010-01-17 15:46:11.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4045,7 +4047,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/platform_i486 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/platform_i486 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4053,7 +4055,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_i486.suncc 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/platform_i486.suncc 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/platform_i486.suncc 2010-01-17 15:46:11.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4061,7 +4063,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/platform_ia64 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/platform_ia64 2010-01-17 15:46:11.000000000 -0800
@@ -10,6 +10,6 @@
@@ -4071,7 +4073,7 @@
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP
mark_style = alignment
---- ./hotspot/make/bsd/platform_sparc 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/platform_sparc 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/platform_sparc 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4079,7 +4081,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_sparcv9 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/platform_sparcv9 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/platform_sparcv9 2010-01-17 15:46:11.000000000 -0800
@@ -12,4 +12,4 @@
@@ -4087,7 +4089,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_zero.in 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/make/bsd/platform_zero.in 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/make/bsd/platform_zero.in 2009-11-04 19:52:29.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4095,7 +4097,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-12-09 09:31:58.000000000 -0800
+--- ./hotspot/make/defs.make 2010-12-16 13:52:06.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 +4125,7 @@
else
OSNAME=solaris
endif
---- ./hotspot/make/linux/makefiles/defs.make 2010-12-09 09:31:58.000000000 -0800
+--- ./hotspot/make/linux/makefiles/defs.make 2010-12-16 13:52:07.000000000 -0800
+++ ./hotspot/make/linux/makefiles/defs.make 2010-10-31 14:24:05.000000000 -0700
@@ -116,33 +116,36 @@
@@ -4167,7 +4169,7 @@
$(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
---- ./hotspot/make/sa.files 2010-12-09 09:32:02.000000000 -0800
+--- ./hotspot/make/sa.files 2010-12-16 13:52:08.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 +4191,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-12-09 09:32:02.000000000 -0800
+--- ./hotspot/make/solaris/makefiles/defs.make 2010-12-16 13:52:08.000000000 -0800
+++ ./hotspot/make/solaris/makefiles/defs.make 2010-10-31 14:25:25.000000000 -0700
@@ -61,34 +61,37 @@
@@ -4242,7 +4244,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-12-09 09:32:05.000000000 -0800
+--- ./hotspot/make/windows/makefiles/defs.make 2010-12-16 13:52:10.000000000 -0800
+++ ./hotspot/make/windows/makefiles/defs.make 2010-07-10 12:30:12.000000000 -0700
@@ -109,6 +109,9 @@
@@ -4285,7 +4287,7 @@
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2010-12-09 09:32:08.000000000 -0800
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2010-12-16 13:52:14.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);
@@ -4296,7 +4298,7 @@
+#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-12-16 13:52:17.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
@@ -4309,7 +4311,7 @@
__ bind(_unwind_handler_entry);
__ verify_not_null_oop(rax);
---- ./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-12-16 13:52:18.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);
@@ -4320,7 +4322,7 @@
+#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-12-16 13:52:18.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));
@@ -4340,7 +4342,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-12-09 09:32:11.000000000 -0800
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-12-16 13:52:18.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_
@@ -4351,7 +4353,7 @@
#define JNIEXPORT
#define JNIIMPORT
#define JNICALL
---- ./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-12-16 13:52:20.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);
@@ -4362,7 +4364,7 @@
+#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-12-18 00:00:03.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"
@@ -4501,7 +4503,7 @@
result = bsd_i586_ServerClassMachine();
#else
if (_launcher_debug) {
---- ./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-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-11-13 14:35:21.000000000 -0800
@@ -334,6 +334,15 @@
@@ -4557,7 +4559,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-12-18 00:00:03.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>
@@ -4588,7 +4590,7 @@
#endif
*(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */
---- ./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-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
@@ -36,7 +36,7 @@
// HPI_FileInterface
@@ -4640,7 +4642,7 @@
}
---- ./hotspot/src/os/bsd/vm/jsig.c 2010-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/jsig.c 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/jsig.c 2010-07-04 09:31:26.000000000 -0700
@@ -143,7 +143,8 @@
}
@@ -4652,7 +4654,7 @@
}
static int call_os_sigaction(int sig, const struct sigaction *act,
---- ./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-12-18 00:00:03.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). */
@@ -4703,7 +4705,7 @@
};
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
---- ./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-12-18 00:00:03.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"}
@@ -4819,7 +4821,7 @@
+ * 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-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
@@ -28,8 +28,8 @@
@@ -4832,7 +4834,7 @@
_siginfo = NULL;
_ucontext = NULL;
_expanding_stack = 0;
---- ./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-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
@@ -36,6 +36,12 @@
@@ -4891,7 +4893,7 @@
pthread_t pthread_id() const {
return _pthread_id;
}
---- ./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-12-18 00:00:03.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>
@@ -6333,7 +6335,7 @@
// execve failed
_exit(-1);
---- ./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-12-18 00:00:03.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 */
@@ -6471,7 +6473,7 @@
// Stack repair handling
---- ./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-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-07-04 09:31:26.000000000 -0700
@@ -61,7 +61,15 @@
@@ -6489,7 +6491,7 @@
}
---- ./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-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
@@ -241,7 +241,7 @@
@@ -6548,7 +6550,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-12-18 00:00:03.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 @@
-/*
@@ -6596,7 +6598,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-12-18 00:00:03.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 @@
-/*
@@ -6805,7 +6807,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-//
@@ -6835,7 +6837,7 @@
-//
-
-// SPARC Bsd Architecture Description File
---- ./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 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800
@@ -1,105 +0,0 @@
-#
@@ -6943,7 +6945,7 @@
- ta 0x03
- retl
- mov %fp, %o0
---- ./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 2010-12-18 00:00:03.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 @@
-/*
@@ -6982,7 +6984,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-12-18 00:00:03.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 @@
-/*
@@ -7087,7 +7089,7 @@
-
-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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-12-18 00:00:03.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,724 +0,0 @@
-/*
@@ -7814,7 +7816,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-12-18 00:00:03.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 @@
-/*
@@ -7861,7 +7863,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-12-18 00:00:03.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 @@
-/*
@@ -7904,7 +7906,7 @@
-inline void Prefetch::write(void *loc, intx interval) {}
-
-#endif
---- ./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 2010-12-18 00:00:03.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 @@
-/*
@@ -7944,7 +7946,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-12-18 00:00:03.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 @@
-/*
@@ -7975,7 +7977,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-12-18 00:00:03.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 @@
-/*
@@ -8088,7 +8090,7 @@
-
-void JavaThread::cache_global_variables() { }
-
---- ./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 2010-12-18 00:00:03.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 @@
-/*
@@ -8189,7 +8191,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-12-18 00:00:03.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 @@
-/*
@@ -8261,7 +8263,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-12-18 00:00:03.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 @@
-/*
@@ -8325,7 +8327,7 @@
-
- return features;
-}
---- ./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-12-18 00:00:03.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.
@@ -8527,7 +8529,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-12-18 00:00:03.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.
@@ -8676,7 +8678,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-12-18 00:00:03.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 @@
*
@@ -8712,7 +8714,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-12-18 00:00:03.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 @@
*
@@ -8740,7 +8742,7 @@
+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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-12-18 00:00:03.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>
@@ -9341,7 +9343,7 @@
#endif // AMD64
st->cr();
---- ./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-12-18 00:00:03.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
@@ -9354,7 +9356,7 @@
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
#endif // !AMD64
---- ./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-12-18 00:00:03.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 @@
/******************************/ \
@@ -9365,7 +9367,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-12-18 00:00:03.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 @@
*
@@ -10039,7 +10041,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-12-13 23:06:10.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-12-18 00:00:03.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
@@ -10069,7 +10071,7 @@
- return bswap_64(x);
+ return bswap64(x);
}
---- ./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-12-18 00:00:03.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 @@
@@ -10084,7 +10086,7 @@
#ifdef PPC
---- ./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-12-18 00:00:03.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 @@
*
@@ -10201,7 +10203,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-12-09 09:32:39.000000000 -0800
+--- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-12-16 13:52:41.000000000 -0800
+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2010-06-15 22:03:24.000000000 -0700
@@ -69,9 +69,9 @@
#endif
@@ -10215,7 +10217,7 @@
// Macros
#define uint32 unsigned int
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-12-09 09:32:44.000000000 -0800
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-12-16 13:52:45.000000000 -0800
+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-10-31 14:03:01.000000000 -0700
@@ -952,7 +952,7 @@
}
@@ -10226,7 +10228,7 @@
}
}
---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-12-09 09:32:54.000000000 -0800
+--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-12-16 13:52:56.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.
@@ -10246,7 +10248,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-12-09 09:33:03.000000000 -0800
+--- ./hotspot/src/share/vm/prims/forte.cpp 2010-12-16 13:53:05.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.
@@ -10268,7 +10270,7 @@
#endif // !_WINDOWS
} // end extern "C"
---- ./hotspot/src/share/vm/runtime/os.cpp 2010-12-09 09:33:07.000000000 -0800
+--- ./hotspot/src/share/vm/runtime/os.cpp 2010-12-16 13:53:09.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");
@@ -10282,7 +10284,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-12-09 09:33:09.000000000 -0800
+--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-12-16 13:53:10.000000000 -0800
+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-10-31 14:03:02.000000000 -0700
@@ -149,7 +149,8 @@
@@ -10294,7 +10296,7 @@
#ifdef ZERO
#define CPU ZERO_LIBARCH
---- ./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-12-16 13:53:14.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>
@@ -10362,7 +10364,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-12-09 09:33:12.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/macros.hpp 2010-12-16 13:53:14.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
@@ -10379,7 +10381,7 @@
#if defined(IA32) || defined(AMD64)
#define X86
#define X86_ONLY(code) code
---- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-12-09 09:33:12.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-12-16 13:53:14.000000000 -0800
+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2010-06-15 22:03:33.000000000 -0700
@@ -848,7 +848,7 @@
@@ -10390,7 +10392,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-12-09 09:33:12.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-12-16 13:53:14.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",
@@ -10421,7 +10423,7 @@
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
---- ./hotspot/test/Makefile 2010-12-09 09:33:12.000000000 -0800
+--- ./hotspot/test/Makefile 2010-12-16 13:53:15.000000000 -0800
+++ ./hotspot/test/Makefile 2010-12-04 08:29:05.000000000 -0800
@@ -44,6 +44,22 @@
ARCH = i586
@@ -10455,7 +10457,7 @@
ifdef TESTDIRS
JTREG_TESTDIRS = $(TESTDIRS)
endif
---- ./hotspot/test/jprt.config 2010-12-09 09:33:16.000000000 -0800
+--- ./hotspot/test/jprt.config 2010-12-16 13:53:18.000000000 -0800
+++ ./hotspot/test/jprt.config 2010-06-15 22:03:33.000000000 -0700
@@ -75,8 +75,8 @@
@@ -10524,7 +10526,7 @@
# Export PATH setting
PATH="${path4sdk}"
---- ./hotspot/test/runtime/6929067/Test6929067.sh 2010-12-09 09:33:16.000000000 -0800
+--- ./hotspot/test/runtime/6929067/Test6929067.sh 2010-12-16 13:53:18.000000000 -0800
+++ ./hotspot/test/runtime/6929067/Test6929067.sh 2010-04-20 20:10:00.000000000 -0700
@@ -29,7 +29,7 @@
PS=":"
@@ -10535,40 +10537,40 @@
NULL=NUL
PS=";"
FS="\\"
---- ./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
+--- ./jaxp/.hgtags 2010-12-16 13:54:43.000000000 -0800
++++ ./jaxp/.hgtags 2010-12-17 23:33:00.000000000 -0800
+@@ -96,3 +96,4 @@
9ee900f01c5872551c06f33ae909662ffd8463ac jdk7-b119
4821de0908defe647fcdaab4485f98873e24dea0 jdk7-b120
-+63dae40fa19fd3bf4689ea2f3c1d9d690e1abcee jdk7-b121
---- ./jaxp/.jcheck/conf 2010-12-09 09:35:13.000000000 -0800
+ 63dae40fa19fd3bf4689ea2f3c1d9d690e1abcee jdk7-b121
++03ff13d19c8fa983cbab6542930a7f352e9b5b33 jdk7-b122
+--- ./jaxp/.jcheck/conf 2010-12-16 13:54:43.000000000 -0800
+++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./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
+--- ./jaxws/.hgtags 2010-12-16 14:00:38.000000000 -0800
++++ ./jaxws/.hgtags 2010-12-17 23:33:03.000000000 -0800
+@@ -96,3 +96,4 @@
41fa02b3663795ddf529690df7aa6714210093ec jdk7-b119
a4f2e1ca67163ef79555082809d7cd719893c338 jdk7-b120
-+0fa950117faac7bdbc94e6c46b88f6f892031c17 jdk7-b121
---- ./jaxws/.jcheck/conf 2010-12-09 09:42:14.000000000 -0800
+ 0fa950117faac7bdbc94e6c46b88f6f892031c17 jdk7-b121
++17b6c48a344968880925dcef1178fec282feb335 jdk7-b122
+--- ./jaxws/.jcheck/conf 2010-12-16 14:00:39.000000000 -0800
+++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./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
+--- ./jdk/.hgtags 2010-12-16 14:09:53.000000000 -0800
++++ ./jdk/.hgtags 2010-12-17 23:33:08.000000000 -0800
+@@ -96,3 +96,4 @@
ecab7eefb8f2326fd90fb632f47f1b6f81e928f8 jdk7-b119
37d74e29687cf07c2bf9411af58c7e42440855c3 jdk7-b120
-+a661d8587b5d8986aacae086f5df66af9e1a96b1 jdk7-b121
---- ./jdk/.jcheck/conf 2010-12-09 09:51:10.000000000 -0800
+ a661d8587b5d8986aacae086f5df66af9e1a96b1 jdk7-b121
++ac311eb325bfc763698219252bf3cee9e091f3af jdk7-b122
+--- ./jdk/.jcheck/conf 2010-12-16 14:09:53.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-12-09 09:51:10.000000000 -0800
+--- ./jdk/make/com/sun/java/pack/Makefile 2010-12-16 14:09:54.000000000 -0800
+++ ./jdk/make/com/sun/java/pack/Makefile 2010-06-15 22:06:15.000000000 -0700
@@ -62,6 +62,7 @@
@@ -10601,7 +10603,7 @@
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
---- ./jdk/make/com/sun/nio/Makefile 2010-12-09 09:51:11.000000000 -0800
+--- ./jdk/make/com/sun/nio/Makefile 2010-12-16 14:09:54.000000000 -0800
+++ ./jdk/make/com/sun/nio/Makefile 2010-06-15 22:06:16.000000000 -0700
@@ -30,7 +30,16 @@
BUILDDIR = ../../..
@@ -10620,7 +10622,7 @@
include $(BUILDDIR)/common/Subdirs.gmk
all build clean clobber::
---- ./jdk/make/com/sun/nio/sctp/Makefile 2010-12-09 09:51:11.000000000 -0800
+--- ./jdk/make/com/sun/nio/sctp/Makefile 2010-12-16 14:09:54.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 \
@@ -10640,7 +10642,7 @@
else # windows
include $(BUILDDIR)/common/Classes.gmk
---- ./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-12-16 14:09:55.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
@@ -10651,7 +10653,7 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./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-12-16 14:09:55.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
@@ -10663,7 +10665,7 @@
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
---- ./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-12-16 14:09:55.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
@@ -10674,7 +10676,7 @@
+FILES_c = \
+ BsdVirtualMachine.c
+endif
---- ./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-12-16 14:09:55.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
@@ -10688,7 +10690,7 @@
#
# Files that need to be copied
#
---- ./jdk/make/com/sun/tools/attach/Makefile 2010-12-09 09:51:13.000000000 -0800
+--- ./jdk/make/com/sun/tools/attach/Makefile 2010-12-16 14:09:55.000000000 -0800
+++ ./jdk/make/com/sun/tools/attach/Makefile 2010-06-15 22:06:16.000000000 -0700
@@ -37,6 +37,9 @@
ifeq ($(PLATFORM), linux)
@@ -10700,7 +10702,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
---- ./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-12-18 00:00:04.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;
@@ -10718,7 +10720,7 @@
local:
*;
};
---- ./jdk/make/common/Defs-bsd.gmk 2010-12-13 23:06:10.000000000 -0800
+--- ./jdk/make/common/Defs-bsd.gmk 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/make/common/Defs-bsd.gmk 2010-07-10 13:11:34.000000000 -0700
@@ -25,7 +25,7 @@
@@ -10918,7 +10920,7 @@
ifeq ($(ARCH), ia64)
INCLUDE_SA = false
else
---- ./jdk/make/common/Defs-linux.gmk 2010-12-09 09:51:13.000000000 -0800
+--- ./jdk/make/common/Defs-linux.gmk 2010-12-16 14:09:55.000000000 -0800
+++ ./jdk/make/common/Defs-linux.gmk 2010-07-10 13:10:56.000000000 -0700
@@ -322,9 +322,10 @@
override LIBSOCKET =
@@ -10932,7 +10934,7 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs-solaris.gmk 2010-12-09 09:51:13.000000000 -0800
+--- ./jdk/make/common/Defs-solaris.gmk 2010-12-16 14:09:55.000000000 -0800
+++ ./jdk/make/common/Defs-solaris.gmk 2010-07-10 13:11:24.000000000 -0700
@@ -648,6 +648,9 @@
# Network Services library
@@ -10944,7 +10946,7 @@
# GLOBAL_KPIC: If set means all libraries are PIC, position independent code
# EXCEPT for select compiles
# If a .o file is compiled non-PIC then it should be forced
---- ./jdk/make/common/Defs.gmk 2010-12-09 09:51:13.000000000 -0800
+--- ./jdk/make/common/Defs.gmk 2010-12-16 14:09:55.000000000 -0800
+++ ./jdk/make/common/Defs.gmk 2010-12-11 09:07:22.000000000 -0800
@@ -186,6 +186,36 @@
endif
@@ -11002,7 +11004,7 @@
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./jdk/make/common/Program.gmk 2010-12-09 09:51:13.000000000 -0800
+--- ./jdk/make/common/Program.gmk 2010-12-16 14:09:55.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)
@@ -11064,7 +11066,7 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk 2010-12-09 09:51:13.000000000 -0800
+--- ./jdk/make/common/Release.gmk 2010-12-16 14:09:55.000000000 -0800
+++ ./jdk/make/common/Release.gmk 2010-10-31 14:12:34.000000000 -0700
@@ -154,14 +154,13 @@
tnameserv.1 \
@@ -11125,7 +11127,7 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-12-09 09:51:13.000000000 -0800
+--- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-12-16 14:09:55.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 \
@@ -11214,7 +11216,7 @@
import-binary-plug-jar \
import-binary-plugs-completed
---- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-12-09 09:51:14.000000000 -0800
+--- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-12-16 14:09:56.000000000 -0800
+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-06-15 22:06:16.000000000 -0700
@@ -72,6 +72,24 @@
@@ -11241,7 +11243,7 @@
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./jdk/make/common/shared/Defs-bsd.gmk 2010-12-13 23:06:10.000000000 -0800
+--- ./jdk/make/common/shared/Defs-bsd.gmk 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-07-04 12:38:37.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -11281,7 +11283,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-12-09 09:51:14.000000000 -0800
+--- ./jdk/make/common/shared/Defs-utils.gmk 2010-12-16 14:09:56.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)
@@ -11337,7 +11339,7 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs.gmk 2010-12-09 09:51:14.000000000 -0800
+--- ./jdk/make/common/shared/Defs.gmk 2010-12-16 14:09:56.000000000 -0800
+++ ./jdk/make/common/shared/Defs.gmk 2010-10-31 14:12:34.000000000 -0700
@@ -613,8 +613,8 @@
override CC_VERSION = sun
@@ -11350,7 +11352,7 @@
override CC_VERSION = gcc
endif
---- ./jdk/make/common/shared/Platform.gmk 2010-12-09 09:51:14.000000000 -0800
+--- ./jdk/make/common/shared/Platform.gmk 2010-12-16 14:09:56.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
@@ -11497,7 +11499,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-12-09 09:51:14.000000000 -0800
+--- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-12-16 14:09:56.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)
@@ -11507,7 +11509,7 @@
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-12-09 09:51:14.000000000 -0800
+--- ./jdk/make/common/shared/Sanity.gmk 2010-12-16 14:09:56.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}')
@@ -11540,7 +11542,7 @@
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
---- ./jdk/make/java/Makefile 2010-12-09 09:51:15.000000000 -0800
+--- ./jdk/make/java/Makefile 2010-12-16 14:09:56.000000000 -0800
+++ ./jdk/make/java/Makefile 2010-06-15 22:06:17.000000000 -0700
@@ -53,7 +53,7 @@
endif
@@ -11551,7 +11553,7 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/hpi/hpi_common.gmk 2010-12-09 09:51:15.000000000 -0800
+--- ./jdk/make/java/hpi/hpi_common.gmk 2010-12-16 14:09:56.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.
@@ -11560,7 +11562,7 @@
-OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) -ldl
+OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) $(LIBDL)
endif
---- ./jdk/make/java/hpi/native/Makefile 2010-12-09 09:51:15.000000000 -0800
+--- ./jdk/make/java/hpi/native/Makefile 2010-12-16 14:09:56.000000000 -0800
+++ ./jdk/make/java/hpi/native/Makefile 2010-06-15 22:06:17.000000000 -0700
@@ -73,16 +73,25 @@
ifeq ($(MOOT_PRIORITIES),true)
@@ -11588,7 +11590,7 @@
ifeq ($(HAVE_FILIOH),true)
OTHER_CPPFLAGS += -DHAVE_FILIOH
endif
---- ./jdk/make/java/instrument/Makefile 2010-12-09 09:51:15.000000000 -0800
+--- ./jdk/make/java/instrument/Makefile 2010-12-16 14:09:56.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
@@ -11629,7 +11631,7 @@
#
# Library to compile.
---- ./jdk/make/java/java/Makefile 2010-12-09 09:51:15.000000000 -0800
+--- ./jdk/make/java/java/Makefile 2010-12-16 14:09:57.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?
@@ -11651,7 +11653,7 @@
-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
endif
---- ./jdk/make/java/java/genlocales.gmk 2010-12-09 09:51:15.000000000 -0800
+--- ./jdk/make/java/java/genlocales.gmk 2010-12-16 14:09:57.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)
@@ -11672,7 +11674,7 @@
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
---- ./jdk/make/java/java/localegen.sh 2010-12-09 09:51:15.000000000 -0800
+--- ./jdk/make/java/java/localegen.sh 2010-12-16 14:09:57.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
@@ -11686,7 +11688,7 @@
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
---- ./jdk/make/java/java_hprof_demo/Makefile 2010-12-09 09:51:16.000000000 -0800
+--- ./jdk/make/java/java_hprof_demo/Makefile 2010-12-16 14:09:57.000000000 -0800
+++ ./jdk/make/java/java_hprof_demo/Makefile 2010-07-10 12:45:09.000000000 -0700
@@ -84,7 +84,7 @@
ifeq ($(PLATFORM), windows)
@@ -11697,7 +11699,7 @@
endif
#
---- ./jdk/make/java/jli/Makefile 2010-12-09 09:51:16.000000000 -0800
+--- ./jdk/make/java/jli/Makefile 2010-12-16 14:09:57.000000000 -0800
+++ ./jdk/make/java/jli/Makefile 2010-11-13 12:00:16.000000000 -0800
@@ -45,7 +45,9 @@
@@ -11789,7 +11791,7 @@
+ vpath %.c $(ZIP_SRC)
+endif
+
---- ./jdk/make/java/management/Makefile 2010-12-09 09:51:16.000000000 -0800
+--- ./jdk/make/java/management/Makefile 2010-12-16 14:09:58.000000000 -0800
+++ ./jdk/make/java/management/Makefile 2010-06-15 22:06:17.000000000 -0700
@@ -86,6 +86,11 @@
OTHER_INCLUDES += \
@@ -11803,7 +11805,7 @@
ifeq ($(PLATFORM),windows)
OTHER_LDLIBS += $(JVMLIB)
endif
---- ./jdk/make/java/net/FILES_c.gmk 2010-12-09 09:51:16.000000000 -0800
+--- ./jdk/make/java/net/FILES_c.gmk 2010-12-16 14:09:58.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
@@ -11816,7 +11818,7 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile 2010-12-09 09:51:16.000000000 -0800
+--- ./jdk/make/java/net/Makefile 2010-12-16 14:09:58.000000000 -0800
+++ ./jdk/make/java/net/Makefile 2010-10-31 14:12:34.000000000 -0700
@@ -96,14 +96,21 @@
@@ -11841,7 +11843,7 @@
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
---- ./jdk/make/java/nio/Makefile 2010-12-09 09:51:16.000000000 -0800
+--- ./jdk/make/java/nio/Makefile 2010-12-16 14:09:58.000000000 -0800
+++ ./jdk/make/java/nio/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -261,6 +261,69 @@
sun/nio/fs/UnixConstants.java
@@ -11957,7 +11959,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
---- ./jdk/make/java/nio/mapfile-bsd 2010-12-13 23:06:10.000000000 -0800
+--- ./jdk/make/java/nio/mapfile-bsd 2010-12-18 00:00:04.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;
@@ -12016,7 +12018,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-12-09 09:51:17.000000000 -0800
+--- ./jdk/make/java/npt/Makefile 2010-12-16 14:09:59.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
@@ -12037,7 +12039,7 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile 2010-12-09 09:51:18.000000000 -0800
+--- ./jdk/make/java/redist/fonts/Makefile 2010-12-16 14:09:59.000000000 -0800
+++ ./jdk/make/java/redist/fonts/Makefile 2010-06-15 22:06:18.000000000 -0700
@@ -43,7 +43,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
@@ -12066,7 +12068,7 @@
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/java/security/Makefile 2010-12-09 09:51:18.000000000 -0800
+--- ./jdk/make/java/security/Makefile 2010-12-16 14:09:59.000000000 -0800
+++ ./jdk/make/java/security/Makefile 2010-07-24 14:31:27.000000000 -0700
@@ -50,7 +50,15 @@
ifneq ($(ARCH_DATA_MODEL), 64)
@@ -12084,7 +12086,7 @@
endif # PLATFORM
---- ./jdk/make/java/zip/FILES_c.gmk 2010-12-09 09:51:18.000000000 -0800
+--- ./jdk/make/java/zip/FILES_c.gmk 2010-12-16 14:10:00.000000000 -0800
+++ ./jdk/make/java/zip/FILES_c.gmk 2010-06-15 22:06:18.000000000 -0700
@@ -29,7 +29,10 @@
Deflater.c \
@@ -12105,7 +12107,7 @@
- zutil.c
+ zutil.c
+endif
---- ./jdk/make/java/zip/Makefile 2010-12-09 09:51:18.000000000 -0800
+--- ./jdk/make/java/zip/Makefile 2010-12-16 14:10:00.000000000 -0800
+++ ./jdk/make/java/zip/Makefile 2010-06-15 22:06:18.000000000 -0700
@@ -72,16 +72,28 @@
CPPFLAGS += -UDEBUG
@@ -12137,7 +12139,7 @@
OTHER_LDLIBS = $(JVMLIB)
+endif
+
---- ./jdk/make/javax/sound/FILES_c.gmk 2010-12-09 09:51:19.000000000 -0800
+--- ./jdk/make/javax/sound/FILES_c.gmk 2010-12-16 14:10:01.000000000 -0800
+++ ./jdk/make/javax/sound/FILES_c.gmk 2010-06-15 22:06:18.000000000 -0700
@@ -34,6 +34,8 @@
@@ -12148,7 +12150,7 @@
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
---- ./jdk/make/javax/sound/Makefile 2010-12-09 09:51:19.000000000 -0800
+--- ./jdk/make/javax/sound/Makefile 2010-12-16 14:10:01.000000000 -0800
+++ ./jdk/make/javax/sound/Makefile 2010-06-15 22:06:18.000000000 -0700
@@ -108,6 +108,16 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
@@ -12167,7 +12169,7 @@
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk 2010-12-09 09:51:19.000000000 -0800
+--- ./jdk/make/javax/sound/SoundDefs.gmk 2010-12-16 14:10:01.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
@@ -12180,7 +12182,7 @@
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
---- ./jdk/make/jpda/back/Makefile 2010-12-09 09:51:19.000000000 -0800
+--- ./jdk/make/jpda/back/Makefile 2010-12-16 14:10:01.000000000 -0800
+++ ./jdk/make/jpda/back/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -50,7 +50,7 @@
-I$(GENNATIVESRCDIR)/jdwp
@@ -12191,7 +12193,7 @@
endif # PLATFORM
#
---- ./jdk/make/jpda/transport/socket/Makefile 2010-12-09 09:51:20.000000000 -0800
+--- ./jdk/make/jpda/transport/socket/Makefile 2010-12-16 14:10:01.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
@@ -12205,7 +12207,7 @@
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET)
endif
---- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-12-09 09:51:22.000000000 -0800
+--- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-12-16 14:10:03.000000000 -0800
+++ ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -37,12 +37,11 @@
@@ -12224,7 +12226,7 @@
endif
#
---- ./jdk/make/sun/awt/Makefile 2010-12-09 09:51:27.000000000 -0800
+--- ./jdk/make/sun/awt/Makefile 2010-12-16 14:10:06.000000000 -0800
+++ ./jdk/make/sun/awt/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -94,7 +94,7 @@
ifeq ($(PLATFORM), solaris)
@@ -12305,7 +12307,7 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-12-13 23:06:10.000000000 -0800
+--- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-07-04 12:38:37.000000000 -0700
@@ -533,11 +533,11 @@
@@ -12324,7 +12326,7 @@
# CDE private entry point
Java_sun_awt_motif_XsessionWMcommand;
---- ./jdk/make/sun/awt/mawt.gmk 2010-12-09 09:51:27.000000000 -0800
+--- ./jdk/make/sun/awt/mawt.gmk 2010-12-16 14:10:06.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
@@ -12388,7 +12390,7 @@
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
---- ./jdk/make/sun/font/Makefile 2010-12-09 09:51:28.000000000 -0800
+--- ./jdk/make/sun/font/Makefile 2010-12-16 14:10:07.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.
@@ -12414,7 +12416,7 @@
endif # PLATFORM
---- ./jdk/make/sun/image/generic/Makefile 2010-12-09 09:51:28.000000000 -0800
+--- ./jdk/make/sun/image/generic/Makefile 2010-12-16 14:10:08.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
@@ -12424,7 +12426,7 @@
+ OTHER_LDLIBS = $(LIBM) $(LIBDL)
endif
---- ./jdk/make/sun/image/vis/Makefile 2010-12-09 09:51:28.000000000 -0800
+--- ./jdk/make/sun/image/vis/Makefile 2010-12-16 14:10:08.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
@@ -12433,7 +12435,7 @@
-OTHER_LDLIBS = $(LIBM) -ldl
+OTHER_LDLIBS = $(LIBM) $(LIBDL)
---- ./jdk/make/sun/jawt/Makefile 2010-12-09 09:51:29.000000000 -0800
+--- ./jdk/make/sun/jawt/Makefile 2010-12-16 14:10:10.000000000 -0800
+++ ./jdk/make/sun/jawt/Makefile 2010-06-15 22:06:20.000000000 -0700
@@ -93,8 +93,7 @@
#
@@ -12462,7 +12464,7 @@
OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
endif # PLATFORM
---- ./jdk/make/sun/jdga/Makefile 2010-12-09 09:51:29.000000000 -0800
+--- ./jdk/make/sun/jdga/Makefile 2010-12-16 14:10:11.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)
@@ -12473,7 +12475,7 @@
CPPFLAGS += \
-I$(SHARE_SRC)/javavm/export \
---- ./jdk/make/sun/security/ec/Makefile 2010-12-09 09:51:31.000000000 -0800
+--- ./jdk/make/sun/security/ec/Makefile 2010-12-16 14:10:12.000000000 -0800
+++ ./jdk/make/sun/security/ec/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -193,7 +193,7 @@
ifeq ($(PLATFORM), windows)
@@ -12484,7 +12486,7 @@
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-12-09 09:51:31.000000000 -0800
+--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-12-16 14:10:13.000000000 -0800
+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -72,6 +72,6 @@
#
@@ -12495,7 +12497,7 @@
+ifeq ($(PLATFORM), windows)
+OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
endif
---- ./jdk/make/sun/security/krb5/Makefile 2010-12-09 09:51:31.000000000 -0800
+--- ./jdk/make/sun/security/krb5/Makefile 2010-12-16 14:10:13.000000000 -0800
+++ ./jdk/make/sun/security/krb5/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -76,7 +76,7 @@
ifeq ($(PLATFORM), windows)
@@ -12506,7 +12508,7 @@
endif
build:
---- ./jdk/make/sun/security/pkcs11/Makefile 2010-12-09 09:51:31.000000000 -0800
+--- ./jdk/make/sun/security/pkcs11/Makefile 2010-12-16 14:10:13.000000000 -0800
+++ ./jdk/make/sun/security/pkcs11/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -157,10 +157,10 @@
#
@@ -12521,7 +12523,7 @@
endif
# Other config files
---- ./jdk/make/sun/security/smartcardio/Makefile 2010-12-09 09:51:31.000000000 -0800
+--- ./jdk/make/sun/security/smartcardio/Makefile 2010-12-16 14:10:13.000000000 -0800
+++ ./jdk/make/sun/security/smartcardio/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -76,6 +76,6 @@
ifeq ($(PLATFORM), windows)
@@ -12531,7 +12533,7 @@
+ OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
OTHER_CFLAGS = -D__sun_jdk
endif
---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-12-09 09:51:31.000000000 -0800
+--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-12-16 14:10:14.000000000 -0800
+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-06-15 22:06:21.000000000 -0700
@@ -49,18 +49,6 @@
dgif_lib.c \
@@ -12571,7 +12573,7 @@
+ zcrc32.c \
+ zutil.c
+endif
---- ./jdk/make/sun/splashscreen/Makefile 2010-12-09 09:51:31.000000000 -0800
+--- ./jdk/make/sun/splashscreen/Makefile 2010-12-16 14:10:14.000000000 -0800
+++ ./jdk/make/sun/splashscreen/Makefile 2010-06-15 22:06:21.000000000 -0700
@@ -64,8 +64,24 @@
@@ -12623,7 +12625,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-12-09 09:51:32.000000000 -0800
+--- ./jdk/make/sun/tracing/dtrace/Makefile 2010-12-16 14:10:14.000000000 -0800
+++ ./jdk/make/sun/tracing/dtrace/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -56,7 +56,7 @@
FILES_export = $(FILES_java)
@@ -12634,7 +12636,7 @@
endif
#
---- ./jdk/make/sun/xawt/Makefile 2010-12-09 09:51:32.000000000 -0800
+--- ./jdk/make/sun/xawt/Makefile 2010-12-16 14:10:14.000000000 -0800
+++ ./jdk/make/sun/xawt/Makefile 2010-07-10 13:26:05.000000000 -0700
@@ -48,6 +48,9 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -12704,7 +12706,7 @@
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
---- ./jdk/make/tools/freetypecheck/Makefile 2010-12-09 09:51:40.000000000 -0800
+--- ./jdk/make/tools/freetypecheck/Makefile 2010-12-16 14:10:20.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
@@ -12723,7 +12725,7 @@
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
---- ./jdk/make/tools/reorder/Makefile 2010-12-09 09:51:40.000000000 -0800
+--- ./jdk/make/tools/reorder/Makefile 2010-12-16 14:10:20.000000000 -0800
+++ ./jdk/make/tools/reorder/Makefile 2010-08-06 21:58:27.000000000 -0700
@@ -187,11 +187,11 @@
@@ -13142,7 +13144,7 @@
+¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢UNIX ¤Î
+.BI ps
+¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢¹¶·â¼Ô¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
---- ./jdk/src/share/back/commonRef.c 2010-12-09 09:51:54.000000000 -0800
+--- ./jdk/src/share/back/commonRef.c 2010-12-16 14:10:32.000000000 -0800
+++ ./jdk/src/share/back/commonRef.c 2010-06-15 22:06:23.000000000 -0700
@@ -23,6 +23,10 @@
* questions.
@@ -13155,7 +13157,7 @@
#include "util.h"
#include "commonRef.h"
---- ./jdk/src/share/bin/java.c 2010-12-09 09:51:55.000000000 -0800
+--- ./jdk/src/share/bin/java.c 2010-12-16 14:10:33.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*/
@@ -13256,7 +13258,7 @@
static void
DumpState()
{
---- ./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-12-16 14:10:42.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[] {
@@ -13269,7 +13271,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-12-09 09:52:18.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-12-16 14:10:56.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-06-15 22:06:27.000000000 -0700
@@ -78,6 +78,9 @@
*/
@@ -13281,7 +13283,7 @@
/**
---- ./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 2010-12-18 00:00:03.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
@@ -13290,7 +13292,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-12-13 23:06:10.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13486,7 +13488,7 @@
- }
-
-}
---- ./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-12-16 14:11:29.000000000 -0800
+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-06-15 22:06:34.000000000 -0700
@@ -172,7 +172,12 @@
} else {
@@ -13502,7 +13504,7 @@
(System.getenv("DISPLAY") == null));
}
} else if (nm.equals("true")) {
---- ./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-12-16 14:12:13.000000000 -0800
+++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-11-13 12:00:16.000000000 -0800
@@ -805,15 +805,13 @@
}
@@ -13521,7 +13523,7 @@
}
return zi;
}
---- ./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-12-16 14:13:07.000000000 -0800
+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-06-15 22:06:56.000000000 -0700
@@ -1122,7 +1122,7 @@
*/
@@ -13541,7 +13543,7 @@
errors++;
}
}
---- ./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-12-16 14:13:07.000000000 -0800
+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-06-15 22:06:56.000000000 -0700
@@ -39,6 +39,7 @@
WINDOWS,
@@ -13566,7 +13568,7 @@
// determine another OS here
}
---- ./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-12-16 14:13:11.000000000 -0800
+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-10-31 14:12:35.000000000 -0700
@@ -46,6 +46,8 @@
@@ -13589,7 +13591,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-12-09 09:55:16.000000000 -0800
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-12-16 14:13:12.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
@@ -13600,7 +13602,7 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./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 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,190 +0,0 @@
-/*
@@ -13793,7 +13795,7 @@
- return charOff - outOff;
- }
-}
---- ./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 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13989,7 +13991,7 @@
- return 2;
- }
-}
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -14362,7 +14364,7 @@
- }
- }
-}
---- ./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-12-16 14:13:36.000000000 -0800
+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-06-15 22:07:04.000000000 -0700
@@ -1534,7 +1534,9 @@
pFlags |= NOSHEET;
@@ -14375,7 +14377,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-12-09 09:56:02.000000000 -0800
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-12-16 14:13:46.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");
@@ -14388,14 +14390,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-12-09 09:56:24.000000000 -0800
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-12-16 14:14:09.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-12-09 09:56:24.000000000 -0800
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-12-16 14:14:09.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 = "";
@@ -14467,7 +14469,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-12-09 09:56:24.000000000 -0800
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-12-16 14:14:09.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
@@ -14478,7 +14480,7 @@
out.added.manifest=\
added manifest
out.update.manifest=\
---- ./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-12-16 14:14:28.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]
@@ -14518,7 +14520,7 @@
# Common -I options
CFLAGS += -I.
CFLAGS += -I../agent_util
---- ./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-12-16 14:14:33.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);
@@ -14805,7 +14807,7 @@
+# Example,
+# ocsp.responderCertSerialNumber=2A:FF:00
+
---- ./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-12-16 14:14:35.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>
@@ -14832,7 +14834,7 @@
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
---- ./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-12-16 14:14:35.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
@@ -14874,7 +14876,7 @@
true));
}
---- ./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-12-16 14:14:35.000000000 -0800
+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-06-15 22:07:17.000000000 -0700
@@ -33,7 +33,11 @@
@@ -14888,7 +14890,7 @@
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
---- ./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-12-16 14:14:35.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;
@@ -14908,7 +14910,7 @@
+#endif
return 0;
}
---- ./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-12-16 14:14:35.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
@@ -14937,7 +14939,7 @@
+
+
#endif // __SOUNDDEFS_INCLUDED__
---- ./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-12-16 14:14:36.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.
@@ -15000,7 +15002,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-12-09 09:57:03.000000000 -0800
+--- ./jdk/src/share/native/java/io/io_util.h 2010-12-16 14:14:36.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;
@@ -15019,7 +15021,7 @@
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
---- ./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-12-16 14:14:36.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.
@@ -15047,7 +15049,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-12-09 09:57:03.000000000 -0800
+--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-12-16 14:14:36.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
@@ -15058,7 +15060,7 @@
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_acosh __j__ieee754_acosh
---- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-12-09 09:57:06.000000000 -0800
+--- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-12-16 14:14:38.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;
@@ -15082,7 +15084,7 @@
}
JNIEXPORT void JNICALL
---- ./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-16 14:14:38.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"
@@ -15095,7 +15097,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-12-09 09:57:07.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-12-16 14:14:39.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>
@@ -15107,7 +15109,7 @@
#include <limits.h>
/* keep these after the other headers */
---- ./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-12-16 14:14:39.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-10-31 14:12:36.000000000 -0700
@@ -24,7 +24,11 @@
*/
@@ -15121,7 +15123,7 @@
#include "sun_awt_image_BufImgSurfaceData.h"
---- ./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-12-16 14:14:39.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-06-15 22:07:18.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
@@ -15135,7 +15137,7 @@
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
---- ./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-12-16 14:14:43.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 */
@@ -15176,7 +15178,7 @@
#endif /* _NO_LONGLONG */
---- ./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-12-16 14:14:43.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)
@@ -15217,7 +15219,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./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-12-16 14:14:43.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)
@@ -15258,7 +15260,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./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-12-16 14:14:43.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)
@@ -15299,7 +15301,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./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-12-16 14:14:43.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)
@@ -15340,7 +15342,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./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-12-16 14:14:43.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)
@@ -15381,7 +15383,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./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-12-16 14:14:43.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)
@@ -15422,7 +15424,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./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-12-16 14:14:43.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];
@@ -15643,7 +15645,7 @@
}
#else /* _LONGLONG */
---- ./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-12-16 14:14:43.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 @@
}
@@ -15925,7 +15927,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./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-12-16 14:14:43.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;
@@ -16078,7 +16080,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-12-09 09:57:19.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-12-16 14:14:43.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 {
@@ -16089,7 +16091,7 @@
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./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-12-16 14:14:44.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++) {
@@ -16189,7 +16191,7 @@
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./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-12-16 14:14:44.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 @@
} \
@@ -17423,7 +17425,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./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-12-16 14:14:44.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
@@ -17442,7 +17444,7 @@
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./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-12-16 14:14:44.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-06-15 22:07:21.000000000 -0700
@@ -26,9 +26,15 @@
@@ -17474,7 +17476,7 @@
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
---- ./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-12-16 14:14:44.000000000 -0800
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-06-15 22:07:21.000000000 -0700
@@ -59,7 +59,10 @@
@@ -17488,7 +17490,7 @@
#include <stdint.h> /* for uintptr_t */
#include <malloc.h> /* for ptrdiff_t */
#else
---- ./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-12-16 14:14:44.000000000 -0800
+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-06-15 22:07:21.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
@@ -17502,7 +17504,7 @@
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
---- ./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-12-16 14:14:44.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"
@@ -17516,7 +17518,7 @@
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
---- ./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-12-16 14:14:47.000000000 -0800
+++ ./jdk/src/share/native/sun/font/sunFont.c 2010-06-15 22:07:22.000000000 -0700
@@ -24,7 +24,9 @@
*/
@@ -17528,7 +17530,7 @@
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
---- ./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-12-16 14:14:48.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"
@@ -17542,7 +17544,7 @@
#include "string.h"
/**
---- ./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-12-16 14:14:50.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
@@ -17554,7 +17556,7 @@
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
---- ./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-12-16 14:14:51.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-06-15 22:07:23.000000000 -0700
@@ -25,7 +25,11 @@
@@ -17568,7 +17570,7 @@
#include "sun_java2d_pipe_BufferedOpCodes.h"
---- ./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-12-16 14:14:51.000000000 -0800
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-06-15 22:07:23.000000000 -0700
@@ -25,7 +25,11 @@
@@ -17582,7 +17584,7 @@
#include <math.h>
#include <jlong.h>
---- ./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-12-16 14:14:54.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>
@@ -17592,7 +17594,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-12-09 09:57:33.000000000 -0800
+--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-12-16 14:14:55.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;
@@ -17609,7 +17611,7 @@
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
---- ./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-12-16 14:14:55.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>
@@ -17623,7 +17625,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./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-12-16 14:14:57.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>
@@ -17637,7 +17639,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./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-12-16 14:14:57.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>
@@ -17651,7 +17653,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/transport/socket/socketTransport.c 2010-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/share/transport/socket/socketTransport.c 2010-12-16 14:15:04.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
@@ -17740,7 +17742,7 @@
return res;
} else if (res == 0) {
break; /* eof, return nbytes which is less than len */
---- ./jdk/src/solaris/back/exec_md.c 2010-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/solaris/back/exec_md.c 2010-12-16 14:15:04.000000000 -0800
+++ ./jdk/src/solaris/back/exec_md.c 2010-06-15 22:07:27.000000000 -0700
@@ -30,7 +30,7 @@
#include "sys.h"
@@ -17751,7 +17753,7 @@
/* Linux */
#define FORK() fork()
#else
---- ./jdk/src/solaris/back/linker_md.c 2010-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/solaris/back/linker_md.c 2010-12-16 14:15:04.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"
@@ -17778,7 +17780,7 @@
}
}
---- ./jdk/src/solaris/back/util_md.h 2010-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/solaris/back/util_md.h 2010-12-16 14:15:04.000000000 -0800
+++ ./jdk/src/solaris/back/util_md.h 2010-06-15 22:07:27.000000000 -0700
@@ -31,6 +31,11 @@
@@ -17801,7 +17803,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-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/solaris/bin/ergo.c 2010-12-16 14:15:04.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 */
@@ -17845,7 +17847,7 @@
return result;
+#endif /* _ALLBSD_SOURCE */
}
---- ./jdk/src/solaris/bin/ergo.h 2010-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/solaris/bin/ergo.h 2010-12-16 14:15:04.000000000 -0800
+++ ./jdk/src/solaris/bin/ergo.h 2010-06-15 22:07:27.000000000 -0700
@@ -33,6 +33,10 @@
#include <sys/stat.h>
@@ -17858,7 +17860,7 @@
#include "java.h"
---- ./jdk/src/solaris/bin/ergo_i586.c 2010-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/solaris/bin/ergo_i586.c 2010-12-16 14:15:04.000000000 -0800
+++ ./jdk/src/solaris/bin/ergo_i586.c 2010-06-15 22:07:27.000000000 -0700
@@ -106,7 +106,7 @@
@@ -17940,7 +17942,7 @@
JLI_TraceLauncher("physical processors: %lu\n", result);
return result;
}
---- ./jdk/src/solaris/bin/java_md.c 2010-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/solaris/bin/java_md.c 2010-12-16 14:15:04.000000000 -0800
+++ ./jdk/src/solaris/bin/java_md.c 2010-11-13 12:00:17.000000000 -0800
@@ -24,6 +24,7 @@
*/
@@ -18050,7 +18052,7 @@
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./jdk/src/solaris/bin/java_md.h 2010-12-09 09:57:38.000000000 -0800
+--- ./jdk/src/solaris/bin/java_md.h 2010-12-16 14:15:04.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>
@@ -18068,7 +18070,7 @@
/*
* Function prototypes.
---- ./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-12-16 14:15:07.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,
@@ -18118,7 +18120,7 @@
} else if (doIsIceWM && isIceWM()) {
awt_wmgr = XWM.ICE_WM;
}
---- ./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-12-16 14:15:08.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) {
@@ -18147,7 +18149,7 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./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 2010-12-18 00:00:04.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 @@
-#
@@ -18527,7 +18529,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-12-13 23:06:10.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-12-18 00:00:04.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 @@
-#
@@ -18684,7 +18686,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-12-13 23:06:10.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-12-18 00:00:04.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 @@
-#
@@ -19035,7 +19037,7 @@
-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-12-13 23:06:10.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,90 +0,0 @@
-/*
@@ -19128,7 +19130,7 @@
- return new UnixAsynchronousSocketChannelImpl(toPort(group));
- }
-}
---- ./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 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,288 +0,0 @@
-/*
@@ -19419,7 +19421,7 @@
- }
- }
-}
---- ./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-12-18 00:00:04.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
@@ -19499,7 +19501,7 @@
return super.supportsFileAttributeView(name);
}
}
---- ./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-12-18 00:00:04.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.*;
@@ -19633,7 +19635,7 @@
@Override
FileStore getFileStore(UnixPath path) throws IOException {
return new BsdFileStore(path);
---- ./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-12-18 00:00:04.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() { }
@@ -19738,7 +19740,7 @@
+ initIDs();
}
}
---- ./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 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,350 +0,0 @@
-/*
@@ -20091,7 +20093,7 @@
- }
- }
-}
---- ./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 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,466 +0,0 @@
-/*
@@ -20560,7 +20562,7 @@
- init();
- }
-}
---- ./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-12-16 14:15:11.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");
@@ -20571,7 +20573,7 @@
throw new AssertionError("Platform not recognized");
}
}
---- ./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-12-16 14:15:12.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-06-15 22:07:32.000000000 -0700
@@ -119,7 +119,11 @@
}
@@ -20606,7 +20608,7 @@
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
---- ./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-12-18 00:00:04.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
@@ -20705,7 +20707,7 @@
- isBsdThreads = isBsdThreads();
}
}
---- ./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-12-16 14:15:12.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>
@@ -20772,7 +20774,7 @@
}
}
---- ./jdk/src/solaris/hpi/include/interrupt.h 2010-12-09 09:57:52.000000000 -0800
+--- ./jdk/src/solaris/hpi/include/interrupt.h 2010-12-16 14:15:14.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
@@ -20794,7 +20796,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-12-09 09:57:52.000000000 -0800
+--- ./jdk/src/solaris/hpi/include/largefile.h 2010-12-16 14:15:14.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"
@@ -20807,7 +20809,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-12-13 23:06:10.000000000 -0800
+--- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-12-18 00:00:04.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_
@@ -20843,7 +20845,7 @@
+#define pwrite64 pwrite
+
#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */
---- ./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-12-16 14:15:14.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
@@ -20891,7 +20893,7 @@
#ifdef __linux__
extern thread_key_t intrJmpbufkey;
---- ./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-12-16 14:15:14.000000000 -0800
+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-06-15 22:07:33.000000000 -0700
@@ -58,7 +58,7 @@
{
@@ -20902,7 +20904,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-12-09 09:57:52.000000000 -0800
+--- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-12-16 14:15:14.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;
@@ -20913,7 +20915,7 @@
if (mid->monitor_owner == self) {
mid->entry_count++;
return SYS_OK;
---- ./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-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-10-31 13:48:56.000000000 -0700
@@ -1,5 +1,5 @@
/*
@@ -21607,7 +21609,7 @@
+ pthread_attr_destroy(&attr);
+#endif
}
---- ./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-12-16 14:15:15.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.
@@ -21690,7 +21692,7 @@
info.isMP = (cpus < 0) ? 1 : (cpus > 1);
info.name = "native threads";
---- ./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-12-16 14:15:15.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"
@@ -21758,7 +21760,7 @@
#endif
/*
* This is a bit of bulletproofing to catch the commonly occurring
---- ./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-12-16 14:15:15.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>
@@ -21849,7 +21851,7 @@
ret = committedAddr;
#else
ret = requestedAddr;
---- ./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-12-16 14:15:15.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>
@@ -21904,7 +21906,7 @@
fd = open64_w(path, oflag, mode);
if (delete != 0) {
unlink(path);
---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-12-09 09:57:53.000000000 -0800
+--- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-12-16 14:15:15.000000000 -0800
+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-06-15 22:07:34.000000000 -0700
@@ -28,7 +28,10 @@
#include <string.h>
@@ -21935,7 +21937,7 @@
/* Open conversion descriptors */
iconvToPlatform = iconv_open(codeset, "UTF-8");
---- ./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-12-16 14:15:15.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"}
@@ -21961,7 +21963,7 @@
/* Signals */
---- ./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-16 14:15:15.000000000 -0800
+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-12-13 00:54:13.000000000 -0800
@@ -32,10 +32,16 @@
@@ -22125,7 +22127,7 @@
}
JNIEXPORT jlong JNICALL
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -22308,7 +22310,7 @@
-
-
-/* end */
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -22393,7 +22395,7 @@
-
-
-#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -22718,7 +22720,7 @@
-}
-
-#endif /* USE_PLATFORM_MIDI_IN */
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -22900,7 +22902,7 @@
-
-
-#endif /* USE_PLATFORM_MIDI_OUT */
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -23383,7 +23385,7 @@
-
-
-/* end */
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -23471,7 +23473,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-12-13 23:06:11.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-12-18 00:00:04.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 @@
-/*
@@ -24412,7 +24414,7 @@
-
-
-#endif // USE_DAUDIO
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -24706,7 +24708,7 @@
-
-
-/* end */
---- ./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 2010-12-18 00:00:04.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 @@
-/*
@@ -24781,7 +24783,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-12-13 23:06:11.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-12-18 00:00:04.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 @@
-/*
@@ -25507,7 +25509,7 @@
-
-
-#endif // USE_PORTS
---- ./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-12-16 14:15:16.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"
@@ -25530,7 +25532,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-12-09 09:57:55.000000000 -0800
+--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-12-16 14:15:16.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>
@@ -25542,7 +25544,7 @@
/* Note: The comments in this file use the terminology
---- ./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-12-16 14:15:16.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) {
@@ -25553,7 +25555,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-12-09 09:57:55.000000000 -0800
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-12-16 14:15:16.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"
@@ -25595,7 +25597,7 @@
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
---- ./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-12-16 14:15:16.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>
@@ -25699,7 +25701,7 @@
if (envp == NULL || (char **) envp == environ) {
execvp(file, (char **) argv);
return;
---- ./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-16 14:15:16.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.
@@ -25773,7 +25775,7 @@
return &sprops;
}
---- ./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-12-16 14:15:16.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>
@@ -26125,7 +26127,7 @@
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
---- ./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-12-16 14:15:16.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>
@@ -26167,7 +26169,7 @@
}
return (*env)->NewStringUTF(env, hostname);
}
---- ./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-12-16 14:15:16.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-10-31 13:48:56.000000000 -0700
@@ -26,6 +26,9 @@
@@ -26526,7 +26528,7 @@
+}
+
+#endif
---- ./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-12-16 14:15:16.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-10-31 14:12:37.000000000 -0700
@@ -23,12 +23,12 @@
* questions.
@@ -26634,7 +26636,7 @@
}
}
}
---- ./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-12-16 14:15:16.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) {
@@ -26657,7 +26659,7 @@
int port;
jobject iaObj;
jclass iaCntrClass;
---- ./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-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-07-04 12:40:44.000000000 -0700
@@ -57,7 +57,7 @@
/*
@@ -26694,7 +26696,7 @@
}
int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
---- ./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-16 14:15:16.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>
@@ -26906,7 +26908,7 @@
len = sizeof(arg);
if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg,
---- ./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-12-16 14:15:16.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
@@ -26917,7 +26919,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-12-09 09:57:55.000000000 -0800
+--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-12-16 14:15:16.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;
@@ -26956,7 +26958,7 @@
if (rc < 0) {
close(fd);
---- ./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-12-16 14:15:16.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>
@@ -27094,7 +27096,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-12-09 09:57:55.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-12-16 14:15:16.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-06-15 22:07:35.000000000 -0700
@@ -25,6 +25,7 @@
@@ -27118,7 +27120,7 @@
if (handle == NULL) {
return JNI_FALSE;
}
---- ./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-12-16 14:15:16.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-06-15 22:07:35.000000000 -0700
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -27132,7 +27134,7 @@
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
---- ./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-12-16 14:15:16.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>
@@ -27144,7 +27146,7 @@
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
---- ./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-12-16 14:15:16.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>
@@ -27158,7 +27160,7 @@
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
---- ./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-12-16 14:15:17.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) {
@@ -27169,7 +27171,7 @@
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./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-12-16 14:15:17.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>
@@ -27298,7 +27300,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-12-09 09:57:56.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-12-16 14:15:17.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-10-31 14:18:11.000000000 -0700
@@ -67,7 +67,7 @@
XIMPreeditDrawCallbackStruct *);
@@ -27539,7 +27541,7 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./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-12-16 14:15:17.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);
@@ -27553,7 +27555,7 @@
JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
"(Ljava/lang/String;)V",
---- ./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-16 14:15:17.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;
@@ -27575,7 +27577,7 @@
statusWindowEventHandler(xev);
#endif
xembed_eventHandler(&xev);
---- ./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-12-16 14:15:17.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>
@@ -27599,7 +27601,7 @@
}
if (handle == NULL) {
---- ./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-12-16 14:15:17.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"
@@ -27610,7 +27612,7 @@
#include <sys/socket.h>
#endif
---- ./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-12-16 14:15:17.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__
@@ -27634,7 +27636,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-12-09 09:57:57.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-12-16 14:15:17.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;
@@ -27733,7 +27735,7 @@
awt_wmgr = OPENLOOK_WM;
}
else {
---- ./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-12-16 14:15:17.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,
@@ -27747,7 +27749,7 @@
};
extern void awt_wm_init(void);
---- ./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-12-16 14:15:17.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-06-15 22:07:36.000000000 -0700
@@ -58,7 +58,7 @@
*/
@@ -27764,7 +27766,7 @@
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./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-16 14:15:17.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-12-04 08:27:53.000000000 -0800
@@ -23,7 +23,7 @@
* questions.
@@ -27923,7 +27925,7 @@
if (libfontconfig == NULL) {
return NULL;
}
---- ./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-16 14:15:17.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>
@@ -27979,7 +27981,7 @@
if (setjmp(j) == 0)
{
---- ./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-12-16 14:15:17.000000000 -0800
+++ ./jdk/src/solaris/native/sun/awt/list.c 2010-06-15 22:07:37.000000000 -0700
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -27993,7 +27995,7 @@
#include "list.h"
---- ./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-12-16 14:15:21.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
@@ -28005,7 +28007,7 @@
#include "robot_common.h"
/*
---- ./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-12-16 14:15:21.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.
@@ -28019,7 +28021,7 @@
#include <ctype.h>
#include <sys/utsname.h>
---- ./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-12-16 14:15:21.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"
@@ -28033,7 +28035,7 @@
JNIEXPORT void JNICALL AWTDrawGlyphList
---- ./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-12-16 14:15:22.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>
@@ -28050,7 +28052,7 @@
typedef unsigned char jubyte;
typedef unsigned short jushort;
---- ./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-12-16 14:15:22.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
@@ -28157,7 +28159,7 @@
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
---- ./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-12-16 14:15:23.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;
@@ -28168,7 +28170,7 @@
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- ./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-12-16 14:15:23.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
@@ -28190,7 +28192,7 @@
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
---- ./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-12-16 14:15:23.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"
@@ -28209,7 +28211,7 @@
}
if (lib != NULL) {
---- ./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-12-16 14:15:23.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>
@@ -28233,7 +28235,7 @@
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
---- ./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-12-16 14:15:23.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>
@@ -28246,7 +28248,7 @@
#include "jni.h"
#include "jni_util.h"
#include "sun_management_FileSystemImpl.h"
---- ./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-12-16 14:15:24.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>
@@ -28257,7 +28259,7 @@
#include <string.h>
#endif
---- ./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-12-16 14:15:24.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"
@@ -28285,7 +28287,7 @@
gconf_ver = 2;
}
if (gconf_ver > 0) {
---- ./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-12-16 14:15:24.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>
@@ -28336,7 +28338,7 @@
}
#endif
---- ./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-12-16 14:15:24.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;
@@ -28356,7 +28358,7 @@
m.msg_control = NULL;
m.msg_controllen = 0;
#endif
---- ./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-12-16 14:15:24.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"
@@ -28473,7 +28475,7 @@
+#endif
+#endif
}
---- ./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-12-16 14:15:24.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>
@@ -28513,7 +28515,7 @@
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
---- ./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-12-16 14:15:24.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"
@@ -28526,7 +28528,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-12-09 09:58:11.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-12-16 14:15:24.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-10-31 14:12:37.000000000 -0700
@@ -116,6 +116,47 @@
@@ -28678,7 +28680,7 @@
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
---- ./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-12-16 14:15:24.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-06-15 22:07:38.000000000 -0700
@@ -67,7 +67,7 @@
@@ -28728,7 +28730,7 @@
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./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-12-16 14:15:24.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-06-15 22:07:38.000000000 -0700
@@ -337,11 +337,11 @@
break;
@@ -28744,7 +28746,7 @@
}
addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
---- ./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-12-16 14:15:25.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-10-31 14:12:37.000000000 -0700
@@ -58,6 +58,7 @@
*/
@@ -28762,7 +28764,7 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./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-12-18 00:00:04.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"
@@ -29044,7 +29046,7 @@
+ free(iter);
+ }
}
---- ./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 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,195 +0,0 @@
-/*
@@ -29242,7 +29244,7 @@
-
-
-}
---- ./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-12-16 14:15:25.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-06-15 22:07:39.000000000 -0700
@@ -30,7 +30,9 @@
@@ -29254,7 +29256,7 @@
#ifdef __solaris__
#include <strings.h>
---- ./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-12-16 14:15:25.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>
@@ -29314,7 +29316,7 @@
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
---- ./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-12-16 14:15:25.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);
@@ -29342,7 +29344,7 @@
DEF(ERANGE);
// flags used with openat/unlinkat/etc.
---- ./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-12-16 14:15:25.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>
@@ -29354,7 +29356,7 @@
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
---- ./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-12-16 14:15:25.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>
@@ -29398,7 +29400,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-12-09 09:58:11.000000000 -0800
+--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-12-16 14:15:26.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>
@@ -29410,7 +29412,7 @@
#include <jni.h>
---- ./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-12-16 14:15:26.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>
@@ -29422,7 +29424,7 @@
#include <winscard.h>
---- ./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-12-18 00:00:04.000000000 -0800
+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-10-31 13:48:56.000000000 -0700
@@ -1,12 +1,12 @@
/*
@@ -29757,7 +29759,7 @@
+ JNU_ReleaseStringPlatformChars(env, path, _path);
+ }
+}
---- ./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-16 14:15:26.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},
@@ -29783,7 +29785,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-12-09 09:58:12.000000000 -0800
+--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-12-16 14:15:26.000000000 -0800
+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-10-31 14:12:37.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -29831,7 +29833,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-12-09 09:58:12.000000000 -0800
+--- ./jdk/src/solaris/npt/npt_md.h 2010-12-16 14:15:26.000000000 -0800
+++ ./jdk/src/solaris/npt/npt_md.h 2010-06-15 22:07:39.000000000 -0700
@@ -32,9 +32,10 @@
#include <string.h>
@@ -29855,7 +29857,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-12-09 09:58:12.000000000 -0800
+--- ./jdk/src/solaris/transport/socket/socket_md.c 2010-12-16 14:15:27.000000000 -0800
+++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-06-15 22:07:39.000000000 -0700
@@ -36,7 +36,7 @@
#ifdef __solaris__
@@ -29875,7 +29877,7 @@
int
dbgsysTlsAlloc() {
pthread_key_t key;
---- ./jdk/test/Makefile 2010-12-09 09:58:29.000000000 -0800
+--- ./jdk/test/Makefile 2010-12-16 14:15:43.000000000 -0800
+++ ./jdk/test/Makefile 2010-07-24 14:31:30.000000000 -0700
@@ -79,6 +79,16 @@
endif
@@ -29894,7 +29896,7 @@
ifeq ($(OS_NAME),)
OS_NAME = windows
# GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-12-09 09:58:33.000000000 -0800
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-12-16 14:15:46.000000000 -0800
+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-06-15 22:07:44.000000000 -0700
@@ -56,7 +56,7 @@
@@ -29905,7 +29907,7 @@
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-12-09 09:58:34.000000000 -0800
+--- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-12-16 14:15:46.000000000 -0800
+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-06-15 22:07:44.000000000 -0700
@@ -63,7 +63,7 @@
OS=`uname -s`
@@ -29916,7 +29918,7 @@
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-12-09 09:58:35.000000000 -0800
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-12-16 14:15:47.000000000 -0800
+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-06-15 22:07:45.000000000 -0700
@@ -121,10 +121,14 @@
esac
@@ -29934,7 +29936,7 @@
Windows*)
libloc=${jreloc}/bin
sep=';'
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-12-09 09:58:35.000000000 -0800
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-12-16 14:15:47.000000000 -0800
+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-08-14 11:45:21.000000000 -0700
@@ -292,7 +292,7 @@
psCmd=ps
@@ -29945,7 +29947,7 @@
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-12-09 09:58:35.000000000 -0800
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-12-16 14:15:47.000000000 -0800
+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-06-15 22:07:45.000000000 -0700
@@ -112,7 +112,7 @@
fi
@@ -29956,7 +29958,7 @@
pass "This test always passes on $OS"
;;
---- ./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-12-16 14:15:48.000000000 -0800
+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-06-15 22:07:45.000000000 -0700
@@ -45,10 +45,7 @@
@@ -29970,7 +29972,7 @@
PS=":"
;;
Windows* | CYGWIN*)
---- ./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-12-16 14:15:49.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}'`
@@ -29983,7 +29985,7 @@
* )
runOne GetTotalSwapSpaceSize "sanity-only"
;;
---- ./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-12-16 14:15:49.000000000 -0800
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-06-15 22:07:46.000000000 -0700
@@ -48,7 +48,7 @@
@@ -29994,7 +29996,7 @@
runOne GetMaxFileDescriptorCount
;;
* )
---- ./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-12-16 14:15:49.000000000 -0800
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-06-15 22:07:46.000000000 -0700
@@ -48,7 +48,7 @@
@@ -30005,7 +30007,7 @@
runOne GetOpenFileDescriptorCount
;;
* )
---- ./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-12-16 14:15:52.000000000 -0800
+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-06-15 22:07:47.000000000 -0700
@@ -36,11 +36,7 @@
@@ -30020,7 +30022,7 @@
PS=":"
FS="/"
;;
---- ./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-12-16 14:15:59.000000000 -0800
+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-30 09:28:46.000000000 -0800
@@ -25,10 +25,11 @@
fi
@@ -30038,7 +30040,7 @@
# Windows
if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh 2010-12-09 09:59:12.000000000 -0800
+--- ./jdk/test/java/io/File/GetXSpace.sh 2010-12-16 14:16:13.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
@@ -30049,7 +30051,7 @@
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./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-12-16 14:16:17.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
@@ -30060,7 +30062,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./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-12-16 14:16:19.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
@@ -30071,7 +30073,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./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-12-16 14:16:19.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
@@ -30082,7 +30084,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./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-12-16 14:16:23.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
@@ -30096,7 +30098,7 @@
FS="/"
;;
Windows* | CYGWIN* )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-12-09 09:59:29.000000000 -0800
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-12-16 14:16:25.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
@@ -30107,7 +30109,7 @@
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./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-12-16 14:16:26.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
@@ -30118,7 +30120,7 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-12-09 09:59:32.000000000 -0800
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-12-16 14:16:27.000000000 -0800
+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-06-15 22:07:56.000000000 -0700
@@ -49,7 +49,7 @@
@@ -30129,7 +30131,7 @@
PATHSEP=":"
;;
---- ./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-12-16 14:16:29.000000000 -0800
+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-06-15 22:07:56.000000000 -0700
@@ -35,11 +35,7 @@
@@ -30144,7 +30146,7 @@
PS=":"
FS="/"
;;
---- ./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-12-16 14:16:30.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
@@ -30158,7 +30160,7 @@
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-12-09 09:59:39.000000000 -0800
+--- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-12-16 14:16:32.000000000 -0800
+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-06-15 22:07:58.000000000 -0700
@@ -26,7 +26,7 @@
@@ -30169,7 +30171,7 @@
PS=":"
FS="/"
;;
---- ./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-12-16 14:16:33.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
@@ -30184,7 +30186,7 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-12-09 09:59:43.000000000 -0800
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-12-16 14:16:35.000000000 -0800
+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-06-15 22:07:59.000000000 -0700
@@ -28,7 +28,7 @@
@@ -30195,7 +30197,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh 2010-12-09 09:59:44.000000000 -0800
+--- ./jdk/test/java/net/URL/B5086147.sh 2010-12-16 14:16:36.000000000 -0800
+++ ./jdk/test/java/net/URL/B5086147.sh 2010-06-15 22:07:59.000000000 -0700
@@ -26,7 +26,7 @@
@@ -30206,7 +30208,7 @@
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh 2010-12-09 09:59:45.000000000 -0800
+--- ./jdk/test/java/net/URL/runconstructor.sh 2010-12-16 14:16:37.000000000 -0800
+++ ./jdk/test/java/net/URL/runconstructor.sh 2010-06-15 22:07:59.000000000 -0700
@@ -27,7 +27,7 @@
#
@@ -30217,7 +30219,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-12-09 09:59:45.000000000 -0800
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-12-16 14:16:37.000000000 -0800
+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-06-15 22:07:59.000000000 -0700
@@ -34,11 +34,7 @@
@@ -30232,7 +30234,7 @@
PS=":"
FS="/"
;;
---- ./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-12-16 14:16:37.000000000 -0800
+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-06-15 22:07:59.000000000 -0700
@@ -27,11 +27,7 @@
@@ -30247,7 +30249,7 @@
PS=":"
FS="/"
;;
---- ./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-12-16 14:16:37.000000000 -0800
+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-06-15 22:07:59.000000000 -0700
@@ -33,11 +33,7 @@
@@ -30262,7 +30264,7 @@
PS=":"
FS="/"
;;
---- ./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-12-16 14:16:43.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
@@ -30313,8 +30315,8 @@
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
-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
+Files /tmp/openjdk_srcdir.FX0fSVdL/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-16 14:16:43.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
@@ -30384,7 +30386,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-09 09:59:56.000000000 -0800
+--- ./jdk/test/java/nio/charset/Charset/default.sh 2010-12-16 14:16:43.000000000 -0800
+++ ./jdk/test/java/nio/charset/Charset/default.sh 2010-06-15 22:08:01.000000000 -0700
@@ -41,10 +41,14 @@
fi
@@ -30405,7 +30407,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=$TESTJAVA/bin/java
---- ./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-12-16 14:16:43.000000000 -0800
+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-06-15 22:08:01.000000000 -0700
@@ -34,7 +34,7 @@
@@ -30416,7 +30418,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-09 09:59:56.000000000 -0800
+--- ./jdk/test/java/nio/charset/spi/basic.sh 2010-12-16 14:16:43.000000000 -0800
+++ ./jdk/test/java/nio/charset/spi/basic.sh 2010-06-15 22:08:01.000000000 -0700
@@ -70,10 +70,14 @@
L="$1"
@@ -30446,7 +30448,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-09 09:59:57.000000000 -0800
+--- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-12-16 14:16:44.000000000 -0800
+++ ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-06-15 22:08:01.000000000 -0700
@@ -147,7 +147,8 @@
@@ -30458,7 +30460,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-09 10:00:14.000000000 -0800
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-12-16 14:16:53.000000000 -0800
+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-06-15 22:08:03.000000000 -0700
@@ -84,14 +84,12 @@
@@ -30479,7 +30481,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
export PATH_SEP
mainpid=$$
---- ./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-16 14:16:58.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
@@ -30494,7 +30496,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./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-12-16 14:16:58.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
@@ -30509,7 +30511,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./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-12-16 14:16:59.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
@@ -30524,7 +30526,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./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-12-16 14:16:59.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
@@ -30539,7 +30541,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-12-09 10:00:28.000000000 -0800
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-12-16 14:17:02.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
@@ -30550,7 +30552,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-12-09 10:00:32.000000000 -0800
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-12-16 14:17:05.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
@@ -30561,7 +30563,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-12-09 10:00:34.000000000 -0800
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-12-16 14:17:06.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
@@ -30572,7 +30574,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./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-12-16 14:17:06.000000000 -0800
+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-06-15 22:08:07.000000000 -0700
@@ -75,7 +75,7 @@
SunOS)
@@ -30583,7 +30585,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
DEL=":"
HAS_S=YES
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-12-09 10:00:36.000000000 -0800
+--- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-12-16 14:17:07.000000000 -0800
+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-06-15 22:08:07.000000000 -0700
@@ -42,9 +42,7 @@
@@ -30596,7 +30598,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-12-09 10:00:43.000000000 -0800
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-12-16 14:17:12.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
@@ -30607,7 +30609,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/script/CommonSetup.sh 2010-12-09 10:01:05.000000000 -0800
+--- ./jdk/test/javax/script/CommonSetup.sh 2010-12-16 14:17:23.000000000 -0800
+++ ./jdk/test/javax/script/CommonSetup.sh 2010-06-15 22:08:11.000000000 -0700
@@ -36,11 +36,7 @@
@@ -30622,7 +30624,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./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-12-16 14:17:24.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
@@ -30638,7 +30640,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/jprt.config 2010-12-09 10:01:23.000000000 -0800
+--- ./jdk/test/jprt.config 2010-12-16 14:17:36.000000000 -0800
+++ ./jdk/test/jprt.config 2010-06-15 22:08:14.000000000 -0700
@@ -71,8 +71,8 @@
@@ -30707,7 +30709,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
# Export PATH setting
PATH="${path4sdk}"
---- ./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-12-16 14:17:36.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
@@ -30718,7 +30720,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:17:38.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.
@@ -30796,7 +30798,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
#
---- ./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-12-16 14:17:38.000000000 -0800
+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-06-15 22:08:15.000000000 -0700
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -30807,7 +30809,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./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-12-16 14:17:38.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.
@@ -30826,7 +30828,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
---- ./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-12-16 14:17:38.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.
@@ -30845,7 +30847,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
# Create configuration file and dummy password file
---- ./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-12-16 14:17:38.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.
@@ -30864,8 +30866,8 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/java/nio/channels/spi/Select
# Create management and SSL configuration files
-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
+Files /tmp/openjdk_srcdir.FX0fSVdL/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-16 14:17:40.000000000 -0800
+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-06-15 22:08:15.000000000 -0700
@@ -36,11 +36,7 @@
@@ -30880,7 +30882,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-12-09 10:01:29.000000000 -0800
+--- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-12-16 14:17:41.000000000 -0800
+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-06-15 22:08:15.000000000 -0700
@@ -28,7 +28,7 @@
@@ -30891,7 +30893,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./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-12-16 14:17:41.000000000 -0800
+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-06-15 22:08:15.000000000 -0700
@@ -28,7 +28,7 @@
@@ -30902,7 +30904,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./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-12-16 14:17:43.000000000 -0800
+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-06-15 22:08:16.000000000 -0700
@@ -31,11 +31,7 @@
@@ -30917,7 +30919,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./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-12-16 14:17:43.000000000 -0800
+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-06-15 22:08:16.000000000 -0700
@@ -31,11 +31,7 @@
@@ -30932,7 +30934,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-12-13 23:06:11.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,79 +0,0 @@
-/*
@@ -31014,7 +31016,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-13 23:06:11.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-12-18 00:00:04.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,70 +0,0 @@
-/*
@@ -31087,7 +31089,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
- }
- }
-}
---- ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-12-09 10:01:48.000000000 -0800
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-12-16 14:17:52.000000000 -0800
+++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-06-15 22:08:18.000000000 -0700
@@ -58,6 +58,11 @@
FILESEP="/"
@@ -31101,7 +31103,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
CYGWIN* )
PATHSEP=";"
FILESEP="/"
---- ./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-12-16 14:17:53.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-06-15 22:08:18.000000000 -0700
@@ -131,6 +131,27 @@
;;
@@ -31131,7 +31133,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./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-12-16 14:17:53.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-06-15 22:08:19.000000000 -0700
@@ -92,6 +92,27 @@
;;
@@ -31161,7 +31163,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./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-12-16 14:17:54.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-06-15 22:08:19.000000000 -0700
@@ -50,13 +50,7 @@
@@ -31178,7 +31180,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./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-12-16 14:17:54.000000000 -0800
+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-06-15 22:08:19.000000000 -0700
@@ -51,13 +51,7 @@
@@ -31195,22 +31197,22 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-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
+Files /tmp/openjdk_srcdir.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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.FX0fSVdL/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-16 14:17:58.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
@@ -31225,7 +31227,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./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-12-16 14:17:58.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
@@ -31240,7 +31242,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-09 10:02:01.000000000 -0800
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-12-16 14:18:05.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 @@
@@ -31251,7 +31253,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FILESEP="/"
PATHSEP=":"
;;
---- ./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-12-16 14:18:08.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`
@@ -31262,7 +31264,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./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-12-16 14:18:08.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`
@@ -31273,7 +31275,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./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-12-16 14:18:09.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
@@ -31284,7 +31286,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:09.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
@@ -31295,7 +31297,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:09.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
@@ -31306,7 +31308,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:10.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
@@ -31317,7 +31319,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:10.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
@@ -31328,7 +31330,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:10.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
@@ -31343,7 +31345,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./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-12-16 14:18:10.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
@@ -31354,7 +31356,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:10.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
@@ -31365,7 +31367,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:10.000000000 -0800
+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-06-15 22:08:21.000000000 -0700
@@ -72,6 +72,27 @@
;;
@@ -31395,7 +31397,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-09 10:02:06.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-12-16 14:18:11.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
@@ -31406,7 +31408,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:11.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
@@ -31417,7 +31419,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./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-12-16 14:18:11.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
@@ -31428,7 +31430,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
FS="/"
TMP=/tmp
---- ./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-12-16 14:18:11.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
@@ -31439,7 +31441,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_* )
---- ./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-12-16 14:18:11.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
@@ -31450,7 +31452,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:11.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
@@ -31461,7 +31463,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:11.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
@@ -31472,7 +31474,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:11.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
@@ -31483,7 +31485,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:11.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
@@ -31494,7 +31496,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:11.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
@@ -31505,7 +31507,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./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-12-16 14:18:11.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
@@ -31516,7 +31518,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-12-09 10:02:08.000000000 -0800
+--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-12-16 14:18:13.000000000 -0800
+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-06-15 22:08:22.000000000 -0700
@@ -53,7 +53,7 @@
@@ -31527,7 +31529,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-12-09 10:02:08.000000000 -0800
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-12-16 14:18:13.000000000 -0800
+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-06-15 22:08:22.000000000 -0700
@@ -54,7 +54,7 @@
@@ -31538,7 +31540,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-12-09 10:02:12.000000000 -0800
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-12-16 14:18:15.000000000 -0800
+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-06-15 22:08:23.000000000 -0700
@@ -33,7 +33,7 @@
@@ -31549,7 +31551,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
esac
N2A=$TESTJAVA/bin/native2ascii
---- ./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-12-16 14:18:15.000000000 -0800
+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-06-15 22:08:23.000000000 -0700
@@ -56,7 +56,7 @@
@@ -31560,18 +31562,18 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./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
+--- ./langtools/.hgtags 2010-12-16 14:20:09.000000000 -0800
++++ ./langtools/.hgtags 2010-12-17 23:33:13.000000000 -0800
+@@ -96,3 +96,4 @@
814561077c448292f78de461b6de5d78d57c2089 jdk7-b119
1dd813a529cfa06d850ee7dc42da42efb8f6af0e jdk7-b120
-+1bf969e9792f977a8593496681539840a54fe644 jdk7-b121
---- ./langtools/.jcheck/conf 2010-12-09 10:05:13.000000000 -0800
+ 1bf969e9792f977a8593496681539840a54fe644 jdk7-b121
++11e7b4c0476e4d6085d8d28c4aa2833d46714a2a jdk7-b122
+--- ./langtools/.jcheck/conf 2010-12-16 14:20:09.000000000 -0800
+++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./langtools/test/Makefile 2010-12-09 10:05:32.000000000 -0800
+--- ./langtools/test/Makefile 2010-12-16 14:20:23.000000000 -0800
+++ ./langtools/test/Makefile 2010-06-15 22:08:59.000000000 -0700
@@ -34,6 +34,22 @@
ARCH=i586
@@ -31616,7 +31618,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-09 10:05:40.000000000 -0800
+--- ./langtools/test/jprt.config 2010-12-16 14:20:32.000000000 -0800
+++ ./langtools/test/jprt.config 2010-06-15 22:09:02.000000000 -0700
@@ -71,8 +71,8 @@
@@ -31685,7 +31687,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Export PATH setting
PATH="${path4sdk}"
---- ./langtools/test/tools/javac/4846262/Test.sh 2010-12-09 10:05:43.000000000 -0800
+--- ./langtools/test/tools/javac/4846262/Test.sh 2010-12-16 14:20:34.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
@@ -31696,7 +31698,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-12-09 10:05:43.000000000 -0800
+--- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-12-16 14:20:35.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
@@ -31707,7 +31709,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-12-09 10:05:47.000000000 -0800
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-12-16 14:20:39.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
@@ -31718,7 +31720,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-12-09 10:05:50.000000000 -0800
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-12-16 14:20:42.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
@@ -31729,7 +31731,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/MissingInclude.sh 2010-12-09 10:05:52.000000000 -0800
+--- ./langtools/test/tools/javac/MissingInclude.sh 2010-12-16 14:20:44.000000000 -0800
+++ ./langtools/test/tools/javac/MissingInclude.sh 2010-06-15 22:09:05.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -31740,7 +31742,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-12-09 10:05:53.000000000 -0800
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-12-16 14:20:45.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
@@ -31751,7 +31753,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-12-09 10:05:55.000000000 -0800
+--- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-12-16 14:20:47.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
@@ -31762,7 +31764,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/apt.sh 2010-12-09 10:06:02.000000000 -0800
+--- ./langtools/test/tools/javac/apt.sh 2010-12-16 14:20:54.000000000 -0800
+++ ./langtools/test/tools/javac/apt.sh 2010-06-15 22:09:06.000000000 -0700
@@ -38,7 +38,7 @@
# set platform-dependent variables
@@ -31773,7 +31775,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-12-09 10:06:03.000000000 -0800
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-12-16 14:20:55.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
@@ -31784,7 +31786,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-12-09 10:06:12.000000000 -0800
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-12-16 14:21:06.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
@@ -31795,7 +31797,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-12-09 10:06:21.000000000 -0800
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-12-16 14:21: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
@@ -31806,7 +31808,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh 2010-12-09 10:06:21.000000000 -0800
+--- ./langtools/test/tools/javac/javazip/Test.sh 2010-12-16 14:21: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
@@ -31817,7 +31819,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
SCR=`pwd`
;;
---- ./langtools/test/tools/javac/links/links.sh 2010-12-09 10:06:22.000000000 -0800
+--- ./langtools/test/tools/javac/links/links.sh 2010-12-16 14:21:21.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
@@ -31828,7 +31830,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-12-09 10:06:24.000000000 -0800
+--- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-12-16 14:21: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
@@ -31839,7 +31841,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-12-09 10:06:27.000000000 -0800
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-12-16 14:21:28.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
@@ -31850,7 +31852,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-12-09 10:06:28.000000000 -0800
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-12-16 14:21:29.000000000 -0800
+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-06-15 22:09:11.000000000 -0700
@@ -66,6 +66,17 @@
exit 0;
@@ -31870,7 +31872,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/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-12-09 10:06:31.000000000 -0800
+--- ./langtools/test/tools/javah/6257087/foo.sh 2010-12-16 14:21:33.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
@@ -31881,7 +31883,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-12-09 10:06:31.000000000 -0800
+--- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-12-16 14:21:33.000000000 -0800
+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2010-06-15 22:09:12.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -31892,7 +31894,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-12-09 10:06:31.000000000 -0800
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-12-16 14:21:33.000000000 -0800
+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-06-15 22:09:12.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -31903,7 +31905,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ReadOldClass.sh 2010-12-09 10:06:31.000000000 -0800
+--- ./langtools/test/tools/javah/ReadOldClass.sh 2010-12-16 14:21:33.000000000 -0800
+++ ./langtools/test/tools/javah/ReadOldClass.sh 2010-06-15 22:09:12.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -31914,7 +31916,7 @@ Files /tmp/openjdk_srcdir.R1pP9H0h/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javap/pathsep.sh 2010-12-09 10:06:32.000000000 -0800
+--- ./langtools/test/tools/javap/pathsep.sh 2010-12-16 14:21:34.000000000 -0800
+++ ./langtools/test/tools/javap/pathsep.sh 2010-06-15 22:09:12.000000000 -0700
@@ -40,7 +40,7 @@
# set platform-dependent variables
generated by cgit (git 2.34.1) at 2024-11-30 06:20:37 +0800