aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2010-01-24 19:29:43 +0000
committerGreg Lewis <glewis@FreeBSD.org>2010-01-24 19:29:43 +0000
commit980bcfd3ed7b6d68f385efc491e81e3ee8cdb131 (patch)
tree6d6aa67378f1c8214d4b3ab8575b63bc50adbe3d /java
parente6e531aa36acbc0be1ea722a24c9b268cd347d13 (diff)
downloadports-980bcfd3ed7b6d68f385efc491e81e3ee8cdb131.tar.gz
ports-980bcfd3ed7b6d68f385efc491e81e3ee8cdb131.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/openjdk7/Makefile4
-rw-r--r--java/openjdk7/distinfo6
-rw-r--r--java/openjdk7/files/patch-nmethod.cpp11
-rw-r--r--java/openjdk7/files/patch-nmethod.hpp11
-rw-r--r--java/openjdk7/files/patch-set2722
5 files changed, 980 insertions, 1774 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 2f58bc89cd47..e412e368e83f 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -23,8 +23,8 @@ USE_ZIP= YES
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 0
-JDK_BUILD_NUMBER= 79
-JDK_BUILD_DATE= 14_jan_2010
+JDK_BUILD_NUMBER= 80
+JDK_BUILD_DATE= 21_jan_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 391358eb9f05..d144c31d65b1 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,6 +1,6 @@
-MD5 (openjdk-7-ea-src-b79-14_jan_2010.zip) = 17702f4d38c2dd73da4158f8c460a54e
-SHA256 (openjdk-7-ea-src-b79-14_jan_2010.zip) = 60e6bcdd1c7d4289476b3b984ac431687f47f60222aca7638b1145f3977d56f7
-SIZE (openjdk-7-ea-src-b79-14_jan_2010.zip) = 94539151
+MD5 (openjdk-7-ea-src-b80-21_jan_2010.zip) = fbc5463dc28107c7d8fc5a704bf7a9e5
+SHA256 (openjdk-7-ea-src-b80-21_jan_2010.zip) = fd3b5797d998dde1390f64bbfce16999d001456e4ca1a2fbb535d57dab8772ce
+SIZE (openjdk-7-ea-src-b80-21_jan_2010.zip) = 94605161
MD5 (apache-ant-1.7.1-bin.zip) = f64c979dd593324fd1e58eea4d991522
SHA256 (apache-ant-1.7.1-bin.zip) = 879a6ae22ae022a944a43f6dea21acfdec0acb30175e743664536f89626c0281
SIZE (apache-ant-1.7.1-bin.zip) = 11657986
diff --git a/java/openjdk7/files/patch-nmethod.cpp b/java/openjdk7/files/patch-nmethod.cpp
deleted file mode 100644
index 37f122675a86..000000000000
--- a/java/openjdk7/files/patch-nmethod.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- hotspot/src/share/vm/code/nmethod.cpp Tue Jan 05 11:16:09 2010 -0800
-+++ hotspot/src/share/vm/code/nmethod.cpp Tue Jan 05 16:12:26 2010 -0800
-@@ -1170,7 +1170,7 @@ void nmethod::log_state_change() const {
- }
-
- // Common functionality for both make_not_entrant and make_zombie
--bool nmethod::make_not_entrant_or_zombie(int state) {
-+bool nmethod::make_not_entrant_or_zombie(unsigned int state) {
- assert(state == zombie || state == not_entrant, "must be zombie or not_entrant");
-
- // If the method is already zombie there is nothing to do
diff --git a/java/openjdk7/files/patch-nmethod.hpp b/java/openjdk7/files/patch-nmethod.hpp
deleted file mode 100644
index 042184a216a2..000000000000
--- a/java/openjdk7/files/patch-nmethod.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- hotspot/src/share/vm/code/nmethod.hpp Tue Jan 05 11:16:09 2010 -0800
-+++ hotspot/src/share/vm/code/nmethod.hpp Tue Jan 05 16:12:26 2010 -0800
-@@ -255,7 +255,7 @@ class nmethod : public CodeBlob {
- const char* reloc_string_for(u_char* begin, u_char* end);
- // Returns true if this thread changed the state of the nmethod or
- // false if another thread performed the transition.
-- bool make_not_entrant_or_zombie(int state);
-+ bool make_not_entrant_or_zombie(unsigned int state);
- void inc_decompile_count();
-
- // used to check that writes to nmFlags are done consistently.
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
index e9720c87904c..22f2946ec736 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,27 +1,27 @@
---- ./.hgtags 2010-01-14 01:40:52.000000000 -0800
-+++ ./.hgtags 2010-01-16 12:49:59.000000000 -0800
-@@ -53,3 +53,4 @@
- c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
+--- ./.hgtags 2010-01-21 01:41:14.000000000 -0800
++++ ./.hgtags 2010-01-22 21:20:40.000000000 -0800
+@@ -54,3 +54,4 @@
1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
-+20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
---- ./.jcheck/conf 2010-01-14 01:40:52.000000000 -0800
+ 20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
++a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
+--- ./.jcheck/conf 2010-01-21 01:41:14.000000000 -0800
+++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/.hgtags 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/.hgtags 2010-01-16 12:50:04.000000000 -0800
-@@ -53,3 +53,4 @@
- 937144222e2219939101b0129d26a872a7956b13 jdk7-b76
+--- ./corba/.hgtags 2010-01-21 01:41:23.000000000 -0800
++++ ./corba/.hgtags 2010-01-22 21:21:53.000000000 -0800
+@@ -54,3 +54,4 @@
6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
-+ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79
---- ./corba/.jcheck/conf 2010-01-14 01:41:00.000000000 -0800
+ ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79
++0336e70ca0aeabc783cc01658f36cb6e27ea7934 jdk7-b80
+--- ./corba/.jcheck/conf 2010-01-21 01:41:23.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-01-17 13:42:33.000000000 -0800
-+++ ./corba/make/common/Defs-bsd.gmk 2009-11-14 12:49:01.000000000 -0800
+--- ./corba/make/common/Defs-bsd.gmk 2010-01-22 22:23:38.000000000 -0800
++++ ./corba/make/common/Defs-bsd.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -25,7 +25,7 @@
#
@@ -159,8 +159,8 @@
override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =
override THREADS_FLAG = native
---- ./corba/make/common/Defs-linux.gmk 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/make/common/Defs-linux.gmk 2009-11-13 00:07:56.000000000 -0800
+--- ./corba/make/common/Defs-linux.gmk 2010-01-21 01:41:24.000000000 -0800
++++ ./corba/make/common/Defs-linux.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -290,7 +290,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
@@ -170,8 +170,8 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./corba/make/common/Defs.gmk 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/make/common/Defs.gmk 2009-10-05 22:35:11.000000000 -0700
+--- ./corba/make/common/Defs.gmk 2010-01-21 01:41:24.000000000 -0800
++++ ./corba/make/common/Defs.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -53,6 +53,28 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -211,8 +211,8 @@
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./corba/make/common/Mapfile-vers.gmk 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/make/common/Mapfile-vers.gmk 2009-06-06 16:47:35.000000000 -0700
+--- ./corba/make/common/Mapfile-vers.gmk 2010-01-21 01:41:24.000000000 -0800
++++ ./corba/make/common/Mapfile-vers.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -77,7 +77,7 @@
endif # PLATFORM
@@ -222,8 +222,8 @@
ifeq ($(VARIANT), OPT)
# OPT build MUST have a mapfile?
---- ./corba/make/common/shared/Compiler-gcc.gmk 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/make/common/shared/Compiler-gcc.gmk 2009-11-13 00:07:56.000000000 -0800
+--- ./corba/make/common/shared/Compiler-gcc.gmk 2010-01-21 01:41:24.000000000 -0800
++++ ./corba/make/common/shared/Compiler-gcc.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -100,6 +100,23 @@
endif
@@ -248,8 +248,8 @@
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./corba/make/common/shared/Compiler.gmk 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/make/common/shared/Compiler.gmk 2009-06-06 16:47:35.000000000 -0700
+--- ./corba/make/common/shared/Compiler.gmk 2010-01-21 01:41:24.000000000 -0800
++++ ./corba/make/common/shared/Compiler.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -42,6 +42,11 @@
override CC_VERSION = gcc
endif
@@ -262,8 +262,8 @@
# Get the compiler specific settings
include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk
---- ./corba/make/common/shared/Defs-bsd.gmk 2010-01-17 13:42:33.000000000 -0800
-+++ ./corba/make/common/shared/Defs-bsd.gmk 2009-06-06 16:47:35.000000000 -0700
+--- ./corba/make/common/shared/Defs-bsd.gmk 2010-01-22 22:23:38.000000000 -0800
++++ ./corba/make/common/shared/Defs-bsd.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -54,7 +54,7 @@
endef
@@ -282,8 +282,8 @@
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
---- ./corba/make/common/shared/Defs-utils.gmk 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/make/common/shared/Defs-utils.gmk 2009-10-05 22:35:11.000000000 -0700
+--- ./corba/make/common/shared/Defs-utils.gmk 2010-01-21 01:41:24.000000000 -0800
++++ ./corba/make/common/shared/Defs-utils.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -53,6 +53,13 @@
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
endif
@@ -331,8 +331,8 @@
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif
---- ./corba/make/common/shared/Platform.gmk 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/make/common/shared/Platform.gmk 2009-12-20 19:49:46.000000000 -0800
+--- ./corba/make/common/shared/Platform.gmk 2010-01-21 01:41:24.000000000 -0800
++++ ./corba/make/common/shared/Platform.gmk 2010-01-22 21:21:53.000000000 -0800
@@ -258,6 +258,101 @@
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
endif
@@ -454,8 +454,8 @@
REQUIRED_ZIP_VER = 2.2
REQUIRED_UNZIP_VER = 5.12
REQUIRED_MAKE_VER = 3.78
---- ./corba/make/sun/corba/core/Makefile 2010-01-14 01:41:00.000000000 -0800
-+++ ./corba/make/sun/corba/core/Makefile 2009-06-06 16:47:35.000000000 -0700
+--- ./corba/make/sun/corba/core/Makefile 2010-01-21 01:41:24.000000000 -0800
++++ ./corba/make/sun/corba/core/Makefile 2010-01-22 21:21:54.000000000 -0800
@@ -53,11 +53,19 @@
ifdef STANDALONE_CORBA_WS
# FIXUP: What is this all about?
@@ -476,8 +476,8 @@
FILES_c = ioser.c
---- ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2010-01-14 01:41:04.000000000 -0800
-+++ ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2009-06-06 16:47:41.000000000 -0700
+--- ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2010-01-21 01:41:27.000000000 -0800
++++ ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2010-01-22 21:21:58.000000000 -0800
@@ -24,6 +24,7 @@
*/
@@ -655,19 +655,19 @@
- return (jlong)fieldID;
+ return (jlong)(intptr_t)fieldID;
}
---- ./hotspot/.hgtags 2010-01-14 01:41:39.000000000 -0800
-+++ ./hotspot/.hgtags 2010-01-16 12:50:20.000000000 -0800
-@@ -53,3 +53,4 @@
- 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
+--- ./hotspot/.hgtags 2010-01-21 01:42:09.000000000 -0800
++++ ./hotspot/.hgtags 2010-01-22 21:28:22.000000000 -0800
+@@ -54,3 +54,4 @@
455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
-+a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
---- ./hotspot/.jcheck/conf 2010-01-14 01:41:39.000000000 -0800
+ a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
++3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80
+--- ./hotspot/.jcheck/conf 2010-01-21 01:42:09.000000000 -0800
+++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./hotspot/agent/make/Makefile 2010-01-14 01:41:39.000000000 -0800
-+++ ./hotspot/agent/make/Makefile 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/make/Makefile 2010-01-21 01:42:09.000000000 -0800
++++ ./hotspot/agent/make/Makefile 2010-01-22 21:28:22.000000000 -0800
@@ -52,6 +52,9 @@
sun.jvm.hotspot.compiler \
sun.jvm.hotspot.debugger \
@@ -697,8 +697,8 @@
sun/jvm/hotspot/debugger/cdbg/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-01-17 13:42:27.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-01-22 22:23:33.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-01-22 21:28:22.000000000 -0800
@@ -22,6 +22,7 @@
*
*/
@@ -838,8 +838,8 @@
#endif /* amd64 */
---- ./hotspot/agent/src/os/bsd/Makefile 2010-01-17 13:42:27.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/Makefile 2009-10-05 21:49:06.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/Makefile 2010-01-22 22:23:33.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/Makefile 2010-01-22 21:28:22.000000000 -0800
@@ -19,10 +19,10 @@
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
@@ -919,7 +919,7 @@
+ -rmdir $(ARCH)
--- ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2009-06-06 16:53:52.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2010-01-22 21:28:22.000000000 -0800
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
@@ -1041,8 +1041,8 @@
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+ return 0;
+}
---- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-01-17 13:42:27.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-01-22 22:23:33.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/elfmacros.h 2010-01-22 21:28:22.000000000 -0800
@@ -25,16 +25,19 @@
#ifndef _ELFMACROS_H_
#define _ELFMACROS_H_
@@ -1079,7 +1079,7 @@
#endif
--- ./hotspot/agent/src/os/bsd/hsearch_r.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2009-06-06 16:53:52.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2010-01-22 21:28:22.000000000 -0800
@@ -0,0 +1,217 @@
+/* Copyright (C) 1993,1995-1997,2002,2005,2007,2008
+ Free Software Foundation, Inc.
@@ -1299,7 +1299,7 @@
+ return 0;
+}
--- ./hotspot/agent/src/os/bsd/hsearch_r.h 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2009-06-06 16:53:52.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2010-01-22 21:28:22.000000000 -0800
@@ -0,0 +1,42 @@
+/* Declarations for System V style searching functions.
+ Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
@@ -1343,8 +1343,8 @@
+extern void hdestroy_r (struct hsearch_data *__htab);
+
+#endif /* _HSEARCH_R_H_ */
---- ./hotspot/agent/src/os/bsd/libproc.h 2010-01-17 13:42:27.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/libproc.h 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc.h 2010-01-22 22:23:33.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/libproc.h 2010-01-22 21:28:22.000000000 -0800
@@ -27,7 +27,8 @@
#include <unistd.h>
@@ -1405,8 +1405,8 @@
// get number of shared objects
int get_num_libs(struct ps_prochandle* ph);
---- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-01-22 22:23:33.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-01-22 21:28:22.000000000 -0800
@@ -178,6 +178,9 @@
if (newlib->symtab == NULL) {
print_debug("symbol table build failed for %s\n", newlib->name);
@@ -1501,8 +1501,8 @@
+ print_debug("ps_pcontinue not implemented\n");
return PS_OK;
}
---- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-01-22 21:28:22.000000000 -0800
@@ -47,7 +47,7 @@
typedef struct thread_info {
lwpid_t lwp_id;
@@ -1532,8 +1532,8 @@
// part of the class sharing workaround
int classes_jsa_fd; // file descriptor of class share archive
uintptr_t dynamic_addr; // address of dynamic section of a.out
---- ./hotspot/agent/src/os/bsd/mapfile 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/mapfile 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/mapfile 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/mapfile 2010-01-22 21:28:22.000000000 -0800
@@ -43,13 +43,17 @@
# proc_service.h functions - to be used by libthread_db
ps_getpid;
@@ -1555,7 +1555,7 @@
# used by attach test program
init_libproc;
---- ./hotspot/agent/src/os/bsd/proc_service.h 2010-01-17 13:42:28.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/proc_service.h 2010-01-22 22:23:34.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,76 +0,0 @@
-/*
@@ -1634,8 +1634,8 @@
-ps_err_e ps_get_thread_area();
-
-#endif /* _PROC_SERVICE_H_ */
---- ./hotspot/agent/src/os/bsd/ps_core.c 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/ps_core.c 2009-10-05 21:49:06.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/ps_core.c 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/ps_core.c 2010-01-22 21:28:22.000000000 -0800
@@ -142,6 +142,7 @@
map->next = ph->core->class_share_maps;
@@ -1933,8 +1933,8 @@
struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
if (ph == NULL) {
---- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2009-10-05 21:49:06.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/ps_proc.c 2010-01-22 21:28:22.000000000 -0800
@@ -22,20 +22,22 @@
*
*/
@@ -2498,8 +2498,8 @@
- }
return ph;
}
---- ./hotspot/agent/src/os/bsd/salibelf.c 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/salibelf.c 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/salibelf.c 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/salibelf.c 2010-01-22 21:28:22.000000000 -0800
@@ -25,6 +25,7 @@
#include "salibelf.h"
#include <stdlib.h>
@@ -2508,8 +2508,8 @@
extern void print_debug(const char*,...);
---- ./hotspot/agent/src/os/bsd/symtab.c 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/symtab.c 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/symtab.c 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/symtab.c 2010-01-22 21:28:22.000000000 -0800
@@ -23,10 +23,10 @@
*/
@@ -2574,8 +2574,8 @@
ELF_SYM *syms;
int j, n, rslt;
size_t size;
---- ./hotspot/agent/src/os/bsd/test.c 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/test.c 2009-06-06 16:53:52.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/test.c 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/os/bsd/test.c 2010-01-22 21:28:22.000000000 -0800
@@ -44,7 +44,7 @@
}
@@ -2585,8 +2585,8 @@
return 1;
}
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-01-14 01:41:39.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2009-06-06 16:53:53.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-01-21 01:42:10.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-01-22 21:28:23.000000000 -0800
@@ -28,6 +28,7 @@
import java.net.*;
import java.rmi.*;
@@ -2656,8 +2656,8 @@
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-01-14 01:41:40.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2009-06-06 16:53:54.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-01-21 01:42:10.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-01-22 21:28:23.000000000 -0800
@@ -29,6 +29,7 @@
import java.rmi.*;
import sun.jvm.hotspot.*;
@@ -2729,8 +2729,8 @@
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2009-06-06 16:53:54.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-01-22 21:28:24.000000000 -0800
@@ -30,10 +30,8 @@
import sun.jvm.hotspot.debugger.cdbg.*;
import sun.jvm.hotspot.debugger.x86.*;
@@ -2756,8 +2756,8 @@
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2009-06-06 16:53:54.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-01-22 21:28:24.000000000 -0800
@@ -26,9 +26,7 @@
import sun.jvm.hotspot.debugger.*;
@@ -2779,7 +2779,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-01-17 13:42:28.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-01-22 22:23:34.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 @@
-/*
@@ -2828,7 +2828,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-01-17 13:42:28.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-01-22 22:23:34.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 @@
-/*
@@ -2912,7 +2912,7 @@
- private Address sp;
- private BsdDebugger dbg;
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-01-17 13:42:28.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-01-22 22:23:34.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 @@
-/*
@@ -2961,8 +2961,8 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-01-14 01:41:42.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2009-09-07 10:57:21.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-01-21 01:42:12.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-01-22 21:28:25.000000000 -0800
@@ -37,6 +37,8 @@
import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess;
@@ -2986,8 +2986,8 @@
}
if (access == null) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2009-06-06 16:53:56.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-01-22 21:28:25.000000000 -0800
@@ -28,37 +28,36 @@
private static String[] signalNames = {
"", /* No signal 0 */
@@ -3048,7 +3048,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-01-17 13:42:28.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-01-22 22:23:34.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 @@
-/*
@@ -3188,7 +3188,7 @@
- return debugger.getThreadForIdentifierAddress(pthreadIdAddr);
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-01-17 13:42:28.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-01-22 22:23:34.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 @@
-/*
@@ -3356,8 +3356,8 @@
-
-
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2009-06-06 16:53:56.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-01-22 21:28:25.000000000 -0800
@@ -28,37 +28,36 @@
private static String[] signalNames = {
"", /* No signal 0 */
@@ -3418,8 +3418,8 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-01-14 01:41:43.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2009-06-06 16:53:57.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-01-21 01:42:13.000000000 -0800
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-01-22 21:28:26.000000000 -0800
@@ -37,6 +37,14 @@
return "solaris";
} else if (os.equals("Linux")) {
@@ -3435,8 +3435,8 @@
} else if (os.startsWith("Windows")) {
return "win32";
} else {
---- ./hotspot/make/Makefile 2010-01-14 01:41:43.000000000 -0800
-+++ ./hotspot/make/Makefile 2009-11-02 22:42:17.000000000 -0800
+--- ./hotspot/make/Makefile 2010-01-21 01:42:13.000000000 -0800
++++ ./hotspot/make/Makefile 2010-01-22 21:28:26.000000000 -0800
@@ -290,20 +290,20 @@
# Shared Library
ifneq ($(OSNAME),windows)
@@ -3465,8 +3465,8 @@
$(install-file)
endif
endif
---- ./hotspot/make/bsd/Makefile 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/Makefile 2009-11-04 19:52:29.000000000 -0800
+--- ./hotspot/make/bsd/Makefile 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/Makefile 2010-01-22 21:28:26.000000000 -0800
@@ -39,11 +39,11 @@
# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
# an architecture that differs from the target architecture, as long
@@ -3505,8 +3505,8 @@
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
---- ./hotspot/make/bsd/makefiles/buildtree.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/buildtree.make 2009-11-04 19:52:29.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/buildtree.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/buildtree.make 2010-01-22 21:28:26.000000000 -0800
@@ -287,10 +287,11 @@
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
{ \
@@ -3520,8 +3520,8 @@
) > $@
env.csh: env.sh
---- ./hotspot/make/bsd/makefiles/cscope.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/cscope.make 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/cscope.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/cscope.make 2010-01-22 21:28:26.000000000 -0800
@@ -71,7 +71,7 @@
# OS-specific files for other systems are excluded by default. Use CS_OS=yes
# to include platform-specific files for other platforms.
@@ -3531,8 +3531,8 @@
CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
endif
---- ./hotspot/make/bsd/makefiles/defs.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/defs.make 2009-11-04 21:25:27.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/defs.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/defs.make 2010-01-22 21:28:26.000000000 -0800
@@ -72,8 +72,8 @@
HS_ARCH = sparc
endif
@@ -3620,8 +3620,8 @@
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
endif
endif
---- ./hotspot/make/bsd/makefiles/gcc.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/gcc.make 2009-11-04 19:52:29.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/gcc.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/gcc.make 2010-01-22 21:28:26.000000000 -0800
@@ -22,12 +22,15 @@
#
#
@@ -3733,8 +3733,8 @@
#------------------------------------------------------------------------
# Debug flags
---- ./hotspot/make/bsd/makefiles/jsig.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/jsig.make 2010-01-16 14:17:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/jsig.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/jsig.make 2010-01-22 21:28:26.000000000 -0800
@@ -25,11 +25,16 @@
# Rules to build signal interposition library, used by vm.make
@@ -3774,8 +3774,8 @@
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
install_jsig: $(LIBJSIG)
---- ./hotspot/make/bsd/makefiles/launcher.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/launcher.make 2010-01-16 14:12:37.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/launcher.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/launcher.make 2010-01-22 21:28:26.000000000 -0800
@@ -46,7 +46,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
@@ -3785,8 +3785,8 @@
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
---- ./hotspot/make/bsd/makefiles/sa.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/sa.make 2009-11-04 19:52:29.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/sa.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/sa.make 2010-01-22 21:28:26.000000000 -0800
@@ -42,8 +42,8 @@
# gnumake 3.78.1 does not accept the *s that
@@ -3798,8 +3798,8 @@
SA_CLASSDIR = $(GENERATED)/saclasses
---- ./hotspot/make/bsd/makefiles/saproc.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/saproc.make 2010-01-16 14:19:38.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/saproc.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/saproc.make 2010-01-22 21:28:26.000000000 -0800
@@ -25,23 +25,34 @@
# Rules to build serviceability agent library, used by vm.make
@@ -3867,8 +3867,8 @@
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
install_saproc: checkAndBuildSA
---- ./hotspot/make/bsd/makefiles/vm.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/vm.make 2010-01-16 14:22:24.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/vm.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/vm.make 2010-01-22 21:28:26.000000000 -0800
@@ -99,7 +99,7 @@
# Extra flags from gnumake's invocation or environment
CFLAGS += $(EXTRA_CFLAGS)
@@ -3957,8 +3957,8 @@
}
DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
---- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/zeroshark.make 2009-12-20 19:41:23.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/zeroshark.make 2010-01-22 21:28:26.000000000 -0800
@@ -40,4 +40,23 @@
CFLAGS += -D_LP64=1
endif
@@ -3983,74 +3983,74 @@
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
OPT_CFLAGS/compactingPermGenGen.o = -O1
---- ./hotspot/make/bsd/platform_amd64 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/platform_amd64 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/platform_amd64 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/platform_amd64 2010-01-22 21:28:26.000000000 -0800
@@ -12,4 +12,4 @@
compiler = gcc
-sysdefs = -DBSD -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_amd64.suncc 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/platform_amd64.suncc 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/platform_amd64.suncc 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/platform_amd64.suncc 2010-01-22 21:28:26.000000000 -0800
@@ -14,4 +14,4 @@
gnu_dis_arch = amd64
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
-+sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_i486 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/platform_i486 2009-06-06 16:53:58.000000000 -0700
++sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
+--- ./hotspot/make/bsd/platform_i486 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/platform_i486 2010-01-22 21:28:26.000000000 -0800
@@ -12,4 +12,4 @@
compiler = gcc
-sysdefs = -DBSD -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_i486.suncc 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/platform_i486.suncc 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/platform_i486.suncc 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/platform_i486.suncc 2010-01-22 21:28:26.000000000 -0800
@@ -14,4 +14,4 @@
gnu_dis_arch = i386
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32
-+sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_ia64 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/platform_ia64 2009-06-06 16:53:58.000000000 -0700
++sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32
+--- ./hotspot/make/bsd/platform_ia64 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/platform_ia64 2010-01-22 21:28:26.000000000 -0800
@@ -10,6 +10,6 @@
gnu_dis_arch = ia64
-sysdefs = -DBSD -D_GNU_SOURCE -DIA64 -DCC_INTERP
-+sysdefs = -DLINUX -D_GNU_SOURCE -DIA64 -DCC_INTERP
++sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP
mark_style = alignment
---- ./hotspot/make/bsd/platform_sparc 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/platform_sparc 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/platform_sparc 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/platform_sparc 2010-01-22 21:28:26.000000000 -0800
@@ -12,4 +12,4 @@
compiler = gcc
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_sparcv9 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/platform_sparcv9 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/platform_sparcv9 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/platform_sparcv9 2010-01-22 21:28:26.000000000 -0800
@@ -12,4 +12,4 @@
compiler = gcc
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
-+sysdefs = -DLINUX -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_zero.in 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/make/bsd/platform_zero.in 2009-11-04 19:52:29.000000000 -0800
++sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
+--- ./hotspot/make/bsd/platform_zero.in 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/make/bsd/platform_zero.in 2010-01-22 21:28:26.000000000 -0800
@@ -14,4 +14,4 @@
gnu_dis_arch = zero
-sysdefs = -DBSD -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
---- ./hotspot/make/defs.make 2010-01-14 01:41:43.000000000 -0800
-+++ ./hotspot/make/defs.make 2009-10-31 08:51:23.000000000 -0700
+--- ./hotspot/make/defs.make 2010-01-21 01:42:13.000000000 -0800
++++ ./hotspot/make/defs.make 2010-01-22 21:28:26.000000000 -0800
@@ -119,13 +119,23 @@
# Windows should have OS predefined
ifeq ($(OS),)
@@ -4077,8 +4077,8 @@
else
OSNAME=solaris
endif
---- ./hotspot/make/linux/makefiles/defs.make 2010-01-14 01:41:43.000000000 -0800
-+++ ./hotspot/make/linux/makefiles/defs.make 2009-11-02 22:51:00.000000000 -0800
+--- ./hotspot/make/linux/makefiles/defs.make 2010-01-21 01:42:13.000000000 -0800
++++ ./hotspot/make/linux/makefiles/defs.make 2010-01-22 21:28:26.000000000 -0800
@@ -100,28 +100,31 @@
JDK_INCLUDE_SUBDIR=linux
@@ -4116,8 +4116,8 @@
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
endif
endif
---- ./hotspot/make/sa.files 2010-01-14 01:41:43.000000000 -0800
-+++ ./hotspot/make/sa.files 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/sa.files 2010-01-21 01:42:13.000000000 -0800
++++ ./hotspot/make/sa.files 2010-01-22 21:28:26.000000000 -0800
@@ -50,6 +50,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \
@@ -4138,8 +4138,8 @@
$(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-01-14 01:41:43.000000000 -0800
-+++ ./hotspot/make/solaris/makefiles/defs.make 2009-11-04 19:52:29.000000000 -0800
+--- ./hotspot/make/solaris/makefiles/defs.make 2010-01-21 01:42:13.000000000 -0800
++++ ./hotspot/make/solaris/makefiles/defs.make 2010-01-22 21:28:27.000000000 -0800
@@ -61,32 +61,35 @@
JDK_INCLUDE_SUBDIR=solaris
@@ -4188,8 +4188,8 @@
-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-01-14 01:41:43.000000000 -0800
-+++ ./hotspot/make/windows/makefiles/defs.make 2009-11-02 22:49:17.000000000 -0800
+--- ./hotspot/make/windows/makefiles/defs.make 2010-01-21 01:42:14.000000000 -0800
++++ ./hotspot/make/windows/makefiles/defs.make 2010-01-22 21:28:27.000000000 -0800
@@ -69,6 +69,9 @@
JDK_INCLUDE_SUBDIR=win32
@@ -4231,8 +4231,8 @@
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-01-14 01:41:44.000000000 -0800
-+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-01-16 12:50:20.000000000 -0800
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-01-21 01:42:14.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-01-22 21:28:28.000000000 -0800
@@ -455,10 +455,10 @@
void InterpreterMacroAssembler::tag_local(frame::Tag tag, int n) {
if (TaggedStackInterpreter) {
@@ -4281,8 +4281,8 @@
// index is positive and so should have correct value if this code were
// used on 64bits
imulptr(index, reg2);
---- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-01-14 01:41:44.000000000 -0800
-+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2009-06-06 16:54:00.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-01-21 01:42:14.000000000 -0800
++++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-01-22 21:28:28.000000000 -0800
@@ -26,7 +26,7 @@
#ifndef _JAVASOFT_JNI_MD_H_
#define _JAVASOFT_JNI_MD_H_
@@ -4292,8 +4292,8 @@
#define JNIEXPORT
#define JNIIMPORT
#define JNICALL
---- ./hotspot/src/os/bsd/launcher/java_md.c 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/src/os/bsd/launcher/java_md.c 2009-12-20 19:41:24.000000000 -0800
+--- ./hotspot/src/os/bsd/launcher/java_md.c 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/src/os/bsd/launcher/java_md.c 2010-01-22 21:28:28.000000000 -0800
@@ -45,8 +45,15 @@
#include "version_comp.h"
#endif
@@ -4431,8 +4431,8 @@
result = bsd_i586_ServerClassMachine();
#else
if (_launcher_debug) {
---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-01-17 13:42:28.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-01-22 22:23:34.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-01-22 21:28:28.000000000 -0800
@@ -179,32 +179,19 @@
struct sockaddr_un addr;
addr.sun_family = AF_UNIX;
@@ -4525,8 +4525,8 @@
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-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-01-22 21:28:28.000000000 -0800
@@ -28,6 +28,14 @@
# include <sys/param.h>
# include <dlfcn.h>
@@ -4556,8 +4556,8 @@
#endif
*(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */
---- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2009-06-28 17:53:14.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-01-22 21:28:28.000000000 -0800
@@ -36,7 +36,7 @@
// HPI_FileInterface
@@ -4608,8 +4608,8 @@
}
---- ./hotspot/src/os/bsd/vm/jsig.c 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/jsig.c 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/jsig.c 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/jsig.c 2010-01-22 21:28:28.000000000 -0800
@@ -143,7 +143,8 @@
}
@@ -4620,8 +4620,8 @@
}
static int call_os_sigaction(int sig, const struct sigaction *act,
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-01-22 21:28:28.000000000 -0800
@@ -144,38 +144,31 @@
"ILL", SIGILL, /* Illegal instruction (ANSI). */
"TRAP", SIGTRAP, /* Trace trap (POSIX). */
@@ -4671,8 +4671,8 @@
};
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-01-22 21:28:28.000000000 -0800
@@ -51,7 +51,11 @@
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
@@ -4706,8 +4706,8 @@
#endif /* JVM_MD_H */
// Reconciliation History
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-01-22 21:28:28.000000000 -0800
@@ -28,8 +28,8 @@
void OSThread::pd_initialize() {
@@ -4719,8 +4719,8 @@
_siginfo = NULL;
_ucontext = NULL;
_expanding_stack = 0;
---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2009-06-28 17:53:14.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-01-22 21:28:28.000000000 -0800
@@ -36,6 +36,12 @@
private:
@@ -4778,8 +4778,8 @@
pthread_t pthread_id() const {
return _pthread_id;
}
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-01-16 14:25:14.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-01-22 21:28:28.000000000 -0800
@@ -42,17 +42,39 @@
# include <sys/utsname.h>
# include <sys/socket.h>
@@ -6101,8 +6101,8 @@
// execve failed
_exit(-1);
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2009-10-05 21:49:06.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-01-22 21:28:28.000000000 -0800
@@ -27,6 +27,12 @@
/* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
@@ -6239,8 +6239,8 @@
// Stack repair handling
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2009-06-28 17:53:14.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-01-22 21:28:28.000000000 -0800
@@ -61,7 +61,15 @@
inline bool os::allocate_stack_guard_pages() {
@@ -6257,8 +6257,8 @@
}
---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-01-22 21:28:28.000000000 -0800
@@ -241,7 +241,7 @@
char* pwbuf = NEW_C_HEAP_ARRAY(char, bufsize);
@@ -6268,7 +6268,7 @@
struct passwd* p;
int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p);
---- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-01-22 22:23:35.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 @@
-/*
@@ -6316,7 +6316,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-01-22 22:23:35.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 @@
-/*
@@ -6525,7 +6525,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-01-22 22:23:35.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-//
@@ -6555,7 +6555,7 @@
-//
-
-// SPARC Bsd Architecture Description File
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-01-22 22:23:35.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800
@@ -1,105 +0,0 @@
-#
@@ -6663,7 +6663,7 @@
- ta 0x03
- retl
- mov %fp, %o0
---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-01-22 22:23:35.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 @@
-/*
@@ -6702,7 +6702,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-01-22 22:23:35.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 @@
-/*
@@ -6807,7 +6807,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-01-22 22:23:35.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,648 +0,0 @@
-/*
@@ -7458,7 +7458,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-01-22 22:23:35.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 @@
-/*
@@ -7505,7 +7505,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-01-22 22:23:35.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 @@
-/*
@@ -7548,7 +7548,7 @@
-inline void Prefetch::write(void *loc, intx interval) {}
-
-#endif
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-01-22 22:23:35.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 @@
-/*
@@ -7588,7 +7588,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-01-22 22:23:35.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 @@
-/*
@@ -7619,7 +7619,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-01-22 22:23:35.000000000 -0800
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,107 +0,0 @@
-/*
@@ -7729,7 +7729,7 @@
- // nothing else to try
- return false;
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-01-22 22:23:35.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 @@
-/*
@@ -7830,7 +7830,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-01-22 22:23:35.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 @@
-/*
@@ -7902,7 +7902,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-01-17 13:42:29.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-01-22 22:23:35.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 @@
-/*
@@ -7966,8 +7966,8 @@
-
- return features;
-}
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-01-22 21:28:28.000000000 -0800
@@ -19,8 +19,19 @@
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
# CA 95054 USA or visit www.sun.com if you need additional information or
@@ -8171,8 +8171,8 @@
# 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-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-01-22 21:28:29.000000000 -0800
@@ -21,6 +21,14 @@
# have any questions.
#
@@ -8320,8 +8320,8 @@
cmpq %rdi,%rsi
leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8
jbe acl_CopyRight
---- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-01-22 21:28:29.000000000 -0800
@@ -22,7 +22,33 @@
*
*/
@@ -8356,8 +8356,8 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
---- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2009-10-05 21:49:06.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-01-22 21:28:29.000000000 -0800
@@ -22,9 +22,10 @@
*
*/
@@ -8384,8 +8384,8 @@
+define_pd_global(uintx, HeapBaseMinAddress, 2*G);
// Only used on 64 bit Windows platforms
define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-01-22 21:28:29.000000000 -0800
@@ -44,23 +44,202 @@
# include <sys/wait.h>
# include <pwd.h>
@@ -8920,8 +8920,8 @@
#endif // AMD64
st->cr();
st->cr();
---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-01-22 21:28:29.000000000 -0800
@@ -27,8 +27,10 @@
#ifndef AMD64
// map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp
@@ -8933,8 +8933,8 @@
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
#endif // !AMD64
---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2009-06-06 16:54:01.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-01-22 21:28:29.000000000 -0800
@@ -31,7 +31,7 @@
/******************************/ \
/* Threads (NOTE: incomplete) */ \
@@ -8944,8 +8944,8 @@
nonstatic_field(OSThread, _pthread_id, pthread_t) \
/* This must be the last entry, and must be present */ \
last_entry()
---- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2009-12-20 19:41:24.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-01-22 21:28:29.000000000 -0800
@@ -23,136 +23,441 @@
*
*/
@@ -9618,8 +9618,8 @@
- (intptr_t) compare_value);
+ return atomic_cas_ptr((volatile void *)dest, compare_value, exchange_value);
}
---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2009-12-20 19:41:24.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-01-22 21:28:29.000000000 -0800
@@ -25,16 +25,23 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
@@ -9648,8 +9648,8 @@
- return bswap_64(x);
+ return bswap64(x);
}
---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2009-12-20 19:41:24.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-01-22 21:28:29.000000000 -0800
@@ -40,7 +40,12 @@
#else // ARM
@@ -9663,8 +9663,8 @@
#ifdef PPC
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-01-17 13:42:29.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2009-12-20 19:41:24.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-01-22 22:23:35.000000000 -0800
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-01-22 21:28:29.000000000 -0800
@@ -23,6 +23,10 @@
*
*/
@@ -9780,8 +9780,8 @@
assert(os::current_stack_pointer() >= stack_bottom, "should do");
assert(os::current_stack_pointer() < stack_top, "should do");
---- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-01-14 01:41:47.000000000 -0800
-+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2009-09-07 10:57:21.000000000 -0700
+--- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-01-21 01:42:17.000000000 -0800
++++ ./hotspot/src/share/vm/adlc/adlc.hpp 2010-01-22 21:28:31.000000000 -0800
@@ -69,9 +69,9 @@
#endif
#endif // _WIN32
@@ -9794,8 +9794,8 @@
// Macros
#define uint32 unsigned int
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-01-14 01:41:47.000000000 -0800
-+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-01-16 12:50:21.000000000 -0800
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-01-21 01:42:17.000000000 -0800
++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-01-22 21:28:31.000000000 -0800
@@ -952,7 +952,7 @@
}
nmethod* nm = method->code();
@@ -9805,8 +9805,8 @@
}
}
---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-01-14 01:41:48.000000000 -0800
-+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-01-16 12:50:22.000000000 -0800
+--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-01-21 01:42:18.000000000 -0800
++++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-01-22 21:28:32.000000000 -0800
@@ -77,7 +77,7 @@
// the incoming method. We could lose a line of trace output.
// This is acceptable in a debug-only feature.
@@ -9825,8 +9825,8 @@
if (Verbose) {
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
---- ./hotspot/src/share/vm/prims/forte.cpp 2010-01-14 01:41:49.000000000 -0800
-+++ ./hotspot/src/share/vm/prims/forte.cpp 2009-06-06 16:54:08.000000000 -0700
+--- ./hotspot/src/share/vm/prims/forte.cpp 2010-01-21 01:42:20.000000000 -0800
++++ ./hotspot/src/share/vm/prims/forte.cpp 2010-01-22 21:28:34.000000000 -0800
@@ -626,6 +626,11 @@
// Method to let libcollector know about a dynamically loaded function.
// Because it is weakly bound, the calls become NOP's when the library
@@ -9847,8 +9847,8 @@
#endif // !_WINDOWS
} // end extern "C"
---- ./hotspot/src/share/vm/runtime/globals.hpp 2010-01-14 01:41:50.000000000 -0800
-+++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-01-16 12:50:22.000000000 -0800
+--- ./hotspot/src/share/vm/runtime/globals.hpp 2010-01-21 01:42:20.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-01-22 21:28:34.000000000 -0800
@@ -324,7 +324,7 @@
/* UseMembar is theoretically a temp flag used for memory barrier \
* removal testing. It was supposed to be removed before FCS but has \
@@ -9857,9 +9857,9 @@
+ product(bool, UseMembar, true, \
"(Unstable) Issues membars on thread state transitions") \
\
- product(bool, PrintCommandLineFlags, false, \
---- ./hotspot/src/share/vm/runtime/os.cpp 2010-01-14 01:41:50.000000000 -0800
-+++ ./hotspot/src/share/vm/runtime/os.cpp 2009-06-06 16:54:09.000000000 -0700
+ diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug, \
+--- ./hotspot/src/share/vm/runtime/os.cpp 2010-01-21 01:42:20.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/os.cpp 2010-01-22 21:28:34.000000000 -0800
@@ -79,7 +79,11 @@
assert(false, "Failed localtime_pd");
return NULL;
@@ -9872,8 +9872,8 @@
// If daylight savings time is in effect,
// we are 1 hour East of our time zone
---- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-01-14 01:41:50.000000000 -0800
-+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2009-10-31 08:51:25.000000000 -0700
+--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-01-21 01:42:20.000000000 -0800
++++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-01-22 21:28:35.000000000 -0800
@@ -144,7 +144,8 @@
#define OS LINUX_ONLY("linux") \
@@ -9884,8 +9884,8 @@
#ifdef ZERO
#define CPU ZERO_LIBARCH
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-01-14 01:41:50.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2009-06-06 16:54:10.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-01-21 01:42:21.000000000 -0800
++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-01-22 21:28:35.000000000 -0800
@@ -71,12 +71,25 @@
# include <sys/procfs.h>
# endif
@@ -9952,8 +9952,8 @@
inline int g_isnan(float f) { return isnanf(f); }
inline int g_isnan(double f) { return isnan(f); }
#else
---- ./hotspot/src/share/vm/utilities/macros.hpp 2010-01-14 01:41:51.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/macros.hpp 2009-09-07 10:57:23.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/macros.hpp 2010-01-21 01:42:21.000000000 -0800
++++ ./hotspot/src/share/vm/utilities/macros.hpp 2010-01-22 21:28:35.000000000 -0800
@@ -148,6 +148,14 @@
#define NOT_WINDOWS(code) code
#endif
@@ -9969,8 +9969,8 @@
#if defined(IA32) || defined(AMD64)
#define X86
#define X86_ONLY(code) code
---- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-01-14 01:41:51.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2009-06-06 16:54:10.000000000 -0700
+--- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-01-21 01:42:21.000000000 -0800
++++ ./hotspot/src/share/vm/utilities/ostream.cpp 2010-01-22 21:28:35.000000000 -0800
@@ -827,7 +827,7 @@
#ifndef PRODUCT
@@ -9980,8 +9980,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-01-14 01:41:51.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-01-16 12:50:23.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-01-21 01:42:21.000000000 -0800
++++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-01-22 21:28:35.000000000 -0800
@@ -31,13 +31,18 @@
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
"JAVA_COMPILER", "PATH", "USERNAME",
@@ -10011,8 +10011,8 @@
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
---- ./hotspot/test/Makefile 2010-01-14 01:41:51.000000000 -0800
-+++ ./hotspot/test/Makefile 2009-06-28 17:58:24.000000000 -0700
+--- ./hotspot/test/Makefile 2010-01-21 01:42:21.000000000 -0800
++++ ./hotspot/test/Makefile 2010-01-22 21:28:35.000000000 -0800
@@ -44,6 +44,22 @@
ARCH = i586
endif
@@ -10054,8 +10054,8 @@
ifdef TESTDIRS
JTREG_TESTDIRS = $(TESTDIRS)
endif
---- ./hotspot/test/jprt.config 2010-01-14 01:41:51.000000000 -0800
-+++ ./hotspot/test/jprt.config 2009-06-06 16:54:10.000000000 -0700
+--- ./hotspot/test/jprt.config 2010-01-21 01:42:21.000000000 -0800
++++ ./hotspot/test/jprt.config 2010-01-22 21:28:36.000000000 -0800
@@ -75,8 +75,8 @@
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -10123,41 +10123,41 @@
# Export PATH setting
PATH="${path4sdk}"
---- ./jaxp/.hgtags 2010-01-14 01:42:03.000000000 -0800
-+++ ./jaxp/.hgtags 2010-01-16 12:50:34.000000000 -0800
-@@ -53,3 +53,4 @@
- 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
+--- ./jaxp/.hgtags 2010-01-21 01:42:36.000000000 -0800
++++ ./jaxp/.hgtags 2010-01-22 21:31:13.000000000 -0800
+@@ -54,3 +54,4 @@
bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
-+b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79
---- ./jaxp/.jcheck/conf 2010-01-14 01:42:03.000000000 -0800
+ b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79
++9219574db5936367114b0f31469837f27d5a375a jdk7-b80
+--- ./jaxp/.jcheck/conf 2010-01-21 01:42:36.000000000 -0800
+++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jaxws/.hgtags 2010-01-14 01:42:21.000000000 -0800
-+++ ./jaxws/.hgtags 2010-01-16 12:50:39.000000000 -0800
-@@ -53,3 +53,4 @@
- 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76
+--- ./jaxws/.hgtags 2010-01-21 01:42:57.000000000 -0800
++++ ./jaxws/.hgtags 2010-01-22 21:34:13.000000000 -0800
+@@ -54,3 +54,4 @@
5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77
fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78
-+c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79
---- ./jaxws/.jcheck/conf 2010-01-14 01:42:21.000000000 -0800
+ c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79
++447767dee56a0f8cb89acc8bf7be5f9be7d84e8b jdk7-b80
+--- ./jaxws/.jcheck/conf 2010-01-21 01:42:57.000000000 -0800
+++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/.hgtags 2010-01-14 01:45:10.000000000 -0800
-+++ ./jdk/.hgtags 2010-01-16 12:50:59.000000000 -0800
-@@ -53,3 +53,4 @@
- 8fb602395be0f7d5af4e7e93b7df2d960faf9d17 jdk7-b76
+--- ./jdk/.hgtags 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/.hgtags 2010-01-22 22:03:39.000000000 -0800
+@@ -54,3 +54,4 @@
e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
-+918920710d65432a2d54fdf407c1524a5571c4ad jdk7-b79
---- ./jdk/.jcheck/conf 2010-01-14 01:45:10.000000000 -0800
+ 918920710d65432a2d54fdf407c1524a5571c4ad jdk7-b79
++049cfaaa9a7374e3768a79969a799e8b59ad52fa jdk7-b80
+--- ./jdk/.jcheck/conf 2010-01-21 01:45:33.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-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/com/sun/java/pack/Makefile 2009-09-21 21:31:52.000000000 -0700
+--- ./jdk/make/com/sun/java/pack/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/com/sun/java/pack/Makefile 2010-01-22 22:03:39.000000000 -0800
@@ -61,6 +61,7 @@
@@ -10189,8 +10189,8 @@
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
---- ./jdk/make/com/sun/nio/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/com/sun/nio/Makefile 2009-06-28 17:53:18.000000000 -0700
+--- ./jdk/make/com/sun/nio/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/com/sun/nio/Makefile 2010-01-22 22:03:39.000000000 -0800
@@ -30,7 +30,16 @@
BUILDDIR = ../../..
include $(BUILDDIR)/common/Defs.gmk
@@ -10208,8 +10208,8 @@
all build clean clobber::
$(SUBDIRS-loop)
---- ./jdk/make/com/sun/nio/sctp/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/com/sun/nio/sctp/Makefile 2009-06-28 17:53:18.000000000 -0700
+--- ./jdk/make/com/sun/nio/sctp/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/com/sun/nio/sctp/Makefile 2010-01-22 22:03:39.000000000 -0800
@@ -68,6 +68,9 @@
#LIBSCTP = -lsctp
OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio
@@ -10220,8 +10220,8 @@
else # windows
include $(BUILDDIR)/common/Classes.gmk
---- ./jdk/make/com/sun/security/auth/module/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/com/sun/security/auth/module/Makefile 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/com/sun/security/auth/module/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-01-22 22:03:39.000000000 -0800
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
@@ -10231,8 +10231,8 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -43,5 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
endif
@@ -10243,8 +10243,8 @@
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -39,4 +39,7 @@
LinuxVirtualMachine.c
endif
@@ -10254,8 +10254,8 @@
+FILES_c = \
+ BsdVirtualMachine.c
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -43,6 +43,11 @@
sun/tools/attach/LinuxAttachProvider.java
endif
@@ -10268,8 +10268,8 @@
#
# Files that need to be copied
#
---- ./jdk/make/com/sun/tools/attach/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/Makefile 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/com/sun/tools/attach/Makefile 2010-01-22 22:03:39.000000000 -0800
@@ -36,6 +36,9 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
@@ -10280,8 +10280,8 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-01-17 13:42:33.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-01-22 22:03:39.000000000 -0800
@@ -30,14 +30,12 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -10298,8 +10298,8 @@
local:
*;
};
---- ./jdk/make/common/Defs-bsd.gmk 2010-01-17 13:42:33.000000000 -0800
-+++ ./jdk/make/common/Defs-bsd.gmk 2009-11-14 07:37:47.000000000 -0800
+--- ./jdk/make/common/Defs-bsd.gmk 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/make/common/Defs-bsd.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -25,7 +25,7 @@
#
@@ -10476,8 +10476,8 @@
ifeq ($(ARCH), ia64)
INCLUDE_SA = false
else
---- ./jdk/make/common/Defs-linux.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/Defs-linux.gmk 2009-11-13 00:09:36.000000000 -0800
+--- ./jdk/make/common/Defs-linux.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/Defs-linux.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -314,7 +314,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
@@ -10487,8 +10487,8 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/Defs.gmk 2009-11-13 00:09:36.000000000 -0800
+--- ./jdk/make/common/Defs.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/Defs.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -181,6 +181,36 @@
endif
endif # OPENJDK
@@ -10545,8 +10545,8 @@
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./jdk/make/common/Program.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/Program.gmk 2009-11-13 00:09:36.000000000 -0800
+--- ./jdk/make/common/Program.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/Program.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -67,11 +67,27 @@
# Create a dependency on libjli (Java Launcher Infrastructure)
#
@@ -10607,8 +10607,8 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/Release.gmk 2009-11-13 00:09:36.000000000 -0800
+--- ./jdk/make/common/Release.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/Release.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -148,14 +148,13 @@
tnameserv.1 \
unpack200.1
@@ -10668,8 +10668,8 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/internal/BinaryPlugs.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-01-22 22:03:39.000000000 -0800
@@ -49,8 +49,6 @@
com/sun/jmx/snmp/SnmpDataTypeEnums.class \
com/sun/jmx/snmp/SnmpDefinitions.class \
@@ -10757,8 +10757,8 @@
import-binary-plug-jar \
import-binary-plugs-completed
---- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -72,6 +72,24 @@
endif
@@ -10784,8 +10784,8 @@
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./jdk/make/common/shared/Defs-bsd.gmk 2010-01-17 13:42:33.000000000 -0800
-+++ ./jdk/make/common/shared/Defs-bsd.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/common/shared/Defs-bsd.gmk 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -54,7 +54,7 @@
endef
@@ -10824,8 +10824,8 @@
# Import JDK images allow for partial builds, components not built are
# imported (or copied from) these import areas when needed.
---- ./jdk/make/common/shared/Defs-utils.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/shared/Defs-utils.gmk 2009-07-19 15:30:31.000000000 -0700
+--- ./jdk/make/common/shared/Defs-utils.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/shared/Defs-utils.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -67,6 +67,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
@@ -10878,8 +10878,8 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/shared/Defs.gmk 2009-09-21 21:31:52.000000000 -0700
+--- ./jdk/make/common/shared/Defs.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/shared/Defs.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -589,8 +589,8 @@
override CC_VERSION = sun
endif
@@ -10891,8 +10891,8 @@
override CC_VERSION = gcc
endif
---- ./jdk/make/common/shared/Platform.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/shared/Platform.gmk 2009-12-20 19:50:45.000000000 -0800
+--- ./jdk/make/common/shared/Platform.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/shared/Platform.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -82,7 +82,7 @@
SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
# When changing SCM_DIRs also change SCM_DIRS_rexp and SCM_DIRS_prune:
@@ -11038,8 +11038,8 @@
# If blanks in the username, use the first 4 words and pack them together
_USER1:=$(subst ', ,$(_USER))
_USER2:=$(subst ", ,$(_USER1))
---- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/shared/Sanity-Settings.gmk 2009-09-21 21:31:52.000000000 -0700
+--- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -244,6 +244,7 @@
ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
@@ -11048,8 +11048,8 @@
ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS)
ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
---- ./jdk/make/common/shared/Sanity.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/common/shared/Sanity.gmk 2009-09-21 21:31:53.000000000 -0700
+--- ./jdk/make/common/shared/Sanity.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/common/shared/Sanity.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -142,6 +142,11 @@
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
endif
@@ -11081,8 +11081,8 @@
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
---- ./jdk/make/docs/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/docs/Makefile 2009-06-28 17:59:21.000000000 -0700
+--- ./jdk/make/docs/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/docs/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -214,7 +214,7 @@
# you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR)
# being interpreted as an end of command (newline)
@@ -11092,8 +11092,8 @@
JAAS_DOCDIR = $(DOCSDIR)/jre/api/security/jaas/spec
JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \
-encoding ascii \
---- ./jdk/make/java/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/Makefile 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -49,7 +49,7 @@
endif
endif # PLATFORM
@@ -11103,8 +11103,8 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/hpi/hpi_common.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/hpi/hpi_common.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/hpi/hpi_common.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/hpi/hpi_common.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -86,5 +86,9 @@
# Things that must be linked in.
#
@@ -11115,8 +11115,8 @@
OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
endif
+endif
---- ./jdk/make/java/hpi/native/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/hpi/native/Makefile 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/hpi/native/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/hpi/native/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -72,16 +72,25 @@
ifeq ($(MOOT_PRIORITIES),true)
OTHER_CPPFLAGS += -DMOOT_PRIORITIES
@@ -11143,8 +11143,8 @@
ifeq ($(HAVE_FILIOH),true)
OTHER_CPPFLAGS += -DHAVE_FILIOH
endif
---- ./jdk/make/java/instrument/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/instrument/Makefile 2009-11-13 00:09:36.000000000 -0800
+--- ./jdk/make/java/instrument/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/instrument/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -102,6 +102,26 @@
# equivalent of strcasecmp is stricmp on Windows
CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -11180,8 +11180,8 @@
#
# Library to compile.
---- ./jdk/make/java/java/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/java/Makefile 2009-12-20 19:50:46.000000000 -0800
+--- ./jdk/make/java/java/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/java/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -165,8 +165,10 @@
# Is the altzone extern documented in ctime(3C) available?
#
@@ -11208,8 +11208,8 @@
#
# Rules.
---- ./jdk/make/java/java/genlocales.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/java/genlocales.gmk 2009-12-20 19:50:46.000000000 -0800
+--- ./jdk/make/java/java/genlocales.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/java/genlocales.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -76,10 +76,14 @@
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
@$(RM) $@.tmp.euro $@.tmp.noneuro;
@@ -11229,8 +11229,8 @@
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
---- ./jdk/make/java/java/localegen.sh 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/java/localegen.sh 2009-12-20 19:50:46.000000000 -0800
+--- ./jdk/make/java/java/localegen.sh 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/java/localegen.sh 2010-01-22 22:03:40.000000000 -0800
@@ -55,9 +55,9 @@
for FILE in $RESOURCE_NAMES
do
@@ -11243,8 +11243,8 @@
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
---- ./jdk/make/java/java_hprof_demo/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/java_hprof_demo/Makefile 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/java_hprof_demo/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/java_hprof_demo/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -83,8 +83,10 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS += wsock32.lib winmm.lib
@@ -11256,8 +11256,8 @@
#
# Tell library.gmk to copy the txt file first
---- ./jdk/make/java/jli/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/jli/Makefile 2010-01-16 12:50:59.000000000 -0800
+--- ./jdk/make/java/jli/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/jli/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -44,7 +44,9 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -11350,8 +11350,8 @@
+ vpath %.c $(ZIP_SRC)
+endif
+
---- ./jdk/make/java/management/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/management/Makefile 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/management/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/management/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -85,6 +85,11 @@
OTHER_INCLUDES += \
-I$(SHARE_SRC)/native/sun/management
@@ -11364,8 +11364,8 @@
ifeq ($(PLATFORM),windows)
OTHER_LDLIBS += $(JVMLIB)
endif
---- ./jdk/make/java/net/FILES_c.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/net/FILES_c.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/net/FILES_c.gmk 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/net/FILES_c.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -47,6 +47,10 @@
FILES_c += linux_close.c
endif
@@ -11377,8 +11377,8 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/net/Makefile 2009-12-20 19:50:46.000000000 -0800
+--- ./jdk/make/java/net/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/net/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -92,6 +92,12 @@
include $(BUILDDIR)/common/Library.gmk
@@ -11400,8 +11400,8 @@
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
---- ./jdk/make/java/nio/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/nio/Makefile 2009-12-20 19:50:46.000000000 -0800
+--- ./jdk/make/java/nio/Makefile 2010-01-21 01:45:33.000000000 -0800
++++ ./jdk/make/java/nio/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -260,6 +260,69 @@
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
@@ -11504,8 +11504,8 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
---- ./jdk/make/java/nio/mapfile-bsd 2010-01-17 13:42:33.000000000 -0800
-+++ ./jdk/make/java/nio/mapfile-bsd 2009-07-19 15:39:01.000000000 -0700
+--- ./jdk/make/java/nio/mapfile-bsd 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/make/java/nio/mapfile-bsd 2010-01-22 22:03:40.000000000 -0800
@@ -36,25 +36,6 @@
Java_sun_nio_ch_DatagramDispatcher_readv0;
Java_sun_nio_ch_DatagramDispatcher_write0;
@@ -11563,8 +11563,8 @@
Java_sun_nio_fs_UnixNativeDispatcher_init;
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
Java_sun_nio_fs_UnixNativeDispatcher_strerror;
---- ./jdk/make/java/npt/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/npt/Makefile 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/npt/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/java/npt/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -65,6 +65,18 @@
OTHER_LCF += -export:nptInitialize -export:nptTerminate
endif
@@ -11584,8 +11584,8 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/FILES.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/redist/FILES.gmk 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/redist/FILES.gmk 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/java/redist/FILES.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -38,6 +38,14 @@
$(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
@@ -11601,8 +11601,8 @@
# The oblique versions of the font are derived from the base versions
# and since 2D can do this derivation on the fly at run time there is no
---- ./jdk/make/java/redist/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/redist/Makefile 2009-12-20 19:50:46.000000000 -0800
+--- ./jdk/make/java/redist/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/java/redist/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -333,7 +333,7 @@
$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
$(install-file)
@@ -11621,8 +11621,8 @@
endif # !OPENJDK
# Import internal files (ones that are stashed in this source tree)
---- ./jdk/make/java/security/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/security/Makefile 2009-06-06 17:25:51.000000000 -0700
+--- ./jdk/make/java/security/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/java/security/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -51,7 +51,15 @@
ifneq ($(ARCH_DATA_MODEL), 64)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
@@ -11639,8 +11639,8 @@
endif # PLATFORM
---- ./jdk/make/java/zip/FILES_c.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/zip/FILES_c.gmk 2009-09-23 20:12:12.000000000 -0700
+--- ./jdk/make/java/zip/FILES_c.gmk 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/java/zip/FILES_c.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -29,7 +29,10 @@
Deflater.c \
Inflater.c \
@@ -11660,8 +11660,8 @@
- zutil.c
+ zutil.c
+endif
---- ./jdk/make/java/zip/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/java/zip/Makefile 2009-09-21 21:31:53.000000000 -0700
+--- ./jdk/make/java/zip/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/java/zip/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -71,16 +71,28 @@
CPPFLAGS += -UDEBUG
endif
@@ -11692,8 +11692,8 @@
OTHER_LDLIBS = $(JVMLIB)
+endif
+
---- ./jdk/make/javax/sound/FILES_c.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/javax/sound/FILES_c.gmk 2009-06-06 17:25:52.000000000 -0700
+--- ./jdk/make/javax/sound/FILES_c.gmk 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/javax/sound/FILES_c.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -34,6 +34,8 @@
FILES_linux =
@@ -11703,8 +11703,8 @@
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
---- ./jdk/make/javax/sound/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/javax/sound/Makefile 2009-12-20 19:50:46.000000000 -0800
+--- ./jdk/make/javax/sound/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/javax/sound/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -107,6 +107,16 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
@@ -11722,8 +11722,8 @@
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/javax/sound/SoundDefs.gmk 2009-11-13 00:09:36.000000000 -0800
+--- ./jdk/make/javax/sound/SoundDefs.gmk 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-01-22 22:03:40.000000000 -0800
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
endif # PLATFORM linux
@@ -11735,8 +11735,8 @@
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
---- ./jdk/make/jpda/back/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/jpda/back/Makefile 2009-06-06 17:25:52.000000000 -0700
+--- ./jdk/make/jpda/back/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/jpda/back/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -49,8 +49,10 @@
-I$(GENNATIVESRCDIR)/jdwp
@@ -11748,8 +11748,8 @@
#
# This controls the ability to do logging in the library.
---- ./jdk/make/jpda/transport/socket/Makefile 2010-01-14 01:45:11.000000000 -0800
-+++ ./jdk/make/jpda/transport/socket/Makefile 2009-06-06 17:25:52.000000000 -0700
+--- ./jdk/make/jpda/transport/socket/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/jpda/transport/socket/Makefile 2010-01-22 22:03:40.000000000 -0800
@@ -40,6 +40,11 @@
OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
endif
@@ -11762,8 +11762,8 @@
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += -lnsl $(LIBSOCKET)
endif
---- ./jdk/make/sun/awt/Makefile 2010-01-14 01:45:12.000000000 -0800
-+++ ./jdk/make/sun/awt/Makefile 2009-06-06 17:25:53.000000000 -0700
+--- ./jdk/make/sun/awt/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/sun/awt/Makefile 2010-01-22 22:03:41.000000000 -0800
@@ -123,6 +123,13 @@
OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
endif
@@ -11832,8 +11832,8 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-01-17 13:42:33.000000000 -0800
-+++ ./jdk/make/sun/awt/mapfile-vers-bsd 2009-12-20 21:01:50.000000000 -0800
+--- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-01-22 22:03:41.000000000 -0800
@@ -532,11 +532,11 @@
X11SurfaceData_GetOps;
@@ -11851,8 +11851,8 @@
# CDE private entry point
Java_sun_awt_motif_XsessionWMcommand;
---- ./jdk/make/sun/awt/mawt.gmk 2010-01-14 01:45:12.000000000 -0800
-+++ ./jdk/make/sun/awt/mawt.gmk 2009-06-07 03:23:19.000000000 -0700
+--- ./jdk/make/sun/awt/mawt.gmk 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/sun/awt/mawt.gmk 2010-01-22 22:03:41.000000000 -0800
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
endif
@@ -11919,8 +11919,8 @@
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
---- ./jdk/make/sun/font/Makefile 2010-01-14 01:45:12.000000000 -0800
-+++ ./jdk/make/sun/font/Makefile 2009-10-18 15:11:26.000000000 -0700
+--- ./jdk/make/sun/font/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/sun/font/Makefile 2010-01-22 22:03:41.000000000 -0800
@@ -169,6 +169,15 @@
# Libraries to link, and other C flags.
#
@@ -11945,8 +11945,8 @@
endif # PLATFORM
---- ./jdk/make/sun/image/generic/Makefile 2010-01-14 01:45:12.000000000 -0800
-+++ ./jdk/make/sun/image/generic/Makefile 2009-06-06 17:25:53.000000000 -0700
+--- ./jdk/make/sun/image/generic/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/sun/image/generic/Makefile 2010-01-22 22:03:41.000000000 -0800
@@ -68,5 +68,9 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib
@@ -11958,8 +11958,8 @@
+endif
+
---- ./jdk/make/sun/jawt/Makefile 2010-01-14 01:45:12.000000000 -0800
-+++ ./jdk/make/sun/jawt/Makefile 2009-06-06 17:25:53.000000000 -0700
+--- ./jdk/make/sun/jawt/Makefile 2010-01-21 01:45:34.000000000 -0800
++++ ./jdk/make/sun/jawt/Makefile 2010-01-22 22:03:41.000000000 -0800
@@ -92,8 +92,7 @@
#
# Other extra flags needed for compiling.
@@ -11987,8 +11987,8 @@
OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
endif # PLATFORM
---- ./jdk/make/sun/security/ec/Makefile 2010-01-14 01:45:13.000000000 -0800
-+++ ./jdk/make/sun/security/ec/Makefile 2009-10-05 22:36:16.000000000 -0700
+--- ./jdk/make/sun/security/ec/Makefile 2010-01-21 01:45:35.000000000 -0800
++++ ./jdk/make/sun/security/ec/Makefile 2010-01-22 22:03:41.000000000 -0800
@@ -192,7 +192,11 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS += $(JVMLIB)
@@ -12002,8 +12002,8 @@
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-01-14 01:45:13.000000000 -0800
-+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2009-06-06 17:25:54.000000000 -0700
+--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-01-21 01:45:35.000000000 -0800
++++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-01-22 22:03:41.000000000 -0800
@@ -71,6 +71,10 @@
#
# Libraries to link
@@ -12016,8 +12016,8 @@
+ifeq ($(PLATFORM), bsd)
+ OTHER_LDLIBS = $(JVMLIB)
+endif
---- ./jdk/make/sun/security/pkcs11/Makefile 2010-01-14 01:45:13.000000000 -0800
-+++ ./jdk/make/sun/security/pkcs11/Makefile 2009-09-07 11:25:49.000000000 -0700
+--- ./jdk/make/sun/security/pkcs11/Makefile 2010-01-21 01:45:35.000000000 -0800
++++ ./jdk/make/sun/security/pkcs11/Makefile 2010-01-22 22:03:42.000000000 -0800
@@ -155,7 +155,7 @@
#
# Libraries to link
@@ -12027,8 +12027,8 @@
OTHER_LDLIBS = $(JVMLIB)
else
OTHER_LDLIBS = -ldl $(JVMLIB)
---- ./jdk/make/sun/security/smartcardio/Makefile 2010-01-14 01:45:13.000000000 -0800
-+++ ./jdk/make/sun/security/smartcardio/Makefile 2009-06-06 17:25:54.000000000 -0700
+--- ./jdk/make/sun/security/smartcardio/Makefile 2010-01-21 01:45:35.000000000 -0800
++++ ./jdk/make/sun/security/smartcardio/Makefile 2010-01-22 22:03:42.000000000 -0800
@@ -75,6 +75,10 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = $(JVMLIB) winscard.lib
@@ -12041,8 +12041,8 @@
+ endif
OTHER_CFLAGS = -D__sun_jdk
endif
---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-01-14 01:45:13.000000000 -0800
-+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2009-09-23 20:14:10.000000000 -0700
+--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-01-21 01:45:35.000000000 -0800
++++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-01-22 22:03:42.000000000 -0800
@@ -49,18 +49,6 @@
dgif_lib.c \
gif_err.c \
@@ -12081,8 +12081,8 @@
+ zcrc32.c \
+ zutil.c
+endif
---- ./jdk/make/sun/splashscreen/Makefile 2010-01-14 01:45:13.000000000 -0800
-+++ ./jdk/make/sun/splashscreen/Makefile 2009-10-05 21:49:16.000000000 -0700
+--- ./jdk/make/sun/splashscreen/Makefile 2010-01-21 01:45:35.000000000 -0800
++++ ./jdk/make/sun/splashscreen/Makefile 2010-01-22 22:03:42.000000000 -0800
@@ -63,8 +63,24 @@
ifneq ($(PLATFORM), windows)
@@ -12133,8 +12133,8 @@
# Shun the less than portable MMX assembly code in pnggccrd.c,
# and use alternative implementations in C.
---- ./jdk/make/sun/xawt/Makefile 2010-01-14 01:45:13.000000000 -0800
-+++ ./jdk/make/sun/xawt/Makefile 2009-06-06 17:25:54.000000000 -0700
+--- ./jdk/make/sun/xawt/Makefile 2010-01-21 01:45:35.000000000 -0800
++++ ./jdk/make/sun/xawt/Makefile 2010-01-22 22:03:42.000000000 -0800
@@ -47,12 +47,20 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -12207,8 +12207,8 @@
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
---- ./jdk/make/tools/freetypecheck/Makefile 2010-01-14 01:45:14.000000000 -0800
-+++ ./jdk/make/tools/freetypecheck/Makefile 2009-09-07 11:25:49.000000000 -0700
+--- ./jdk/make/tools/freetypecheck/Makefile 2010-01-21 01:45:36.000000000 -0800
++++ ./jdk/make/tools/freetypecheck/Makefile 2010-01-22 22:03:43.000000000 -0800
@@ -49,8 +49,15 @@
# Add runtime lib search path to ensure test will be runnable
ifeq ($(PLATFORM), solaris)
@@ -12226,8 +12226,8 @@
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
---- ./jdk/src/share/back/commonRef.c 2010-01-14 01:45:16.000000000 -0800
-+++ ./jdk/src/share/back/commonRef.c 2009-06-06 17:25:59.000000000 -0700
+--- ./jdk/src/share/back/commonRef.c 2010-01-21 01:45:37.000000000 -0800
++++ ./jdk/src/share/back/commonRef.c 2010-01-22 22:03:45.000000000 -0800
@@ -23,6 +23,10 @@
* have any questions.
*/
@@ -12239,8 +12239,8 @@
#include "util.h"
#include "commonRef.h"
---- ./jdk/src/share/bin/java.c 2010-01-14 01:45:16.000000000 -0800
-+++ ./jdk/src/share/bin/java.c 2010-01-16 12:51:00.000000000 -0800
+--- ./jdk/src/share/bin/java.c 2010-01-21 01:45:37.000000000 -0800
++++ ./jdk/src/share/bin/java.c 2010-01-22 22:03:45.000000000 -0800
@@ -66,6 +66,10 @@
static jboolean printUsage = JNI_FALSE; /* print and exit*/
static jboolean printXUsage = JNI_FALSE; /* print and exit*/
@@ -12340,8 +12340,8 @@
static void
DumpState()
{
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-01-14 01:45:17.000000000 -0800
-+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2009-06-06 17:26:00.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-01-21 01:45:38.000000000 -0800
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-01-22 22:03:46.000000000 -0800
@@ -477,6 +477,10 @@
String[] dirs = new String[] {
userHome + sep + ".themes",
@@ -12353,8 +12353,8 @@
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
---- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-01-14 01:45:18.000000000 -0800
-+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2009-06-06 17:26:04.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-01-21 01:45:39.000000000 -0800
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-01-22 22:03:48.000000000 -0800
@@ -78,6 +78,9 @@
*/
public long timeStamp ;
@@ -12365,7 +12365,7 @@
/**
---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-01-17 13:42:30.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-01-22 22:23:36.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
@@ -12374,7 +12374,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-01-17 13:42:33.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -12570,8 +12570,8 @@
- }
-
-}
---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-01-14 01:45:22.000000000 -0800
-+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-10-18 15:11:26.000000000 -0700
+--- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-01-21 01:45:43.000000000 -0800
++++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-01-22 22:03:54.000000000 -0800
@@ -172,7 +172,12 @@
} else {
String osName = System.getProperty("os.name");
@@ -12586,8 +12586,8 @@
(System.getenv("DISPLAY") == null));
}
} else if (nm.equals("true")) {
---- ./jdk/src/share/classes/java/util/TimeZone.java 2010-01-14 01:45:26.000000000 -0800
-+++ ./jdk/src/share/classes/java/util/TimeZone.java 2009-06-06 17:26:18.000000000 -0700
+--- ./jdk/src/share/classes/java/util/TimeZone.java 2010-01-21 01:45:46.000000000 -0800
++++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-01-22 22:03:59.000000000 -0800
@@ -776,15 +776,13 @@
}
int gmtOffset = (hours * 60 + num) * 60 * 1000;
@@ -12605,8 +12605,8 @@
}
return zi;
}
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-01-14 01:45:33.000000000 -0800
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2009-10-18 15:31:01.000000000 -0700
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-01-21 01:45:52.000000000 -0800
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-01-22 22:04:08.000000000 -0800
@@ -1122,7 +1122,7 @@
*/
HashMap<String, Boolean> existsMap;
@@ -12625,8 +12625,8 @@
errors++;
}
}
---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-01-14 01:45:33.000000000 -0800
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2009-10-18 09:49:26.000000000 -0700
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-01-21 01:45:52.000000000 -0800
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-01-22 22:04:08.000000000 -0800
@@ -39,6 +39,7 @@
WINDOWS,
LINUX,
@@ -12650,8 +12650,8 @@
// determine another OS here
}
---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-01-14 01:45:34.000000000 -0800
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2009-10-18 15:35:54.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-01-21 01:45:53.000000000 -0800
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-01-22 22:04:09.000000000 -0800
@@ -46,6 +46,8 @@
public static final boolean isLinux;
@@ -12673,8 +12673,8 @@
String t2kStr = AccessController.doPrivileged(
new GetPropertyAction("sun.java2d.font.scaler"));
if (t2kStr != null) {
---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-01-14 01:45:34.000000000 -0800
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2009-10-18 15:31:11.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-01-21 01:45:53.000000000 -0800
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-01-22 22:04:09.000000000 -0800
@@ -409,7 +409,7 @@
* registerFonts method as on-screen these JRE fonts
* always go through the T2K rasteriser.
@@ -12684,7 +12684,7 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-01-17 13:42:33.000000000 -0800
+--- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,190 +0,0 @@
-/*
@@ -12877,7 +12877,7 @@
- return charOff - outOff;
- }
-}
---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-01-17 13:42:33.000000000 -0800
+--- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13073,7 +13073,7 @@
- return 2;
- }
-}
---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-01-17 13:42:33.000000000 -0800
+--- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,374 +0,0 @@
-/*
@@ -13450,8 +13450,8 @@
- }
- }
-}
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-01-14 01:45:37.000000000 -0800
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2009-10-18 15:11:28.000000000 -0700
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-01-21 01:45:56.000000000 -0800
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-01-22 22:04:14.000000000 -0800
@@ -1534,7 +1534,9 @@
pFlags |= NOSHEET;
ncomps+=1;
@@ -13463,15 +13463,15 @@
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-01-14 01:45:41.000000000 -0800
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2009-06-06 17:26:49.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-01-21 01:46:00.000000000 -0800
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-01-22 22:04:19.000000000 -0800
@@ -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-01-14 01:45:41.000000000 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2009-09-07 11:25:50.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-01-21 01:46:00.000000000 -0800
++++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-01-22 22:04:19.000000000 -0800
@@ -50,6 +50,7 @@
String zname = "";
String[] files;
@@ -13542,8 +13542,8 @@
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-01-14 01:45:41.000000000 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2009-06-06 17:26:49.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-01-21 01:46:00.000000000 -0800
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-01-22 22:04:19.000000000 -0800
@@ -44,6 +44,8 @@
{0} : could not create directory
error.incorrect.length=\
@@ -13553,8 +13553,8 @@
out.added.manifest=\
added manifest
out.update.manifest=\
---- ./jdk/src/share/hpi/include/hpi_impl.h 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/hpi/include/hpi_impl.h 2009-06-06 17:26:55.000000000 -0700
+--- ./jdk/src/share/hpi/include/hpi_impl.h 2010-01-21 01:46:02.000000000 -0800
++++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-01-22 22:04:24.000000000 -0800
@@ -138,7 +138,11 @@
int sysBind(int fd, struct sockaddr *him, int len);
int sysAccept(int fd, struct sockaddr *him, int *len);
@@ -13569,7 +13569,7 @@
int tolen);
ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags,
--- ./jdk/src/share/lib/security/java.security-openbsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/lib/security/java.security-openbsd 2009-10-05 21:49:17.000000000 -0700
++++ ./jdk/src/share/lib/security/java.security-openbsd 2010-01-22 22:04:24.000000000 -0800
@@ -0,0 +1,269 @@
+#
+# This is the "master security properties file".
@@ -13840,8 +13840,8 @@
+# Example,
+# ocsp.responderCertSerialNumber=2A:FF:00
+
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-06-06 17:26:56.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-01-21 01:46:02.000000000 -0800
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-01-22 22:04:24.000000000 -0800
@@ -32,6 +32,10 @@
#include <unistd.h>
#endif
@@ -13867,8 +13867,8 @@
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2009-09-13 19:10:23.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-01-21 01:46:02.000000000 -0800
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-01-22 22:04:24.000000000 -0800
@@ -22,6 +22,9 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
@@ -13909,8 +13909,8 @@
true));
}
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2009-06-06 17:26:56.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-01-21 01:46:02.000000000 -0800
++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-01-22 22:04:24.000000000 -0800
@@ -33,7 +33,11 @@
#include <jni.h>
@@ -13923,8 +13923,8 @@
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2009-06-06 17:26:56.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-01-21 01:46:02.000000000 -0800
++++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-01-22 22:04:24.000000000 -0800
@@ -99,5 +99,17 @@
return com_sun_media_sound_Platform_LIB_ALSA;
}
@@ -13943,8 +13943,8 @@
+#endif
return 0;
}
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-11-13 00:09:37.000000000 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-01-21 01:46:02.000000000 -0800
++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-01-22 22:04:24.000000000 -0800
@@ -31,6 +31,7 @@
#define X_WINDOWS 1
#define X_SOLARIS 2
@@ -13972,8 +13972,8 @@
+
+
#endif // __SOUNDDEFS_INCLUDED__
---- ./jdk/src/share/native/common/check_code.c 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/common/check_code.c 2009-10-18 15:11:29.000000000 -0700
+--- ./jdk/src/share/native/common/check_code.c 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/common/check_code.c 2010-01-22 22:04:24.000000000 -0800
@@ -1065,7 +1065,7 @@
* Make sure that branches don't go into the middle of nowhere.
*/
@@ -14035,8 +14035,8 @@
/* There can't be more than 64K labels because of the limit
* on per-method byte code length.
*/
---- ./jdk/src/share/native/java/io/io_util.h 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/java/io/io_util.h 2009-06-06 17:26:56.000000000 -0700
+--- ./jdk/src/share/native/java/io/io_util.h 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/java/io/io_util.h 2010-01-22 22:04:25.000000000 -0800
@@ -29,7 +29,15 @@
extern jfieldID IO_fd_fdID;
extern jfieldID IO_handle_fdID;
@@ -14054,8 +14054,8 @@
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2009-12-20 19:50:55.000000000 -0800
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-01-22 22:04:25.000000000 -0800
@@ -24,6 +24,15 @@
* have any questions.
*/
@@ -14096,8 +14096,8 @@
/*
* ANSI/POSIX
---- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2009-06-06 17:26:56.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-01-22 22:04:25.000000000 -0800
@@ -61,7 +61,7 @@
#define log1p jlog1p
#define expm1 jexpm1
@@ -14107,8 +14107,8 @@
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_acosh __j__ieee754_acosh
---- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2009-06-28 17:59:23.000000000 -0700
+--- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-01-22 22:04:25.000000000 -0800
@@ -67,6 +67,10 @@
return jlong_zero;
} else {
@@ -14131,8 +14131,8 @@
}
JNIEXPORT void JNICALL
---- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/java/util/zip/zip_util.c 2009-07-19 15:30:34.000000000 -0700
+--- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-01-22 22:04:25.000000000 -0800
@@ -46,6 +46,10 @@
#include "zip_util.h"
#include "zlib.h"
@@ -14144,8 +14144,8 @@
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
#include <sys/mman.h>
---- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2009-06-06 17:26:57.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-01-22 22:04:25.000000000 -0800
@@ -50,7 +50,9 @@
#include <stdio.h>
#include <string.h>
@@ -14156,8 +14156,8 @@
#include <limits.h>
/* keep these after the other headers */
---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2009-06-06 17:26:57.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-01-22 22:04:25.000000000 -0800
@@ -24,7 +24,11 @@
*/
@@ -14170,8 +14170,8 @@
#include "sun_awt_image_BufImgSurfaceData.h"
---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-01-14 01:45:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2009-06-06 17:26:57.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-01-22 22:04:25.000000000 -0800
@@ -23,7 +23,11 @@
* have any questions.
*/
@@ -14184,8 +14184,8 @@
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-01-21 01:46:03.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-01-22 22:04:26.000000000 -0800
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -14225,8 +14225,8 @@
#endif /* _NO_LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-01-22 22:04:26.000000000 -0800
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14266,8 +14266,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-01-22 22:04:26.000000000 -0800
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14307,8 +14307,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-01-22 22:04:26.000000000 -0800
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14348,8 +14348,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-01-22 22:04:26.000000000 -0800
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14389,8 +14389,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-01-22 22:04:26.000000000 -0800
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14430,8 +14430,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-01-22 22:04:26.000000000 -0800
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14471,8 +14471,8 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-01-22 22:04:26.000000000 -0800
@@ -95,7 +95,7 @@
dst = dp[0];
if (ld_offset + size < 32) {
@@ -14692,8 +14692,8 @@
}
#else /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-01-22 22:04:26.000000000 -0800
@@ -168,7 +168,7 @@
}
@@ -14974,8 +14974,8 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-01-22 22:04:26.000000000 -0800
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -15127,8 +15127,8 @@
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-01-22 22:04:26.000000000 -0800
@@ -30,7 +30,7 @@
typedef union {
mlib_d64 db;
@@ -15138,8 +15138,8 @@
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-01-22 22:04:26.000000000 -0800
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
src0 = src1;
@@ -15238,8 +15238,8 @@
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-01-22 22:04:26.000000000 -0800
@@ -120,7 +120,7 @@
} \
}
@@ -16472,8 +16472,8 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2009-09-13 19:10:23.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-01-22 22:04:26.000000000 -0800
@@ -27,6 +27,16 @@
#ifndef MLIB_IMAGE_H
#define MLIB_IMAGE_H
@@ -16491,8 +16491,8 @@
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-01-22 22:04:26.000000000 -0800
@@ -26,9 +26,15 @@
#include <stdlib.h>
@@ -16523,8 +16523,8 @@
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-01-22 22:04:26.000000000 -0800
@@ -59,7 +59,10 @@
#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
@@ -16537,8 +16537,8 @@
#include <stdint.h> /* for uintptr_t */
#include <malloc.h> /* for ptrdiff_t */
#else
---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-01-22 22:04:26.000000000 -0800
@@ -23,7 +23,11 @@
* have any questions.
*/
@@ -16551,8 +16551,8 @@
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-01-14 01:45:45.000000000 -0800
-+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2009-06-06 17:26:58.000000000 -0700
+--- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-01-22 22:04:26.000000000 -0800
@@ -26,7 +26,11 @@
#include "jlong.h"
#include "math.h"
@@ -16565,8 +16565,8 @@
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
---- ./jdk/src/share/native/sun/font/sunFont.c 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/font/sunFont.c 2009-10-18 15:11:30.000000000 -0700
+--- ./jdk/src/share/native/sun/font/sunFont.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/font/sunFont.c 2010-01-22 22:04:27.000000000 -0800
@@ -24,7 +24,9 @@
*/
@@ -16577,8 +16577,8 @@
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2009-06-06 17:26:59.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-01-21 01:46:04.000000000 -0800
++++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-01-22 22:04:27.000000000 -0800
@@ -28,7 +28,11 @@
#include "jni_util.h"
#include "Disposer.h"
@@ -16591,8 +16591,8 @@
#include "string.h"
/**
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2009-06-06 17:27:00.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-01-22 22:04:27.000000000 -0800
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
#define OGLFuncs_h_Included
@@ -16603,8 +16603,8 @@
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2009-06-06 17:27:00.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-01-22 22:04:27.000000000 -0800
@@ -25,7 +25,11 @@
#ifndef HEADLESS
@@ -16617,8 +16617,8 @@
#include "sun_java2d_pipe_BufferedOpCodes.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2009-06-06 17:27:00.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-01-22 22:04:27.000000000 -0800
@@ -25,7 +25,11 @@
#ifndef HEADLESS
@@ -16631,8 +16631,8 @@
#include <math.h>
#include <jlong.h>
---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2009-06-06 17:27:00.000000000 -0700
+--- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-01-22 22:04:28.000000000 -0800
@@ -28,6 +28,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
@@ -16641,8 +16641,8 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2009-10-18 09:43:56.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-01-22 22:04:28.000000000 -0800
@@ -78,6 +78,14 @@
typedef enum { B_FALSE, B_TRUE } boolean_t;
#endif /* __linux__ */
@@ -16658,8 +16658,8 @@
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2009-10-18 09:44:48.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-01-22 22:04:28.000000000 -0800
@@ -60,9 +60,9 @@
#include <sys/types.h>
@@ -16672,8 +16672,8 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2009-10-18 09:45:25.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-01-22 22:04:28.000000000 -0800
@@ -59,9 +59,9 @@
#include <sys/types.h>
@@ -16686,8 +16686,8 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-01-14 01:45:46.000000000 -0800
-+++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2009-10-18 09:45:57.000000000 -0700
+--- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-01-22 22:04:28.000000000 -0800
@@ -64,9 +64,9 @@
#include <sys/types.h>
@@ -16700,8 +16700,8 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/transport/socket/socketTransport.c 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/share/transport/socket/socketTransport.c 2009-10-05 21:49:17.000000000 -0700
+--- ./jdk/src/share/transport/socket/socketTransport.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/share/transport/socket/socketTransport.c 2010-01-22 22:04:28.000000000 -0800
@@ -65,6 +65,9 @@
#define HEADER_SIZE 11
#define MAX_DATA_SIZE 1000
@@ -16789,8 +16789,8 @@
return res;
} else if (res == 0) {
break; /* eof, return nbytes which is less than len */
---- ./jdk/src/solaris/back/exec_md.c 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/solaris/back/exec_md.c 2009-06-06 17:27:01.000000000 -0700
+--- ./jdk/src/solaris/back/exec_md.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/solaris/back/exec_md.c 2010-01-22 22:04:29.000000000 -0800
@@ -30,7 +30,7 @@
#include "sys.h"
#include "util.h"
@@ -16800,8 +16800,8 @@
/* Linux */
#define FORK() fork()
#else
---- ./jdk/src/solaris/back/linker_md.c 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/solaris/back/linker_md.c 2009-06-06 17:27:01.000000000 -0700
+--- ./jdk/src/solaris/back/linker_md.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/solaris/back/linker_md.c 2010-01-22 22:04:29.000000000 -0800
@@ -48,6 +48,12 @@
#include "threads_md.h"
#endif
@@ -16827,8 +16827,8 @@
}
}
---- ./jdk/src/solaris/back/util_md.h 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/solaris/back/util_md.h 2009-09-13 19:10:23.000000000 -0700
+--- ./jdk/src/solaris/back/util_md.h 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/solaris/back/util_md.h 2010-01-22 22:04:29.000000000 -0800
@@ -31,6 +31,11 @@
#include <limits.h>
@@ -16850,8 +16850,8 @@
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo.c 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/solaris/bin/ergo.c 2009-06-06 17:27:01.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/solaris/bin/ergo.c 2010-01-22 22:04:29.000000000 -0800
@@ -71,14 +71,39 @@
/* Compute physical memory by asking the OS */
uint64_t
@@ -16894,8 +16894,8 @@
return result;
+#endif /* _ALLBSD_SOURCE */
}
---- ./jdk/src/solaris/bin/ergo.h 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/solaris/bin/ergo.h 2009-06-06 17:27:01.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.h 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/solaris/bin/ergo.h 2010-01-22 22:04:29.000000000 -0800
@@ -33,6 +33,10 @@
#include <sys/stat.h>
#include <unistd.h>
@@ -16907,8 +16907,8 @@
#include "java.h"
---- ./jdk/src/solaris/bin/ergo_i586.c 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/solaris/bin/ergo_i586.c 2009-06-06 17:27:01.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo_i586.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/solaris/bin/ergo_i586.c 2010-01-22 22:04:29.000000000 -0800
@@ -106,7 +106,7 @@
#endif /* __solaris__ */
@@ -16989,8 +16989,8 @@
JLI_TraceLauncher("physical processors: %lu\n", result);
return result;
}
---- ./jdk/src/solaris/bin/java_md.c 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/solaris/bin/java_md.c 2009-12-20 20:42:15.000000000 -0800
+--- ./jdk/src/solaris/bin/java_md.c 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/solaris/bin/java_md.c 2010-01-22 22:04:29.000000000 -0800
@@ -24,6 +24,7 @@
*/
@@ -16999,7 +16999,7 @@
#include <dirent.h>
#include <dlfcn.h>
#include <fcntl.h>
-@@ -34,17 +35,28 @@
+@@ -34,17 +35,30 @@
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
@@ -17020,7 +17020,9 @@
+#ifdef __APPLE__
+#define JVM_DLL "libjvm.dylib"
+#define JAVA_DLL "libjava.dylib"
-+#define LD_LIBRARY_PATH "DYLD_LIBRARY_PATH"
++/* FALLBACK avoids naming conflicts with system libraries
++ * (eg, ImageIO's libJPEG.dylib) */
++#define LD_LIBRARY_PATH "DYLD_FALLBACK_LIBRARY_PATH"
+#else
#define JVM_DLL "libjvm.so"
#define JAVA_DLL "libjava.so"
@@ -17029,7 +17031,7 @@
/*
* If a processor / os combination has the ability to run binaries of
-@@ -71,14 +83,31 @@
+@@ -71,14 +85,31 @@
#endif
/* pointer to environment */
@@ -17063,7 +17065,7 @@
static const char *user_dir = "/java";
#else /* Solaris */
static const char *system_dir = "/usr/jdk";
-@@ -1021,9 +1050,23 @@
+@@ -1021,9 +1052,23 @@
return(borrowed_unsetenv(name));
}
@@ -17088,7 +17090,7 @@
static void* hSplashLib = NULL;
-@@ -1059,7 +1102,7 @@
+@@ -1059,7 +1104,7 @@
int
ContinueInNewThread0(int (JNICALL *continuation)(void *), jlong stack_size, void * args) {
int rslt;
@@ -17097,8 +17099,8 @@
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./jdk/src/solaris/bin/java_md.h 2010-01-14 01:45:47.000000000 -0800
-+++ ./jdk/src/solaris/bin/java_md.h 2009-06-06 17:27:01.000000000 -0700
+--- ./jdk/src/solaris/bin/java_md.h 2010-01-21 01:46:05.000000000 -0800
++++ ./jdk/src/solaris/bin/java_md.h 2010-01-22 22:04:29.000000000 -0800
@@ -47,10 +47,14 @@
#include <sys/time.h>
#define CounterGet() (gethrtime()/1000)
@@ -17115,8 +17117,8 @@
/*
* Function prototypes.
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-01-14 01:45:48.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2009-10-18 15:32:40.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-01-21 01:46:06.000000000 -0800
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-01-22 22:04:30.000000000 -0800
@@ -213,7 +213,7 @@
if (fontID != null) {
fileName = (String)fontNameMap.get(fontID);
@@ -17144,7 +17146,7 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-01-17 13:42:33.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,189 +0,0 @@
-#
@@ -17336,7 +17338,7 @@
-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf
-filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf
-filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-01-22 22:23:38.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 @@
-#
@@ -17493,7 +17495,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-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,151 +0,0 @@
-#
@@ -17647,7 +17649,7 @@
-filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf
-filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf
-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,99 +0,0 @@
-/*
@@ -17749,7 +17751,7 @@
- return new SimpleAsynchronousDatagramChannelImpl(family, toPort(group));
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,288 +0,0 @@
-/*
@@ -18040,8 +18042,8 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2009-10-05 21:49:17.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-01-22 22:04:30.000000000 -0800
@@ -36,10 +36,6 @@
class BsdFileStore
extends UnixFileStore
@@ -18120,8 +18122,8 @@
return super.supportsFileAttributeView(name);
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2009-07-19 18:02:04.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-01-22 22:04:30.000000000 -0800
@@ -31,49 +31,23 @@
import java.util.*;
import java.security.AccessController;
@@ -18254,8 +18256,8 @@
@Override
FileStore getFileStore(UnixPath path) throws IOException {
return new BsdFileStore(path);
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2009-06-06 17:27:05.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-01-22 22:04:30.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
@@ -18366,7 +18368,7 @@
+ initIDs();
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,350 +0,0 @@
-/*
@@ -18719,7 +18721,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,466 +0,0 @@
-/*
@@ -19188,8 +19190,8 @@
- init();
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-01-14 01:45:48.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2009-06-06 17:27:05.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-01-21 01:46:06.000000000 -0800
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-01-22 22:04:30.000000000 -0800
@@ -68,6 +68,8 @@
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
if (osname.equals("Linux"))
@@ -19199,8 +19201,8 @@
throw new AssertionError("Platform not recognized");
}
}
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-01-14 01:45:48.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2009-06-06 17:27:05.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-01-21 01:46:06.000000000 -0800
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-01-22 22:04:30.000000000 -0800
@@ -119,7 +119,11 @@
}
@@ -19234,8 +19236,8 @@
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2009-06-06 17:27:05.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-01-22 22:04:30.000000000 -0800
@@ -38,9 +38,6 @@
*/
public class BsdVirtualMachine extends HotSpotVirtualMachine {
@@ -19339,8 +19341,8 @@
- isBsdThreads = isBsdThreads();
}
}
---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-01-14 01:45:48.000000000 -0800
-+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2009-06-06 17:27:05.000000000 -0700
+--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-01-21 01:46:06.000000000 -0800
++++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-01-22 22:04:30.000000000 -0800
@@ -33,7 +33,7 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -19406,8 +19408,8 @@
}
}
---- ./jdk/src/solaris/hpi/include/interrupt.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/include/interrupt.h 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/include/interrupt.h 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-01-22 22:04:31.000000000 -0800
@@ -75,7 +75,7 @@
* N_INTERRUPTS - The number of interrupt channels. These
* are numbered from 0 to (N_INTERRUPTS - 1).
@@ -19428,8 +19430,8 @@
#ifdef SA_SIGINFO
/* Thread implementation dependent interrupt dispatcher. */
void intrDispatchMD(int sig, siginfo_t *info, void *uc);
---- ./jdk/src/solaris/hpi/include/largefile.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/include/largefile.h 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/include/largefile.h 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/include/largefile.h 2010-01-22 22:04:31.000000000 -0800
@@ -34,6 +34,10 @@
#include "largefile_linux.h"
#endif
@@ -19441,8 +19443,8 @@
/*
* Prototypes for wrappers that we define. These wrapper functions
* are low-level I/O routines that will use 64 bit versions if
---- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-01-22 22:04:31.000000000 -0800
@@ -26,11 +26,29 @@
#ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_
#define _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_
@@ -19477,8 +19479,8 @@
+#define pwrite64 pwrite
+
#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */
---- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-01-22 22:04:31.000000000 -0800
@@ -36,6 +36,8 @@
#define N_TRACED_REGS 12
#elif i386
@@ -19525,8 +19527,8 @@
#ifdef __linux__
extern thread_key_t intrJmpbufkey;
---- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -58,7 +58,7 @@
{
int err;
@@ -19536,8 +19538,8 @@
err = pthread_cond_destroy((cond_t *) &condvar->cond);
#else
err = cond_destroy((cond_t *) condvar);
---- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -147,7 +147,7 @@
mid->monitor_owner = self;
mid->entry_count = 1;
@@ -19547,8 +19549,8 @@
if (mid->monitor_owner == self) {
mid->entry_count++;
return SYS_OK;
---- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-01-22 22:04:31.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved.
@@ -20241,8 +20243,8 @@
+ pthread_attr_destroy(&attr);
+#endif
}
---- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -54,6 +54,10 @@
#error That can NOT possibly be right.
#endif
@@ -20324,8 +20326,8 @@
info.isMP = (cpus < 0) ? 1 : (cpus > 1);
info.name = "native threads";
---- ./jdk/src/solaris/hpi/src/linker_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/src/linker_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/src/linker_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -44,11 +44,19 @@
#include "threads_md.h"
#endif
@@ -20392,8 +20394,8 @@
#endif
/*
* This is a bit of bulletproofing to catch the commonly occurring
---- ./jdk/src/solaris/hpi/src/memory_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/src/memory_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/src/memory_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -50,12 +50,24 @@
#include <stdlib.h>
#include <stdio.h> /* For perror() */
@@ -20483,8 +20485,8 @@
ret = committedAddr;
#else
ret = requestedAddr;
---- ./jdk/src/solaris/hpi/src/system_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/hpi/src/system_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/hpi/src/system_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/hpi/src/system_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -41,6 +41,7 @@
#include <dlfcn.h>
@@ -20538,8 +20540,8 @@
fd = open64_w(path, oflag, mode);
if (delete != 0) {
unlink(path);
---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -28,7 +28,10 @@
#include <string.h>
#include <ctype.h>
@@ -20569,8 +20571,8 @@
/* Open conversion descriptors */
iconvToPlatform = iconv_open(codeset, "UTF-8");
---- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-01-22 22:04:31.000000000 -0800
@@ -41,7 +41,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
@@ -20595,8 +20597,8 @@
/* Signals */
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -32,10 +32,16 @@
#include <sys/types.h>
@@ -20759,7 +20761,7 @@
}
JNIEXPORT jlong JNICALL
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-01-22 22:23:38.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 @@
-/*
@@ -20942,7 +20944,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-01-22 22:23:38.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 @@
-/*
@@ -21027,7 +21029,7 @@
-
-
-#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-01-22 22:23:38.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 @@
-/*
@@ -21352,7 +21354,7 @@
-}
-
-#endif /* USE_PLATFORM_MIDI_IN */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-01-22 22:23:38.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 @@
-/*
@@ -21534,7 +21536,7 @@
-
-
-#endif /* USE_PLATFORM_MIDI_OUT */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-01-22 22:23:38.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 @@
-/*
@@ -22017,7 +22019,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-01-22 22:23:38.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 @@
-/*
@@ -22105,7 +22107,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-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-01-22 22:23:38.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 @@
-/*
@@ -23046,7 +23048,7 @@
-
-
-#endif // USE_DAUDIO
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-01-22 22:23:38.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 @@
-/*
@@ -23340,7 +23342,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-01-22 22:23:38.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 @@
-/*
@@ -23415,7 +23417,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-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-01-22 22:23:38.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 @@
-/*
@@ -24141,8 +24143,8 @@
-
-
-#endif // USE_PORTS
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -41,6 +41,11 @@
#include "java_io_FileSystem.h"
#include "java_io_UnixFileSystem.h"
@@ -24163,8 +24165,8 @@
JNIEXPORT jboolean JNICALL
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -33,7 +33,9 @@
#include <sys/stat.h>
#include <errno.h>
@@ -24175,8 +24177,8 @@
/* Note: The comments in this file use the terminology
---- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -36,7 +36,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
FD fd;
@@ -24186,8 +24188,8 @@
/* Remove trailing slashes, since the kernel won't */
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -28,6 +28,11 @@
#include "jni.h"
#include "jni_util.h"
@@ -24228,8 +24230,8 @@
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2009-10-05 21:49:17.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -40,7 +40,11 @@
#include <stdlib.h>
#include <sys/types.h>
@@ -24332,8 +24334,8 @@
if (envp == NULL || (char **) envp == environ) {
execvp(file, (char **) argv);
return;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -23,7 +23,7 @@
* have any questions.
*/
@@ -24476,8 +24478,8 @@
return &sprops;
}
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2009-09-07 11:25:51.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-01-22 22:04:31.000000000 -0800
@@ -36,17 +36,293 @@
#include <stdlib.h>
#include <ctype.h>
@@ -24834,8 +24836,8 @@
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2009-09-07 11:25:51.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-01-22 22:04:31.000000000 -0800
@@ -33,6 +33,9 @@
#include <strings.h>
#include <stdlib.h>
@@ -24885,8 +24887,8 @@
}
return (*env)->NewStringUTF(env, hostname);
}
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-01-22 22:04:31.000000000 -0800
@@ -23,13 +23,13 @@
* have any questions.
*/
@@ -25165,8 +25167,8 @@
memset((char *) &if2, 0, sizeof(if2));
strcpy(if2.ifr_name, name_utf);
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-01-22 22:04:31.000000000 -0800
@@ -23,12 +23,12 @@
* have any questions.
*/
@@ -25291,8 +25293,8 @@
}
}
}
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-01-22 22:04:31.000000000 -0800
@@ -467,9 +467,11 @@
if (connect_rv == JVM_IO_INTR) {
JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
@@ -25314,8 +25316,8 @@
int port;
jobject iaObj;
jclass iaCntrClass;
---- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-01-22 22:04:31.000000000 -0800
@@ -57,7 +57,7 @@
/*
* Signal to unblock thread
@@ -25351,8 +25353,8 @@
}
int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
---- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -34,6 +34,15 @@
#include <stdlib.h>
#include <dlfcn.h>
@@ -25552,8 +25554,8 @@
len = sizeof(arg);
if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg,
---- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2009-06-28 17:59:23.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-01-22 22:04:31.000000000 -0800
@@ -37,7 +37,7 @@
#endif
@@ -25563,8 +25565,8 @@
extern int NET_Timeout(int s, long timeout);
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-01-22 22:04:31.000000000 -0800
@@ -38,7 +38,11 @@
jlong address, jlong len)
{
@@ -25589,8 +25591,8 @@
unsigned long lAddress = address;
jlong offset = lAddress % pageSize;
---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-01-22 22:04:31.000000000 -0800
@@ -47,8 +47,11 @@
return (jint) result;
}
@@ -25628,8 +25630,8 @@
if (rc < 0) {
close(fd);
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2009-09-23 20:37:18.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-01-22 22:04:31.000000000 -0800
@@ -31,7 +31,7 @@
#include <errno.h>
#include <stddef.h>
@@ -25766,8 +25768,8 @@
sprintf(buf, (const char *)"GMT%c%02d:%02d",
sign, (int)(offset/3600), (int)((offset%3600)/60));
return strdup(buf);
---- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-01-22 22:04:31.000000000 -0800
@@ -25,6 +25,7 @@
#include <jni.h>
@@ -25790,8 +25792,8 @@
if (handle == NULL) {
return JNI_FALSE;
}
---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-01-22 22:04:31.000000000 -0800
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -25804,8 +25806,8 @@
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2009-06-28 17:59:23.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-01-22 22:04:31.000000000 -0800
@@ -33,7 +33,9 @@
#include <math.h>
#include <sys/time.h>
@@ -25816,8 +25818,8 @@
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2009-06-06 17:27:06.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-01-22 22:04:31.000000000 -0800
@@ -31,7 +31,11 @@
#include <Xm/XmP.h>
@@ -25830,8 +25832,8 @@
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-01-22 22:04:32.000000000 -0800
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
altstyle = "roman";
@@ -25841,8 +25843,8 @@
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2009-12-20 19:50:56.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-01-22 22:04:32.000000000 -0800
@@ -40,6 +40,7 @@
#include <jni.h>
#include <jni_util.h>
@@ -25970,8 +25972,8 @@
if (pLibRandR == NULL) {
J2dRlsTraceLn(J2D_TRACE_ERROR,
"X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2009-06-28 17:59:23.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-01-22 22:04:32.000000000 -0800
@@ -69,7 +69,7 @@
XIMPreeditDrawCallbackStruct *);
static void PreeditCaretCallback(XIC, XPointer,
@@ -26211,8 +26213,8 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-01-22 22:04:32.000000000 -0800
@@ -143,7 +143,11 @@
(*env)->DeleteLocalRef(env, propname);
}
@@ -26225,8 +26227,8 @@
JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
"(Ljava/lang/String;)V",
---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2009-06-28 17:59:23.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-01-22 22:04:32.000000000 -0800
@@ -63,8 +63,9 @@
extern JavaVM *jvm;
@@ -26247,8 +26249,8 @@
statusWindowEventHandler(xev);
#endif
xembed_eventHandler(&xev);
---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-01-22 22:04:32.000000000 -0800
@@ -32,6 +32,7 @@
#include <dlfcn.h>
#include "jni.h"
@@ -26271,8 +26273,8 @@
}
if (handle == NULL) {
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2009-09-07 11:25:51.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-01-22 22:04:32.000000000 -0800
@@ -45,7 +45,7 @@
#include "wsutils.h"
#include "list.h"
@@ -26282,8 +26284,8 @@
#include <sys/socket.h>
#endif
---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-01-22 22:04:32.000000000 -0800
@@ -187,15 +187,20 @@
#ifdef __solaris__
extern Widget awt_util_getXICStatusAreaWindow(Widget w);
@@ -26306,8 +26308,8 @@
typedef struct _XmImRefRec {
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-01-22 22:04:32.000000000 -0800
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -26405,8 +26407,8 @@
awt_wmgr = OPENLOOK_WM;
}
else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-01-22 22:04:32.000000000 -0800
@@ -45,7 +45,10 @@
KDE2_WM,
SAWFISH_WM,
@@ -26419,8 +26421,8 @@
};
extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-01-22 22:04:32.000000000 -0800
@@ -58,7 +58,7 @@
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -26436,8 +26438,8 @@
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2009-10-18 15:11:31.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-01-22 22:04:32.000000000 -0800
@@ -23,7 +23,7 @@
* have any questions.
*/
@@ -26595,8 +26597,8 @@
if (libfontconfig == NULL) {
return NULL;
}
---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2009-12-20 19:50:56.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-01-22 22:04:32.000000000 -0800
@@ -30,8 +30,10 @@
#include <string.h>
#include "gtk2_interface.h"
@@ -26640,8 +26642,8 @@
if (setjmp(j) == 0)
{
---- ./jdk/src/solaris/native/sun/awt/list.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/list.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/list.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/list.c 2010-01-22 22:04:32.000000000 -0800
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -26654,8 +26656,8 @@
#include "list.h"
---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-01-21 01:46:07.000000000 -0800
++++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-01-22 22:04:32.000000000 -0800
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
#endif
@@ -26666,8 +26668,8 @@
#include "robot_common.h"
/*
---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-01-22 22:04:32.000000000 -0800
@@ -32,7 +32,11 @@
* into X11FontScaler_md.c, which is compiled into another library.
*/
@@ -26680,8 +26682,8 @@
#include <ctype.h>
#include <sys/utsname.h>
---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-01-22 22:04:32.000000000 -0800
@@ -39,7 +39,11 @@
#include "GraphicsPrimitiveMgr.h"
#include "glyphblitting.h"
@@ -26694,8 +26696,8 @@
JNIEXPORT void JNICALL AWTDrawGlyphList
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-01-22 22:04:32.000000000 -0800
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -26711,8 +26713,8 @@
typedef unsigned char jubyte;
typedef unsigned short jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-01-14 01:45:49.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2009-06-06 17:27:07.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-01-22 22:04:32.000000000 -0800
@@ -63,6 +63,10 @@
* MLIB_EDGE_SRC_PADDED
*/
@@ -26818,8 +26820,8 @@
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-01-22 22:04:32.000000000 -0800
@@ -794,7 +794,7 @@
static int initialized;
static int usevis = JNI_TRUE;
@@ -26829,8 +26831,8 @@
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-01-22 22:04:33.000000000 -0800
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
@@ -26851,8 +26853,8 @@
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-01-22 22:04:33.000000000 -0800
@@ -32,6 +32,7 @@
#include "gdefs.h"
@@ -26870,8 +26872,8 @@
}
dgaAvailable = JNI_FALSE;
if (lib != NULL) {
---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-01-22 22:04:33.000000000 -0800
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
@@ -26894,8 +26896,8 @@
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-01-22 22:04:33.000000000 -0800
@@ -26,6 +26,10 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -26907,8 +26909,8 @@
#include "jni.h"
#include "jni_util.h"
#include "sun_management_FileSystemImpl.h"
---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-01-22 22:04:33.000000000 -0800
@@ -33,7 +33,7 @@
#include <strings.h>
#endif
@@ -26918,8 +26920,8 @@
#include <string.h>
#endif
---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-01-22 22:04:33.000000000 -0800
@@ -26,11 +26,12 @@
#include "jni.h"
#include "jni_util.h"
@@ -26946,8 +26948,8 @@
gconf_ver = 2;
}
if (gconf_ver > 0) {
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-01-22 22:04:33.000000000 -0800
@@ -35,7 +35,7 @@
#include <string.h>
#include <errno.h>
@@ -26997,8 +26999,8 @@
}
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-01-22 22:04:33.000000000 -0800
@@ -26,15 +26,21 @@
#include "jni.h"
#include "jni_util.h"
@@ -27099,8 +27101,8 @@
+ return (0);
+#endif
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-01-22 22:04:34.000000000 -0800
@@ -33,9 +33,13 @@
#include <sys/socket.h>
#include <fcntl.h>
@@ -27139,8 +27141,8 @@
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-01-22 22:04:34.000000000 -0800
@@ -30,6 +30,10 @@
#include "nio_util.h"
#include "sun_nio_ch_FileKey.h"
@@ -27152,8 +27154,8 @@
static jfieldID key_st_dev; /* id for FileKey.st_dev */
static jfieldID key_st_ino; /* id for FileKey.st_ino */
---- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2009-09-07 11:25:51.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-01-22 22:04:35.000000000 -0800
@@ -116,6 +116,47 @@
#endif /* __linux__ */
@@ -27332,8 +27334,8 @@
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2009-07-19 15:47:30.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-01-22 22:04:35.000000000 -0800
@@ -67,7 +67,7 @@
@@ -27382,8 +27384,8 @@
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2009-09-07 11:25:51.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-01-22 22:04:35.000000000 -0800
@@ -337,11 +337,11 @@
break;
case SCTP_ADDR_MADE_PRIM :
@@ -27398,8 +27400,8 @@
}
addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2009-07-19 15:47:36.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-01-22 22:04:35.000000000 -0800
@@ -55,6 +55,7 @@
*/
jboolean loadSocketExtensionFuncs
@@ -27416,8 +27418,8 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-01-22 22:04:35.000000000 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
@@ -27705,7 +27707,7 @@
+ free(iter);
+ }
}
---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,195 +0,0 @@
-/*
@@ -27903,8 +27905,8 @@
-
-
-}
---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-01-22 22:04:35.000000000 -0800
@@ -30,7 +30,9 @@
#include <stdlib.h>
@@ -27915,8 +27917,8 @@
#ifdef __solaris__
#include <strings.h>
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2009-09-07 11:39:59.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-01-22 22:04:35.000000000 -0800
@@ -49,6 +49,11 @@
#include <mntent.h>
#endif
@@ -27975,8 +27977,8 @@
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2009-07-19 15:35:12.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-01-22 22:04:35.000000000 -0800
@@ -63,7 +63,12 @@
DEFX(O_EXCL);
DEFX(O_TRUNC);
@@ -28003,8 +28005,8 @@
DEF(ERANGE);
// flags used with openat/unlinkat/etc.
---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-01-22 22:04:35.000000000 -0800
@@ -26,7 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
@@ -28015,8 +28017,8 @@
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-01-22 22:04:35.000000000 -0800
@@ -28,12 +28,19 @@
#include <string.h>
@@ -28059,8 +28061,8 @@
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-01-22 22:04:35.000000000 -0800
@@ -64,7 +64,9 @@
#include <assert.h>
@@ -28071,8 +28073,8 @@
#include <jni.h>
---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-01-22 22:04:35.000000000 -0800
@@ -29,7 +29,9 @@
#include <assert.h>
@@ -28083,8 +28085,8 @@
#include <winscard.h>
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-01-17 13:42:34.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-01-22 22:23:38.000000000 -0800
++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-01-22 22:04:35.000000000 -0800
@@ -35,10 +35,10 @@
#include <dirent.h>
#include <ctype.h>
@@ -28389,8 +28391,8 @@
+ JNU_ReleaseStringPlatformChars(env, path, _path);
+ }
+}
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-01-22 22:04:35.000000000 -0800
@@ -228,10 +228,10 @@
{java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
@@ -28415,8 +28417,8 @@
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2009-10-18 09:49:26.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-01-22 22:04:35.000000000 -0800
@@ -24,6 +24,7 @@
*/
@@ -28463,8 +28465,8 @@
}
dlerror(); /* Clear errors */
gnome_url_show = dlsym(gnome_handle, "gnome_url_show");
---- ./jdk/src/solaris/npt/npt_md.h 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/npt/npt_md.h 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/npt/npt_md.h 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/npt/npt_md.h 2010-01-22 22:04:35.000000000 -0800
@@ -32,9 +32,10 @@
#include <string.h>
#include <errno.h>
@@ -28487,8 +28489,8 @@
if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
_sym = dlsym(_handle, "nptInitialize"); \
if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
---- ./jdk/src/solaris/transport/socket/socket_md.c 2010-01-14 01:45:50.000000000 -0800
-+++ ./jdk/src/solaris/transport/socket/socket_md.c 2009-06-06 17:27:08.000000000 -0700
+--- ./jdk/src/solaris/transport/socket/socket_md.c 2010-01-21 01:46:08.000000000 -0800
++++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-01-22 22:04:35.000000000 -0800
@@ -36,7 +36,7 @@
#ifdef __solaris__
#include <thread.h>
@@ -28507,8 +28509,8 @@
int
dbgsysTlsAlloc() {
pthread_key_t key;
---- ./jdk/test/Makefile 2010-01-14 01:45:52.000000000 -0800
-+++ ./jdk/test/Makefile 2010-01-16 12:51:02.000000000 -0800
+--- ./jdk/test/Makefile 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/Makefile 2010-01-22 22:04:39.000000000 -0800
@@ -78,6 +78,16 @@
OS_ARCH := $(shell $(UNAME) -m)
OS_VERSION := $(shell $(UNAME) -r)
@@ -28526,18 +28528,8 @@
ifndef OS_NAME
ifneq ($(PROCESSOR_IDENTIFIER), )
OS_NAME = windows
---- ./jdk/test/ProblemList.txt 2010-01-14 01:45:52.000000000 -0800
-+++ ./jdk/test/ProblemList.txt 2010-01-16 12:51:02.000000000 -0800
-@@ -571,6 +571,7 @@
- javax/print/attribute/GetCopiesSupported.java generic-all
- javax/print/attribute/SidesPageRangesTest.java generic-all
- javax/print/attribute/SupportedPrintableAreas.java generic-all
-+javax/print/attribute/AttributeTest.java generic-all
-
- # Only print test left, excluding just because all print tests have been
- javax/print/attribute/MediaMappingsTest.java generic-all
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-01-14 01:45:52.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2009-06-06 17:27:13.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-01-22 22:04:39.000000000 -0800
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -28547,8 +28539,8 @@
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-01-14 01:45:52.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2009-12-20 19:50:57.000000000 -0800
+--- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-01-22 22:04:39.000000000 -0800
@@ -63,7 +63,7 @@
OS=`uname -s`
export TRANSPORT_METHOD
@@ -28558,8 +28550,8 @@
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-01-14 01:45:53.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2009-06-06 17:27:13.000000000 -0700
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-01-22 22:04:39.000000000 -0800
@@ -121,10 +121,14 @@
esac
libloc=${jreloc}/lib/${libarch}
@@ -28576,8 +28568,8 @@
Windows*)
libloc=${jreloc}/bin
sep=';'
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-01-14 01:45:53.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2009-12-20 19:50:57.000000000 -0800
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-01-22 22:04:39.000000000 -0800
@@ -289,7 +289,7 @@
psCmd=ps
jstack=jstack.exe
@@ -28587,8 +28579,8 @@
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-01-14 01:45:53.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2009-12-20 19:50:57.000000000 -0800
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-01-22 22:04:39.000000000 -0800
@@ -112,7 +112,7 @@
fi
;;
@@ -28598,8 +28590,8 @@
pass "This test always passes on $OS"
;;
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-01-14 01:45:53.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2009-06-06 17:27:13.000000000 -0700
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-01-22 22:04:40.000000000 -0800
@@ -45,10 +45,7 @@
OS=`uname -s`
@@ -28612,8 +28604,8 @@
PS=":"
;;
Windows* )
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-01-14 01:45:53.000000000 -0800
-+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2009-06-06 17:27:14.000000000 -0700
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-01-22 22:04:40.000000000 -0800
@@ -83,6 +83,10 @@
total_swap=`free -b | grep -i swap | awk '{print $2}'`
runOne GetTotalSwapSpaceSize $total_swap
@@ -28625,8 +28617,8 @@
* )
runOne GetTotalSwapSpaceSize "sanity-only"
;;
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-01-14 01:45:53.000000000 -0800
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2009-06-06 17:27:14.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-01-22 22:04:40.000000000 -0800
@@ -48,7 +48,7 @@
# Test GetMaxFileDescriptorCount if we are running on Unix
@@ -28636,8 +28628,8 @@
runOne GetMaxFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-01-14 01:45:53.000000000 -0800
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2009-06-06 17:27:14.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-01-21 01:46:10.000000000 -0800
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-01-22 22:04:40.000000000 -0800
@@ -48,7 +48,7 @@
# Test GetOpenFileDescriptorCount if we are running on Unix
@@ -28647,8 +28639,8 @@
runOne GetOpenFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-01-14 01:45:53.000000000 -0800
-+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2009-06-06 17:27:15.000000000 -0700
+--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-01-21 01:46:11.000000000 -0800
++++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-01-22 22:04:41.000000000 -0800
@@ -36,11 +36,7 @@
OS=`uname -s`
@@ -28662,8 +28654,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-14 01:45:54.000000000 -0800
-+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2009-06-06 17:27:17.000000000 -0700
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-21 01:46:12.000000000 -0800
++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-22 22:04:42.000000000 -0800
@@ -25,10 +25,11 @@
fi
@@ -28680,8 +28672,8 @@
# Windows
if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh 2010-01-14 01:45:56.000000000 -0800
-+++ ./jdk/test/java/io/File/GetXSpace.sh 2009-06-06 17:27:21.000000000 -0700
+--- ./jdk/test/java/io/File/GetXSpace.sh 2010-01-21 01:46:13.000000000 -0800
++++ ./jdk/test/java/io/File/GetXSpace.sh 2010-01-22 22:04:45.000000000 -0800
@@ -26,7 +26,7 @@
# set platform-dependent variable
OS=`uname -s`
@@ -28691,8 +28683,8 @@
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-01-14 01:45:56.000000000 -0800
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2009-06-06 17:27:22.000000000 -0700
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-01-21 01:46:13.000000000 -0800
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-01-22 22:04:46.000000000 -0800
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
# operating system.
@@ -28702,8 +28694,8 @@
PS=":" ;;
Windows* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-01-14 01:45:56.000000000 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2009-06-06 17:27:23.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-01-21 01:46:14.000000000 -0800
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-01-22 22:04:46.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -28713,8 +28705,8 @@
PS=":" ;;
Windows* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-01-14 01:45:56.000000000 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2009-06-06 17:27:23.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-01-21 01:46:14.000000000 -0800
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-01-22 22:04:46.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -28724,8 +28716,8 @@
PS=":" ;;
Windows* )
PS=";" ;;
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-01-14 01:45:57.000000000 -0800
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2009-06-06 17:27:25.000000000 -0700
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-01-21 01:46:14.000000000 -0800
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-01-22 22:04:47.000000000 -0800
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -28735,8 +28727,8 @@
Windows* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-01-14 01:45:57.000000000 -0800
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2009-06-06 17:27:25.000000000 -0700
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-01-21 01:46:14.000000000 -0800
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-01-22 22:04:47.000000000 -0800
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -28746,8 +28738,8 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-01-14 01:45:57.000000000 -0800
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2009-06-06 17:27:25.000000000 -0700
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-01-21 01:46:14.000000000 -0800
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-01-22 22:04:47.000000000 -0800
@@ -49,7 +49,7 @@
OS=`uname -s`
@@ -28757,8 +28749,8 @@
PATHSEP=":"
;;
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-01-14 01:45:58.000000000 -0800
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2009-06-06 17:27:26.000000000 -0700
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-01-21 01:46:15.000000000 -0800
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-01-22 22:04:48.000000000 -0800
@@ -35,11 +35,7 @@
OS=`uname -s`
@@ -28772,8 +28764,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-01-14 01:45:58.000000000 -0800
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2009-06-06 17:27:26.000000000 -0700
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-01-21 01:46:15.000000000 -0800
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-01-22 22:04:48.000000000 -0800
@@ -61,10 +61,7 @@
while true; do
echo "Run $i: TestSystemLoadAvg"
@@ -28786,8 +28778,8 @@
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-01-14 01:45:58.000000000 -0800
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-01-21 01:46:15.000000000 -0800
++++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-01-22 22:04:48.000000000 -0800
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -28797,8 +28789,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-01-14 01:45:58.000000000 -0800
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-01-21 01:46:15.000000000 -0800
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-01-22 22:04:48.000000000 -0800
@@ -27,11 +27,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -28812,8 +28804,8 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-01-14 01:45:58.000000000 -0800
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-01-21 01:46:15.000000000 -0800
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-01-22 22:04:49.000000000 -0800
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -28823,8 +28815,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh 2010-01-14 01:45:59.000000000 -0800
-+++ ./jdk/test/java/net/URL/B5086147.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/net/URL/B5086147.sh 2010-01-21 01:46:15.000000000 -0800
++++ ./jdk/test/java/net/URL/B5086147.sh 2010-01-22 22:04:49.000000000 -0800
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -28834,8 +28826,8 @@
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh 2010-01-14 01:45:59.000000000 -0800
-+++ ./jdk/test/java/net/URL/runconstructor.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/net/URL/runconstructor.sh 2010-01-21 01:46:16.000000000 -0800
++++ ./jdk/test/java/net/URL/runconstructor.sh 2010-01-22 22:04:49.000000000 -0800
@@ -27,7 +27,7 @@
#
OS=`uname -s`
@@ -28845,8 +28837,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-01-14 01:45:59.000000000 -0800
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-01-21 01:46:16.000000000 -0800
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-01-22 22:04:49.000000000 -0800
@@ -34,11 +34,7 @@
OS=`uname -s`
@@ -28860,8 +28852,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-01-14 01:45:59.000000000 -0800
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-01-21 01:46:16.000000000 -0800
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-01-22 22:04:49.000000000 -0800
@@ -27,11 +27,7 @@
OS=`uname -s`
@@ -28875,8 +28867,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-01-14 01:45:59.000000000 -0800
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-01-21 01:46:16.000000000 -0800
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-01-22 22:04:49.000000000 -0800
@@ -33,11 +33,7 @@
OS=`uname -s`
@@ -28890,8 +28882,8 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-01-14 01:45:59.000000000 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2009-06-06 17:27:29.000000000 -0700
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-01-21 01:46:16.000000000 -0800
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-01-22 22:04:50.000000000 -0800
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
endif
@@ -28941,9 +28933,9 @@
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
-Files /tmp/openjdk_srcdir.6CupRGez/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-01-14 01:45:59.000000000 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2009-06-06 17:27:29.000000000 -0700
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /tmp/openjdk_portdir.Bd7xXXyx/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-01-21 01:46:16.000000000 -0800
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-01-22 22:04:50.000000000 -0800
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -29012,8 +29004,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-01-14 01:46:00.000000000 -0800
-+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2009-06-06 17:27:31.000000000 -0700
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-01-21 01:46:17.000000000 -0800
++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-01-22 22:04:52.000000000 -0800
@@ -84,14 +84,12 @@
@@ -29033,8 +29025,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
export PATH_SEP
mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-01-14 01:46:01.000000000 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-01-21 01:46:18.000000000 -0800
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-01-22 22:04:53.000000000 -0800
@@ -46,11 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29048,8 +29040,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-01-14 01:46:01.000000000 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2009-09-07 11:25:52.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-01-21 01:46:18.000000000 -0800
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-01-22 22:04:53.000000000 -0800
@@ -34,11 +34,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29063,8 +29055,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-01-14 01:46:01.000000000 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2009-09-07 11:25:53.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-01-21 01:46:18.000000000 -0800
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-01-22 22:04:53.000000000 -0800
@@ -46,11 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29078,8 +29070,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-01-14 01:46:01.000000000 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2009-09-07 11:25:53.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-01-21 01:46:18.000000000 -0800
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-01-22 22:04:53.000000000 -0800
@@ -46,11 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29093,8 +29085,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-01-14 01:46:02.000000000 -0800
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2009-06-06 17:27:34.000000000 -0700
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-01-21 01:46:18.000000000 -0800
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-01-22 22:04:54.000000000 -0800
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29104,8 +29096,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-01-14 01:46:02.000000000 -0800
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2009-06-06 17:27:35.000000000 -0700
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-01-21 01:46:19.000000000 -0800
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-01-22 22:04:54.000000000 -0800
@@ -58,7 +58,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29115,8 +29107,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-01-14 01:46:02.000000000 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2009-06-06 17:27:36.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-01-21 01:46:19.000000000 -0800
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-01-22 22:04:55.000000000 -0800
@@ -31,7 +31,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29126,8 +29118,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-01-14 01:46:02.000000000 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2009-06-06 17:27:36.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-01-21 01:46:19.000000000 -0800
++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-01-22 22:04:55.000000000 -0800
@@ -75,7 +75,7 @@
SunOS)
DEL=":"
@@ -29137,8 +29129,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
DEL=":"
HAS_S=YES
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-01-14 01:46:02.000000000 -0800
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2009-06-06 17:27:37.000000000 -0700
+--- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-01-21 01:46:19.000000000 -0800
++++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-01-22 22:04:55.000000000 -0800
@@ -42,9 +42,7 @@
OS=`uname -s`
@@ -29150,8 +29142,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-01-14 01:46:03.000000000 -0800
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2009-09-07 11:25:53.000000000 -0700
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-01-21 01:46:20.000000000 -0800
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-01-22 22:04:56.000000000 -0800
@@ -51,7 +51,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29161,772 +29153,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/print/DialogMargins.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/print/DialogMargins.java 2010-01-16 12:51:02.000000000 -0800
-@@ -0,0 +1,244 @@
-+/*
-+ * Copyright 2001-2010 Sun Microsystems, Inc. All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Sun designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Sun in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+/**
-+ * @test
-+ * @bug 4485755 6361370 6448717 5080051
-+ * @summary dialog doesn't have way to specify margins
-+ * for 6361370, verify exception for offline printer in Windows
-+ * for 6448717, faster display of print dialog
-+ * for 6500903, verify status of printer if accepting jobs or not
-+ * @author prr
-+ * @run main/manual DialogMargins
-+ */
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import java.awt.print.*;
-+import javax.print.*;
-+import javax.print.attribute.*;
-+import javax.print.attribute.standard.*;
-+
-+public class DialogMargins extends Frame {
-+
-+ public DialogMargins() {
-+ super("Dialog Margins Test");
-+
-+ Button printButton = new Button ("Print ...");
-+ add("Center", printButton);
-+ printButton.addActionListener(new ActionListener() {
-+ public void actionPerformed (ActionEvent e) {
-+ new MarginsPrinter();
-+ }
-+ });
-+
-+ addWindowListener (new WindowAdapter() {
-+ public void windowClosing (WindowEvent e) {
-+ dispose();
-+ }
-+
-+ });
-+
-+ pack();
-+ setVisible (true);
-+ }
-+
-+class MarginsPrinter implements Printable {
-+
-+ PrinterJob myPrinterJob;
-+ PageFormat myPageFormat;
-+
-+ public MarginsPrinter() {
-+ PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
-+ //aset.add(MediaSizeName.ISO_A4);
-+ //aset.add(new MediaPrintableArea(0f,0f,210f,297f,MediaPrintableArea.MM));
-+ myPrinterJob = PrinterJob.getPrinterJob();
-+ myPageFormat = myPrinterJob.pageDialog(aset);
-+ myPrinterJob.setPrintable(this, myPageFormat);
-+ //myPrinterJob.setPrintable(this);
-+ if (myPrinterJob.printDialog(aset)) {
-+ try {
-+ //PrintRequestAttributeSet newaset =
-+ //new HashPrintRequestAttributeSet();
-+ myPrinterJob.print(aset);
-+
-+ } catch (PrinterException pe ) {
-+ System.out.println("DialogMargins Exception caught:" + pe);
-+ }
-+ }
-+ }
-+
-+ public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) {
-+
-+ if (pageIndex > 0) {
-+ return Printable.NO_SUCH_PAGE;
-+ }
-+
-+ Graphics2D g2d = (Graphics2D)graphics;
-+ g2d.translate(pageFormat.getImageableX(), pageFormat.getImageableY());
-+ g2d.drawString("ORIGIN("+pageFormat.getImageableX()+","+
-+ pageFormat.getImageableY()+")", 20, 20);
-+ g2d.drawString("X THIS WAY", 200, 50);
-+ g2d.drawString("Y THIS WAY", 60 , 200);
-+ g2d.drawString("Graphics is " + g2d.getClass().getName(), 100, 100);
-+ g2d.drawRect(0,0,(int)pageFormat.getImageableWidth(),
-+ (int)pageFormat.getImageableHeight());
-+ g2d.setColor(Color.black);
-+ g2d.drawRect(1,1,(int)pageFormat.getImageableWidth()-2,
-+ (int)pageFormat.getImageableHeight()-2);
-+
-+ return Printable.PAGE_EXISTS;
-+ }
-+
-+}
-+ public static void main( String[] args) {
-+
-+ String[] instructions =
-+ {
-+ "You must have a printer available to perform this test",
-+ "Specify various pageformats and compare the printed results with the",
-+ "request."
-+ };
-+ Sysout.createDialog( );
-+ Sysout.printInstructions( instructions );
-+
-+ new DialogMargins();
-+ }
-+}
-+
-+
-+class Sysout {
-+ private static TestDialog dialog;
-+
-+ public static void createDialogWithInstructions( String[] instructions )
-+ {
-+ dialog = new TestDialog( new Frame(), "Instructions" );
-+ dialog.printInstructions( instructions );
-+ dialog.show();
-+ println( "Any messages for the tester will display here." );
-+ }
-+
-+ public static void createDialog( )
-+ {
-+ dialog = new TestDialog( new Frame(), "Instructions" );
-+ String[] defInstr = { "Instructions will appear here. ", "" } ;
-+ dialog.printInstructions( defInstr );
-+ dialog.show();
-+ println( "Any messages for the tester will display here." );
-+ }
-+
-+
-+ public static void printInstructions( String[] instructions )
-+ {
-+ dialog.printInstructions( instructions );
-+ }
-+
-+
-+ public static void println( String messageIn )
-+ {
-+ dialog.displayMessage( messageIn );
-+ }
-+
-+}// Sysout class
-+
-+/**
-+ This is part of the standard test machinery. It provides a place for the
-+ test instructions to be displayed, and a place for interactive messages
-+ to the user to be displayed.
-+ To have the test instructions displayed, see Sysout.
-+ To have a message to the user be displayed, see Sysout.
-+ Do not call anything in this dialog directly.
-+ */
-+class TestDialog extends Dialog {
-+
-+ TextArea instructionsText;
-+ TextArea messageText;
-+ int maxStringLength = 80;
-+
-+ //DO NOT call this directly, go through Sysout
-+ public TestDialog( Frame frame, String name )
-+ {
-+ super( frame, name );
-+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
-+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
-+ add( "North", instructionsText );
-+
-+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
-+ add("Center", messageText);
-+
-+ pack();
-+
-+ show();
-+ }// TestDialog()
-+
-+ //DO NOT call this directly, go through Sysout
-+ public void printInstructions( String[] instructions )
-+ {
-+ //Clear out any current instructions
-+ instructionsText.setText( "" );
-+
-+ //Go down array of instruction strings
-+
-+ String printStr, remainingStr;
-+ for( int i=0; i < instructions.length; i++ )
-+ {
-+ //chop up each into pieces maxSringLength long
-+ remainingStr = instructions[ i ];
-+ while( remainingStr.length() > 0 )
-+ {
-+ //if longer than max then chop off first max chars to print
-+ if( remainingStr.length() >= maxStringLength )
-+ {
-+ //Try to chop on a word boundary
-+ int posOfSpace = remainingStr.
-+ lastIndexOf( ' ', maxStringLength - 1 );
-+
-+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-+
-+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
-+ remainingStr = remainingStr.substring( posOfSpace + 1 );
-+ }
-+ //else just print
-+ else
-+ {
-+ printStr = remainingStr;
-+ remainingStr = "";
-+ }
-+
-+ instructionsText.append( printStr + "\n" );
-+
-+ }// while
-+
-+ }// for
-+
-+ }//printInstructions()
-+
-+ //DO NOT call this directly, go through Sysout
-+ public void displayMessage( String messageIn )
-+ {
-+ messageText.append( messageIn + "\n" );
-+ }
-+
-+ }// TestDialog class
---- ./jdk/test/javax/print/StreamPrintingOrientation.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/print/StreamPrintingOrientation.java 2010-01-16 12:51:02.000000000 -0800
-@@ -0,0 +1,120 @@
-+/*
-+ * Copyright 2003-2010 Sun Microsystems, Inc. All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation. Sun designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Sun in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 4904236
-+ * @summary You would see a cross-platform print dialog being popped up. Check whether orientation is shown as LANDSCAPE. Click 'OK'. 'streamexample.ps' will be created in the same dir where this application was executed. Pass if the orientation in the ps file is landscape.
-+ * @run main/manual StreamPrintingOrientation
-+ */
-+
-+import java.awt.*;
-+import java.awt.print.*;
-+import javax.print.*;
-+import javax.print.attribute.standard.*;
-+import javax.print.attribute.*;
-+import java.io.FileOutputStream;
-+import java.io.File;
-+import java.util.Locale;
-+
-+class StreamPrintingOrientation implements Printable {
-+ /**
-+ * Constructor
-+ */
-+ public StreamPrintingOrientation() {
-+ super();
-+ }
-+ /**
-+ * Starts the application.
-+ */
-+ public static void main(java.lang.String[] args) {
-+ StreamPrintingOrientation pd = new StreamPrintingOrientation();
-+ PrinterJob pj = PrinterJob.getPrinterJob();
-+ HashPrintRequestAttributeSet prSet = new HashPrintRequestAttributeSet();
-+ PrintService service = null;
-+
-+ FileOutputStream fos = null;
-+ File f = null, f1 = null;
-+ String mType = "application/postscript";
-+
-+ try {
-+ f = new File("streamexample.ps");
-+ fos = new FileOutputStream(f);
-+ StreamPrintServiceFactory[] factories = PrinterJob.lookupStreamPrintServices(mType);
-+ if (factories.length > 0)
-+ service = factories[0].getPrintService(fos);
-+
-+ if (service != null) {
-+ System.out.println("Stream Print Service "+service);
-+ pj.setPrintService(service);
-+ } else {
-+ throw new RuntimeException("No stream Print Service available.");
-+ }
-+ } catch (Exception e) {
-+ e.printStackTrace();
-+ }
-+
-+ pj.setPrintable(pd);
-+ prSet.add(OrientationRequested.LANDSCAPE);
-+ prSet.add(new Copies(3));
-+ prSet.add(new JobName("orientation test", null));
-+ System.out.println("open PrintDialog..");
-+ if (pj.printDialog(prSet)) {
-+ try {
-+ System.out.println("\nValues in attr set passed to print method");
-+ Attribute attr[] = prSet.toArray();
-+ for (int x = 0; x < attr.length; x ++) {
-+ System.out.println("Name "+attr[x].getName()+" "+attr[x]);
-+ }
-+ System.out.println("About to print the data ...");
-+ if (service != null) {
-+ System.out.println("TEST: calling Print");
-+ pj.print(prSet);
-+ System.out.println("TEST: Printed");
-+ }
-+ }
-+ catch (PrinterException pe) {
-+ pe.printStackTrace();
-+ }
-+ }
-+
-+ }
-+
-+ //printable interface
-+ public int print(Graphics g, PageFormat pf, int pi) throws PrinterException {
-+
-+ if (pi > 0) {
-+ return Printable.NO_SUCH_PAGE;
-+ }
-+ // Simply draw two rectangles
-+ Graphics2D g2 = (Graphics2D)g;
-+ g2.setColor(Color.black);
-+ g2.translate(pf.getImageableX(), pf.getImageableY());
-+ System.out.println("StreamPrinting Test Width "+pf.getWidth()+" Height "+pf.getHeight());
-+ g2.drawRect(1,1,200,300);
-+ g2.drawRect(1,1,25,25);
-+ return Printable.PAGE_EXISTS;
-+ }
-+}
---- ./jdk/test/javax/print/attribute/AttributeTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/print/attribute/AttributeTest.java 2010-01-16 12:51:02.000000000 -0800
-@@ -0,0 +1,70 @@
-+/*
-+ * Copyright 2006-2010 Sun Microsystems, Inc. All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+/*
-+ * @test
-+ * @bug 6387255
-+ * @summary Tests conflict of Media values returned by isAttrValueSupported and getSupportedAttrValues. No runtime exception should be thrown.
-+ * @run main AttributeTest
-+ */
-+import javax.print.*;
-+import javax.print.attribute.standard.*;
-+import javax.print.attribute.*;
-+
-+public class AttributeTest {
-+
-+ public AttributeTest() {
-+
-+ PrintService service[] = PrintServiceLookup.lookupPrintServices(null, null);
-+
-+ if (service.length == 0) {
-+ throw new RuntimeException("No printer found. TEST ABORTED");
-+ }
-+
-+ for (int x = 0; x < service.length; x ++) {
-+ DocFlavor flavors[] = service[x].getSupportedDocFlavors();
-+
-+ for (int y = 0; y < flavors.length; y ++) {
-+ Object attrVal = service[x].getSupportedAttributeValues(Media.class, flavors[y], null);
-+ if (attrVal == null) {
-+ continue;
-+ }
-+ Media attr[] = (Media[]) attrVal;
-+ for (int z = 0; z < attr.length; z ++) {
-+ if (!service[x].isAttributeValueSupported(attr[z], flavors[y], null)) {
-+ throw new RuntimeException("ERROR: There is a conflict between getSupportedAttrValues " +
-+ " and isAttributeValueSupported, for the attribute: " + attr[z] +
-+ ", where the flavor is: " + flavors[y] + " and the print service is: " +
-+ service[x] + "\n");
-+ }
-+ }
-+ }
-+ }
-+
-+ System.out.println("Test Passed");
-+ }
-+
-+ public static void main (String args[]) {
-+ AttributeTest test = new AttributeTest();
-+ }
-+}
---- ./jdk/test/javax/print/attribute/ServiceDialogTest.java 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/test/javax/print/attribute/ServiceDialogTest.java 2010-01-16 12:51:02.000000000 -0800
-@@ -0,0 +1,307 @@
-+/*
-+ * Copyright 2004-2009 Sun Microsystems, Inc. All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+
-+/**
-+ * @test
-+ * @bug 4910388 4871089 4998624
-+ * @summary Confirm that
-+ * 1. After choosing Reverse Landscape in the system default print
-+ * Print Service (2nd in the list), it
-+ * will reset to portrait in "Test Printer"
-+ * 2. Print To File button is not cleared when switching between the
-+ * 2nd service (system default printer) and Test Printer.
-+ * 3. Make sure "Postscript" printer is the default and make sure the
-+ * "print to file" button is disabled. File Dialog should not be
-+ * shown after pressing print button.
-+ *
-+ * @run main/manual ServiceDialogTest
-+ */
-+import java.awt.*;
-+import javax.print.*;
-+import javax.print.attribute.standard.*;
-+import javax.print.attribute.*;
-+import javax.print.event.*;
-+import java.io.*;
-+import java.util.Locale;
-+
-+public class ServiceDialogTest {
-+ /**
-+ * Constructor
-+ */
-+ public ServiceDialogTest() {
-+ super();
-+ }
-+ /**
-+ * Starts the application.
-+ */
-+ public static void main(java.lang.String[] args) {
-+ ServiceDialogTest pd = new ServiceDialogTest();
-+ PrintService services[] = new PrintService[3];
-+ services[1] = PrintServiceLookup.lookupDefaultPrintService();
-+
-+ FileOutputStream fos = null;
-+ File f = null;
-+ String mType = "application/postscript";
-+ DocFlavor flavor = DocFlavor.INPUT_STREAM.JPEG;
-+ try {
-+ f = new File("streamexample.ps");
-+ fos = new FileOutputStream(f);
-+ StreamPrintServiceFactory[] factories = StreamPrintServiceFactory.lookupStreamPrintServiceFactories(flavor, mType);
-+ if (factories.length > 0) {
-+ services[0] = factories[0].getPrintService(fos);
-+ } else {
-+ throw new RuntimeException("No StreamPrintService available which would support "+flavor");
-+ }
-+
-+ services[2] = new TestPrintService("Test Printer");
-+
-+ //System.out.println("is "+flavor+" supported? "+services[0].isDocFlavorSupported(flavor));
-+ //System.out.println("is Orientation supported? "+services[0].isAttributeCategorySupported(OrientationRequested.class));
-+ //System.out.println("is REVERSE PORTRAIT supported ? "+services[0].isAttributeValueSupported(OrientationRequested.REVERSE_PORTRAIT, flavor, null));
-+
-+ HashPrintRequestAttributeSet prSet = new HashPrintRequestAttributeSet();
-+ prSet.add(new Destination(new File("./dest.prn").toURI()));
-+ PrintService selService = ServiceUI.printDialog(null, 200, 200, services, services[0], flavor, prSet);
-+ Attribute attr[] = prSet.toArray();
-+ for (int x = 0; x < attr.length; x ++) {
-+ System.out.println(attr[x]);
-+ }
-+
-+ //DocPrintJob pj = service.createPrintJob();
-+ //PrintDocument prDoc = new PrintDocument();
-+ //pj.print(prDoc, null);
-+
-+ } catch (Exception e) {
-+ e.printStackTrace();
-+ }
-+ }
-+}
-+
-+
-+class TestPrintService implements PrintService
-+{
-+
-+ private static DocFlavor textByteFlavor = null;
-+ private static final DocFlavor supportedDocFlavors[] = (new DocFlavor[] {
-+ javax.print.DocFlavor.INPUT_STREAM.JPEG
-+ });
-+
-+ private static final Class serviceAttrCats[] = (new Class[] {
-+ javax.print.attribute.standard.PrinterName.class
-+ });
-+
-+ private static final Class otherAttrCats[] = (new Class [] {
-+ javax.print.attribute.standard.Copies.class,
-+ javax.print.attribute.standard.OrientationRequested.class,
-+ javax.print.attribute.standard.Destination.class,
-+ });
-+
-+ private String printer = null;
-+
-+ public TestPrintService() {
-+ }
-+
-+ public TestPrintService(String printerName) {
-+ if (printerName == null) {
-+ throw new IllegalArgumentException("null printer name");
-+ } else {
-+ printer = printerName;
-+ }
-+ }
-+
-+ public String getName()
-+ {
-+ return printer;
-+ }
-+
-+
-+ public DocPrintJob createPrintJob()
-+ {
-+ return null;
-+ }
-+
-+ public PrintServiceAttributeSet getUpdatedAttributes()
-+ {
-+ return null;
-+ }
-+
-+
-+ public void addPrintServiceAttributeListener(PrintServiceAttributeListener printserviceattributelistener)
-+ {
-+ }
-+
-+ public void removePrintServiceAttributeListener(PrintServiceAttributeListener printserviceattributelistener)
-+ {
-+ }
-+
-+ public PrintServiceAttribute getAttribute(Class category)
-+ {
-+ return null;
-+ }
-+
-+ public PrintServiceAttributeSet getAttributes()
-+ {
-+ HashPrintServiceAttributeSet aSet = new HashPrintServiceAttributeSet();
-+ return aSet;
-+ }
-+
-+ public DocFlavor[] getSupportedDocFlavors()
-+ {
-+ int i = supportedDocFlavors.length;
-+ DocFlavor adocflavor[] = new DocFlavor[i];
-+ System.arraycopy(supportedDocFlavors, 0, adocflavor, 0, i);
-+ return adocflavor;
-+ }
-+
-+ public boolean isDocFlavorSupported(DocFlavor docflavor)
-+ {
-+ for (int i = 0; i < supportedDocFlavors.length; i++) {
-+ if (docflavor.equals(supportedDocFlavors[i])) {
-+ return true;
-+ }
-+ }
-+ return false;
-+ }
-+
-+ public Class[] getSupportedAttributeCategories()
-+ {
-+ int i = otherAttrCats.length;
-+ Class aclass[] = new Class[i];
-+ System.arraycopy(otherAttrCats, 0, aclass, 0, otherAttrCats.length);
-+ return aclass;
-+ }
-+
-+ public boolean isAttributeCategorySupported(Class category)
-+ {
-+ if (category == null) {
-+ throw new NullPointerException("null category");
-+ }
-+
-+ for (int i = 0; i < otherAttrCats.length; i++) {
-+ if (category == otherAttrCats[i]) {
-+ return true;
-+ }
-+ }
-+ return false;
-+ }
-+
-+ public boolean isAttributeValueSupported(Attribute attrval, DocFlavor flavor, AttributeSet attributes) {
-+
-+ if (attrval == OrientationRequested.PORTRAIT)
-+ return true;
-+ else if (attrval == OrientationRequested.LANDSCAPE)
-+ return true;
-+ else
-+ return false;
-+ }
-+
-+ public Object getDefaultAttributeValue(Class category)
-+ {
-+ if (category == null) {
-+ throw new NullPointerException("null category");
-+ }
-+ if (category == javax.print.attribute.standard.Copies.class)
-+ return new Copies(1);
-+
-+ if (category == javax.print.attribute.standard.OrientationRequested.class)
-+ return OrientationRequested.PORTRAIT;
-+
-+ return null;
-+ }
-+
-+ public Object getSupportedAttributeValues(Class category, DocFlavor docflavor, AttributeSet attributeset)
-+ {
-+ if (category == null) {
-+ throw new NullPointerException("null category");
-+ }
-+
-+ if (docflavor != null) {
-+ if (!isDocFlavorSupported(docflavor)) {
-+ throw new IllegalArgumentException(docflavor + " is an unsupported flavor");
-+ }
-+ }
-+ if (!isAttributeCategorySupported(category)) {
-+ return null;
-+ }
-+ if (category == javax.print.attribute.standard.Copies.class ) {
-+ return new CopiesSupported(1, 5);
-+ }
-+ if (category == javax.print.attribute.standard.OrientationRequested.class ) {
-+ OrientationRequested req[] = { OrientationRequested.PORTRAIT, OrientationRequested.LANDSCAPE };
-+ return req;
-+ }
-+
-+ return null;
-+ }
-+
-+ public AttributeSet getUnsupportedAttributes(DocFlavor docflavor, AttributeSet attributeset) {
-+
-+ if (docflavor != null && !isDocFlavorSupported(docflavor)) {
-+ throw new IllegalArgumentException("flavor " + docflavor + "is not supported");
-+ }
-+ if (attributeset == null) {
-+ return null;
-+ }
-+
-+ HashAttributeSet hashattributeset = new HashAttributeSet();
-+ Attribute attributearray[] = attributeset.toArray();
-+ for (int i = 0; i < attributearray.length; i++) {
-+ try {
-+ Attribute attribute = attributearray[i];
-+ if (!isAttributeCategorySupported(attribute.getCategory())) {
-+ hashattributeset.add(attribute);
-+ } else {
-+ if (!isAttributeValueSupported(attribute, docflavor, attributeset)) {
-+ hashattributeset.add(attribute);
-+ }
-+ }
-+ }
-+ catch (ClassCastException classcastexception) {
-+
-+ }
-+ }
-+
-+ if (hashattributeset.isEmpty()) {
-+ return null;
-+ }
-+ return hashattributeset;
-+ }
-+
-+ public ServiceUIFactory getServiceUIFactory() {
-+ return null;
-+ }
-+
-+ public String toString() {
-+ return "Printer : " + getName();
-+ }
-+
-+ public boolean equals(Object obj) {
-+ return obj == this || (obj instanceof TestPrintService) && ((TestPrintService)obj).getName().equals(getName());
-+ }
-+
-+ public int hashCode() {
-+ return getClass().hashCode() + getName().hashCode();
-+ }
-+
-+}
---- ./jdk/test/javax/print/attribute/SidesPageRangesTest.java 2010-01-14 01:46:04.000000000 -0800
-+++ ./jdk/test/javax/print/attribute/SidesPageRangesTest.java 2010-01-16 12:51:02.000000000 -0800
-@@ -64,7 +64,7 @@
- System.out.println("\nPageRanges Attribute category is supported");
- } else {
- System.out.println("\nPageRanges Attribute category is not supported. terminating...");
-- System.exit(1);
-+ return;
- }
-
- flavors = defService.getSupportedDocFlavors();
---- ./jdk/test/javax/script/CommonSetup.sh 2010-01-14 01:46:04.000000000 -0800
-+++ ./jdk/test/javax/script/CommonSetup.sh 2009-06-06 17:27:41.000000000 -0700
+--- ./jdk/test/javax/script/CommonSetup.sh 2010-01-21 01:46:20.000000000 -0800
++++ ./jdk/test/javax/script/CommonSetup.sh 2010-01-22 22:04:57.000000000 -0800
@@ -36,11 +36,7 @@
OS=`uname -s`
@@ -29940,8 +29168,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-01-14 01:46:04.000000000 -0800
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2009-09-07 11:25:53.000000000 -0700
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-01-21 01:46:21.000000000 -0800
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-01-22 22:04:57.000000000 -0800
@@ -33,12 +33,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -29956,8 +29184,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/jprt.config 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/jprt.config 2009-06-06 17:27:44.000000000 -0700
+--- ./jdk/test/jprt.config 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/jprt.config 2010-01-22 22:04:59.000000000 -0800
@@ -71,8 +71,8 @@
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -30025,8 +29253,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
# Export PATH setting
PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2009-09-07 11:25:53.000000000 -0700
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-01-22 22:04:59.000000000 -0800
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30036,8 +29264,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2009-06-06 17:27:45.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-01-22 22:05:00.000000000 -0800
@@ -45,37 +45,50 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
#{
@@ -30114,8 +29342,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
#
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2009-06-06 17:27:45.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-01-22 22:05:00.000000000 -0800
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -30125,8 +29353,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2009-06-06 17:27:45.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-01-22 22:05:00.000000000 -0800
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -30144,8 +29372,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2009-06-06 17:27:45.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-01-22 22:05:00.000000000 -0800
@@ -70,10 +70,12 @@
# security the password file.
@@ -30163,8 +29391,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
# Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2009-06-06 17:27:45.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-01-22 22:05:00.000000000 -0800
@@ -69,10 +69,12 @@
# security the password file.
@@ -30182,9 +29410,9 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/java/nio/channels/spi/Select
# Create management and SSL configuration files
-Files /tmp/openjdk_srcdir.6CupRGez/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-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2009-06-06 17:27:46.000000000 -0700
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
+--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-01-22 22:05:00.000000000 -0800
@@ -36,11 +36,7 @@
OS=`uname -s`
@@ -30198,8 +29426,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2009-09-07 11:25:53.000000000 -0700
+--- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-01-22 22:05:00.000000000 -0800
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -30209,8 +29437,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2009-09-07 11:25:53.000000000 -0700
+--- ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-01-22 22:05:00.000000000 -0800
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -30220,8 +29448,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-01-14 01:46:06.000000000 -0800
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-01-22 22:05:01.000000000 -0800
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -30231,8 +29459,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-01-14 01:46:07.000000000 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-01-22 22:05:01.000000000 -0800
@@ -31,11 +31,7 @@
OS=`uname -s`
@@ -30246,8 +29474,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-01-14 01:46:07.000000000 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2009-09-07 12:42:19.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-01-21 01:46:22.000000000 -0800
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-01-22 22:05:01.000000000 -0800
@@ -31,11 +31,7 @@
OS=`uname -s`
@@ -30261,7 +29489,7 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-01-17 13:42:34.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,79 +0,0 @@
-/*
@@ -30343,7 +29571,7 @@ Files /tmp/openjdk_srcdir.6CupRGez/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-01-17 13:42:34.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-01-22 22:23:38.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,70 +0,0 @@
-/*
@@ -30416,8 +29644,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
- }
- }
-}
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-01-14 01:46:08.000000000 -0800
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2009-06-06 17:27:48.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-01-21 01:46:24.000000000 -0800
++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-01-22 22:05:05.000000000 -0800
@@ -131,6 +131,27 @@
;;
esac
@@ -30446,8 +29674,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-01-14 01:46:08.000000000 -0800
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2009-06-06 17:27:48.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-01-21 01:46:24.000000000 -0800
++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-01-22 22:05:06.000000000 -0800
@@ -92,6 +92,27 @@
;;
esac
@@ -30476,8 +29704,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-01-14 01:46:09.000000000 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-01-21 01:46:24.000000000 -0800
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-01-22 22:05:06.000000000 -0800
@@ -50,13 +50,7 @@
OS=`uname -s`
@@ -30493,8 +29721,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-01-14 01:46:09.000000000 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-01-21 01:46:24.000000000 -0800
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-01-22 22:05:06.000000000 -0800
@@ -51,13 +51,7 @@
OS=`uname -s`
@@ -30510,23 +29738,23 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-Files /tmp/openjdk_srcdir.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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.6CupRGez/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-01-14 01:46:10.000000000 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2009-06-06 17:27:56.000000000 -0700
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
+Files /tmp/openjdk_srcdir.ECNdR1KN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /tmp/openjdk_portdir.Bd7xXXyx/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-01-21 01:46:25.000000000 -0800
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-01-22 22:05:09.000000000 -0800
@@ -44,11 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30540,8 +29768,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-01-14 01:46:10.000000000 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-01-21 01:46:25.000000000 -0800
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-01-22 22:05:09.000000000 -0800
@@ -47,11 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30555,8 +29783,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/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-01-14 01:46:11.000000000 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2009-09-07 11:40:11.000000000 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-01-22 22:05:09.000000000 -0800
@@ -42,7 +42,7 @@
OS=`uname -s`
@@ -30566,8 +29794,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FILESEP="/"
PATHSEP=":"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-01-14 01:46:11.000000000 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-01-22 22:05:10.000000000 -0800
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -30577,8 +29805,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-01-14 01:46:11.000000000 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-01-22 22:05:10.000000000 -0800
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -30588,8 +29816,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30599,8 +29827,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30610,8 +29838,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-01-22 22:05:10.000000000 -0800
@@ -42,7 +42,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30621,8 +29849,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30632,8 +29860,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-01-22 22:05:10.000000000 -0800
@@ -47,11 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30647,8 +29875,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-01-22 22:05:10.000000000 -0800
@@ -45,7 +45,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30658,8 +29886,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30669,8 +29897,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-01-22 22:05:10.000000000 -0800
@@ -72,6 +72,27 @@
;;
esac
@@ -30699,8 +29927,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/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-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30710,8 +29938,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2009-09-07 11:25:54.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-01-22 22:05:10.000000000 -0800
@@ -37,7 +37,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30721,8 +29949,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2009-09-07 11:25:55.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/resource.sh 2010-01-22 22:05:10.000000000 -0800
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30732,8 +29960,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
FS="/"
TMP=/tmp
---- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2009-09-07 12:43:41.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/keytool/standard.sh 2010-01-22 22:05:10.000000000 -0800
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30743,8 +29971,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-01-22 22:05:10.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30754,8 +29982,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30765,8 +29993,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30776,8 +30004,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-01-22 22:05:10.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30787,8 +30015,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30798,8 +30026,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30809,8 +30037,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-01-22 22:05:10.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30820,8 +30048,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2009-06-06 17:27:58.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-01-22 22:05:10.000000000 -0800
@@ -53,7 +53,7 @@
OS=`uname -s`
@@ -30831,8 +30059,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-01-14 01:46:12.000000000 -0800
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2009-12-20 19:51:00.000000000 -0800
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-01-21 01:46:26.000000000 -0800
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-01-22 22:05:10.000000000 -0800
@@ -54,7 +54,7 @@
OS=`uname -s`
@@ -30842,8 +30070,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-01-14 01:46:13.000000000 -0800
-+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2009-06-06 17:28:00.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-01-21 01:46:27.000000000 -0800
++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-01-22 22:05:11.000000000 -0800
@@ -33,7 +33,7 @@
case `uname -s` in
@@ -30853,8 +30081,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
esac
N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-01-14 01:46:13.000000000 -0800
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2009-06-06 17:28:00.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-01-21 01:46:27.000000000 -0800
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-01-22 22:05:11.000000000 -0800
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -30864,8 +30092,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/tools/pack200/Pack200Simple.sh 2010-01-14 01:46:13.000000000 -0800
-+++ ./jdk/test/tools/pack200/Pack200Simple.sh 2009-06-06 17:28:00.000000000 -0700
+--- ./jdk/test/tools/pack200/Pack200Simple.sh 2010-01-21 01:46:27.000000000 -0800
++++ ./jdk/test/tools/pack200/Pack200Simple.sh 2010-01-22 22:05:11.000000000 -0800
@@ -85,7 +85,7 @@
break
;;
@@ -30875,19 +30103,19 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PackOptions="-J-Xmx512m -J-ea"
break
;;
---- ./langtools/.hgtags 2010-01-14 01:46:32.000000000 -0800
-+++ ./langtools/.hgtags 2010-01-16 12:51:20.000000000 -0800
-@@ -53,3 +53,4 @@
- 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
+--- ./langtools/.hgtags 2010-01-21 01:46:45.000000000 -0800
++++ ./langtools/.hgtags 2010-01-22 22:10:38.000000000 -0800
+@@ -54,3 +54,4 @@
0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
-+ac5b4c5644ce54585e5287563dde2b006fa664f4 jdk7-b79
---- ./langtools/.jcheck/conf 2010-01-14 01:46:32.000000000 -0800
+ ac5b4c5644ce54585e5287563dde2b006fa664f4 jdk7-b79
++f0074aa48d4e2a4c03c92b9c4f880679fea0306c jdk7-b80
+--- ./langtools/.jcheck/conf 2010-01-21 01:46:45.000000000 -0800
+++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./langtools/test/Makefile 2010-01-14 01:46:34.000000000 -0800
-+++ ./langtools/test/Makefile 2009-09-23 21:29:29.000000000 -0700
+--- ./langtools/test/Makefile 2010-01-21 01:46:47.000000000 -0800
++++ ./langtools/test/Makefile 2010-01-22 22:10:40.000000000 -0800
@@ -20,6 +20,22 @@
ARCH=i586
endif
@@ -30931,8 +30159,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Root of all test results
TEST_OUTPUT_DIR = $(TEST_ROOT)/o_$(PLATFORM)-$(ARCH)
---- ./langtools/test/jprt.config 2010-01-14 01:46:35.000000000 -0800
-+++ ./langtools/test/jprt.config 2009-06-06 17:29:59.000000000 -0700
+--- ./langtools/test/jprt.config 2010-01-21 01:46:48.000000000 -0800
++++ ./langtools/test/jprt.config 2010-01-22 22:10:42.000000000 -0800
@@ -71,8 +71,8 @@
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -31000,8 +30228,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Export PATH setting
PATH="${path4sdk}"
---- ./langtools/test/tools/javac/4846262/Test.sh 2010-01-14 01:46:35.000000000 -0800
-+++ ./langtools/test/tools/javac/4846262/Test.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/4846262/Test.sh 2010-01-21 01:46:49.000000000 -0800
++++ ./langtools/test/tools/javac/4846262/Test.sh 2010-01-22 22:10:42.000000000 -0800
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31011,8 +30239,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-01-14 01:46:35.000000000 -0800
-+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-01-21 01:46:49.000000000 -0800
++++ ./langtools/test/tools/javac/6302184/T6302184.sh 2010-01-22 22:10:43.000000000 -0800
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31022,8 +30250,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-01-14 01:46:36.000000000 -0800
-+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-01-21 01:46:49.000000000 -0800
++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-01-22 22:10:43.000000000 -0800
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31033,8 +30261,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-01-14 01:46:36.000000000 -0800
-+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-01-21 01:46:49.000000000 -0800
++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-01-22 22:10:44.000000000 -0800
@@ -54,7 +54,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31044,8 +30272,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/MissingInclude.sh 2010-01-14 01:46:36.000000000 -0800
-+++ ./langtools/test/tools/javac/MissingInclude.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/MissingInclude.sh 2010-01-21 01:46:50.000000000 -0800
++++ ./langtools/test/tools/javac/MissingInclude.sh 2010-01-22 22:10:44.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31055,8 +30283,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-01-14 01:46:37.000000000 -0800
-+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-01-21 01:46:50.000000000 -0800
++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-01-22 22:10:44.000000000 -0800
@@ -52,7 +52,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31066,8 +30294,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-01-14 01:46:37.000000000 -0800
-+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-01-21 01:46:50.000000000 -0800
++++ ./langtools/test/tools/javac/T5090006/compiler.sh 2010-01-22 22:10:44.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31077,8 +30305,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/apt.sh 2010-01-14 01:46:37.000000000 -0800
-+++ ./langtools/test/tools/javac/apt.sh 2009-06-06 17:30:04.000000000 -0700
+--- ./langtools/test/tools/javac/apt.sh 2010-01-21 01:46:51.000000000 -0800
++++ ./langtools/test/tools/javac/apt.sh 2010-01-22 22:10:45.000000000 -0800
@@ -38,7 +38,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31088,8 +30316,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-01-14 01:46:37.000000000 -0800
-+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-01-21 01:46:51.000000000 -0800
++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-01-22 22:10:46.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31099,8 +30327,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-01-14 01:46:38.000000000 -0800
-+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-01-21 01:46:51.000000000 -0800
++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-01-22 22:10:46.000000000 -0800
@@ -48,7 +48,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31110,8 +30338,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-01-14 01:46:39.000000000 -0800
-+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-01-21 01:46:52.000000000 -0800
++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-01-22 22:10:47.000000000 -0800
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31121,8 +30349,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh 2010-01-14 01:46:39.000000000 -0800
-+++ ./langtools/test/tools/javac/javazip/Test.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/javazip/Test.sh 2010-01-21 01:46:52.000000000 -0800
++++ ./langtools/test/tools/javac/javazip/Test.sh 2010-01-22 22:10:47.000000000 -0800
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31132,8 +30360,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
SCR=`pwd`
;;
---- ./langtools/test/tools/javac/links/links.sh 2010-01-14 01:46:39.000000000 -0800
-+++ ./langtools/test/tools/javac/links/links.sh 2009-06-06 17:30:08.000000000 -0700
+--- ./langtools/test/tools/javac/links/links.sh 2010-01-21 01:46:52.000000000 -0800
++++ ./langtools/test/tools/javac/links/links.sh 2010-01-22 22:10:48.000000000 -0800
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31143,8 +30371,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-01-14 01:46:39.000000000 -0800
-+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-01-21 01:46:52.000000000 -0800
++++ ./langtools/test/tools/javac/newlines/Newlines.sh 2010-01-22 22:10:48.000000000 -0800
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31154,8 +30382,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-01-14 01:46:39.000000000 -0800
-+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-01-21 01:46:53.000000000 -0800
++++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-01-22 22:10:48.000000000 -0800
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31165,8 +30393,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-01-14 01:46:40.000000000 -0800
-+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-01-21 01:46:53.000000000 -0800
++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-01-22 22:10:49.000000000 -0800
@@ -66,6 +66,17 @@
exit 0;
fi
@@ -31185,8 +30413,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/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-01-14 01:46:40.000000000 -0800
-+++ ./langtools/test/tools/javah/6257087/foo.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javah/6257087/foo.sh 2010-01-21 01:46:54.000000000 -0800
++++ ./langtools/test/tools/javah/6257087/foo.sh 2010-01-22 22:10:49.000000000 -0800
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31196,8 +30424,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-01-14 01:46:40.000000000 -0800
-+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-01-21 01:46:54.000000000 -0800
++++ ./langtools/test/tools/javah/ConstMacroTest.sh 2010-01-22 22:10:50.000000000 -0800
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31207,8 +30435,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-01-14 01:46:40.000000000 -0800
-+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2009-10-18 15:07:54.000000000 -0700
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-01-21 01:46:54.000000000 -0800
++++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-01-22 22:10:50.000000000 -0800
@@ -58,7 +58,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31218,8 +30446,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ReadOldClass.sh 2010-01-14 01:46:40.000000000 -0800
-+++ ./langtools/test/tools/javah/ReadOldClass.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javah/ReadOldClass.sh 2010-01-21 01:46:54.000000000 -0800
++++ ./langtools/test/tools/javah/ReadOldClass.sh 2010-01-22 22:10:50.000000000 -0800
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31229,8 +30457,8 @@ Files /tmp/openjdk_srcdir.6CupRGez/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javap/pathsep.sh 2010-01-14 01:46:40.000000000 -0800
-+++ ./langtools/test/tools/javap/pathsep.sh 2009-10-05 22:36:51.000000000 -0700
+--- ./langtools/test/tools/javap/pathsep.sh 2010-01-21 01:46:54.000000000 -0800
++++ ./langtools/test/tools/javap/pathsep.sh 2010-01-22 22:10:50.000000000 -0800
@@ -40,7 +40,7 @@
# set platform-dependent variables
OS=`uname -s`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 04:05:05 +0000