aboutsummaryrefslogtreecommitdiffstats
path: root/java/openjdk7/files
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2010-01-18 08:38:29 +0800
committerglewis <glewis@FreeBSD.org>2010-01-18 08:38:29 +0800
commit2d8cfe6d22a78b0b6ebee0a5157990162bd037a8 (patch)
tree0ae792b764ef9487ee74444f94473f86e18293f1 /java/openjdk7/files
parent663b7074b922e576cbf6b733207c1e290c55a224 (diff)
downloadfreebsd-ports-gnome-2d8cfe6d22a78b0b6ebee0a5157990162bd037a8.tar.gz
freebsd-ports-gnome-2d8cfe6d22a78b0b6ebee0a5157990162bd037a8.tar.zst
freebsd-ports-gnome-2d8cfe6d22a78b0b6ebee0a5157990162bd037a8.zip
. Update to Build 79.
Diffstat (limited to 'java/openjdk7/files')
-rw-r--r--java/openjdk7/files/patch-set2718
1 files changed, 1510 insertions, 1208 deletions
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
index c272eb61ced8..e9720c87904c 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,88 +1,26 @@
-diff -urN work/openjdk/.hgignore /tmp/openjdk7/.hgignore
---- ./.hgignore 2009-12-17 01:43:35.000000000 -0800
-+++ ./.hgignore 1969-12-31 16:00:00.000000000 -0800
-@@ -1,3 +0,0 @@
--^build/
--^dist/
--/nbproject/private/
-diff -urN work/openjdk/.hgtags /tmp/openjdk7/.hgtags
---- ./.hgtags 2009-12-17 01:43:35.000000000 -0800
-+++ ./.hgtags 1969-12-31 16:00:00.000000000 -0800
-@@ -1,54 +0,0 @@
--cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d jdk7-b24
--cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
--9410f77cc30c604d1caf7c9fe3a57fa19e1acbe8 jdk7-b26
--11b4dc9f2be3523ef989a0db8459eb56b3045c3a jdk7-b27
--56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28
--31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29
--2dab2f712e1832c92acfa63ec0337048b9422c20 jdk7-b30
--3300a35a0bd56d695b92fe0b34f03ebbfc939064 jdk7-b31
--64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32
--bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33
--46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34
--143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35
--4b4f5fea8d7d0743f0c30d91fcd9bf9d96e5d2ad jdk7-b36
--744554f5a3290e11c71cd2ddb1aff49e431f9ed0 jdk7-b37
--cc47a76899ed33a2c513cb688348244c9b5a1288 jdk7-b38
--ab523b49de1fc73fefe6855ce1e0349bdbd7af29 jdk7-b39
--44be42de6693063fb191989bf0e188de2fa51e7c jdk7-b40
--541bdc5ad32fc33255944d0a044ad992f3d915e8 jdk7-b41
--94052b87287303527125026fe4b2698cf867ea83 jdk7-b42
--848e684279d2ba42577d9621d5b2e5af3823d12d jdk7-b43
--a395e3aac4744cc9033fcd819fad1239a45add52 jdk7-b44
--99846f001ca214015578d593802d26e27246a802 jdk7-b45
--e8a2a4d187773a62f3309b0fa265c13425bc2258 jdk7-b46
--d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47
--4ae9f4bfdb98f65bd957e3fe72471b320150b38e jdk7-b48
--aee93a8992d2389121eb610c00a86196f3e2b9b0 jdk7-b49
--5111e13e44e542fe945b47ab154546daec36737d jdk7-b50
--0f0189d55ce4a1f7840da7582ac7d970b3b7ab15 jdk7-b51
--4264c2fe66493e57c411045a1b61377796641e45 jdk7-b52
--c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53
--2ef382b1bbd58a68e668391c6145a4b2066c5b96 jdk7-b54
--aea0ace7a1e43619800931d42bbf69c579361c2d jdk7-b55
--ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56
--ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
--59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
--030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
--39565502682c7085369bd09e51640919dc741097 jdk7-b60
--472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
--c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
--57f7e028c7ad1806500ae89eb3f4cd9a51b10e18 jdk7-b63
--269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
--e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
--6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
--c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
--e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
--82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
--175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
--4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
--0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
--3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
--2c88089b6e1c053597418099a14232182c387edc jdk7-b74
--d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
--c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
--1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
-diff -urN work/openjdk/.jcheck/conf /tmp/openjdk7/.jcheck/conf
---- ./.jcheck/conf 2009-12-17 01:43:35.000000000 -0800
+--- ./.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
+ 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
+ ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
++20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
+--- ./.jcheck/conf 2010-01-14 01:40:52.000000000 -0800
+++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
-diff -urN work/openjdk/corba/.hgtags /tmp/openjdk7/corba/.hgtags
---- ./corba/.hgtags 2009-12-17 01:43:42.000000000 -0800
-+++ ./corba/.hgtags 2009-12-20 19:49:46.000000000 -0800
-@@ -52,3 +52,4 @@
- 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75
+--- ./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
6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77
-+a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
-diff -urN work/openjdk/corba/.jcheck/conf /tmp/openjdk7/corba/.jcheck/conf
---- ./corba/.jcheck/conf 2009-12-17 01:43:42.000000000 -0800
+ a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78
++ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79
+--- ./corba/.jcheck/conf 2010-01-14 01:41:00.000000000 -0800
+++ ./corba/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
-diff -urN work/openjdk/corba/make/common/Defs-bsd.gmk /tmp/openjdk7/corba/make/common/Defs-bsd.gmk
---- ./corba/make/common/Defs-bsd.gmk 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -25,7 +25,7 @@
@@ -221,8 +159,7 @@ diff -urN work/openjdk/corba/make/common/Defs-bsd.gmk /tmp/openjdk7/corba/make/c
override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =
override THREADS_FLAG = native
-diff -urN work/openjdk/corba/make/common/Defs-linux.gmk /tmp/openjdk7/corba/make/common/Defs-linux.gmk
---- ./corba/make/common/Defs-linux.gmk 2009-12-17 01:43:43.000000000 -0800
+--- ./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
@@ -290,7 +290,7 @@
override LIBTHREAD =
@@ -233,8 +170,7 @@ diff -urN work/openjdk/corba/make/common/Defs-linux.gmk /tmp/openjdk7/corba/make
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
-diff -urN work/openjdk/corba/make/common/Defs.gmk /tmp/openjdk7/corba/make/common/Defs.gmk
---- ./corba/make/common/Defs.gmk 2009-12-17 01:43:43.000000000 -0800
+--- ./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
@@ -53,6 +53,28 @@
@@ -275,8 +211,7 @@ diff -urN work/openjdk/corba/make/common/Defs.gmk /tmp/openjdk7/corba/make/commo
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
-diff -urN work/openjdk/corba/make/common/Mapfile-vers.gmk /tmp/openjdk7/corba/make/common/Mapfile-vers.gmk
---- ./corba/make/common/Mapfile-vers.gmk 2009-12-17 01:43:43.000000000 -0800
+--- ./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
@@ -77,7 +77,7 @@
endif # PLATFORM
@@ -287,8 +222,7 @@ diff -urN work/openjdk/corba/make/common/Mapfile-vers.gmk /tmp/openjdk7/corba/ma
ifeq ($(VARIANT), OPT)
# OPT build MUST have a mapfile?
-diff -urN work/openjdk/corba/make/common/shared/Compiler-gcc.gmk /tmp/openjdk7/corba/make/common/shared/Compiler-gcc.gmk
---- ./corba/make/common/shared/Compiler-gcc.gmk 2009-12-17 01:43:43.000000000 -0800
+--- ./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
@@ -100,6 +100,23 @@
@@ -314,8 +248,7 @@ diff -urN work/openjdk/corba/make/common/shared/Compiler-gcc.gmk /tmp/openjdk7/c
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
-diff -urN work/openjdk/corba/make/common/shared/Compiler.gmk /tmp/openjdk7/corba/make/common/shared/Compiler.gmk
---- ./corba/make/common/shared/Compiler.gmk 2009-12-17 01:43:43.000000000 -0800
+--- ./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
@@ -42,6 +42,11 @@
override CC_VERSION = gcc
@@ -329,8 +262,7 @@ diff -urN work/openjdk/corba/make/common/shared/Compiler.gmk /tmp/openjdk7/corba
# Get the compiler specific settings
include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk
-diff -urN work/openjdk/corba/make/common/shared/Defs-bsd.gmk /tmp/openjdk7/corba/make/common/shared/Defs-bsd.gmk
---- ./corba/make/common/shared/Defs-bsd.gmk 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -54,7 +54,7 @@
endef
@@ -350,8 +282,7 @@ diff -urN work/openjdk/corba/make/common/shared/Defs-bsd.gmk /tmp/openjdk7/corba
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-diff -urN work/openjdk/corba/make/common/shared/Defs-utils.gmk /tmp/openjdk7/corba/make/common/shared/Defs-utils.gmk
---- ./corba/make/common/shared/Defs-utils.gmk 2009-12-17 01:43:43.000000000 -0800
+--- ./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
@@ -53,6 +53,13 @@
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
@@ -400,8 +331,7 @@ diff -urN work/openjdk/corba/make/common/shared/Defs-utils.gmk /tmp/openjdk7/cor
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif
-diff -urN work/openjdk/corba/make/common/shared/Platform.gmk /tmp/openjdk7/corba/make/common/shared/Platform.gmk
---- ./corba/make/common/shared/Platform.gmk 2009-12-17 01:43:43.000000000 -0800
+--- ./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
@@ -258,6 +258,101 @@
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
@@ -524,8 +454,7 @@ diff -urN work/openjdk/corba/make/common/shared/Platform.gmk /tmp/openjdk7/corba
REQUIRED_ZIP_VER = 2.2
REQUIRED_UNZIP_VER = 5.12
REQUIRED_MAKE_VER = 3.78
-diff -urN work/openjdk/corba/make/sun/corba/core/Makefile /tmp/openjdk7/corba/make/sun/corba/core/Makefile
---- ./corba/make/sun/corba/core/Makefile 2009-12-17 01:43:43.000000000 -0800
+--- ./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
@@ -53,11 +53,19 @@
ifdef STANDALONE_CORBA_WS
@@ -547,8 +476,7 @@ diff -urN work/openjdk/corba/make/sun/corba/core/Makefile /tmp/openjdk7/corba/ma
FILES_c = ioser.c
-diff -urN work/openjdk/corba/src/share/native/com/sun/corba/se/internal/io/ioser.c /tmp/openjdk7/corba/src/share/native/com/sun/corba/se/internal/io/ioser.c
---- ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2009-12-17 01:43:46.000000000 -0800
+--- ./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
@@ -24,6 +24,7 @@
*/
@@ -727,21 +655,18 @@ diff -urN work/openjdk/corba/src/share/native/com/sun/corba/se/internal/io/ioser
- return (jlong)fieldID;
+ return (jlong)(intptr_t)fieldID;
}
-diff -urN work/openjdk/hotspot/.hgtags /tmp/openjdk7/hotspot/.hgtags
---- ./hotspot/.hgtags 2009-12-17 01:44:19.000000000 -0800
-+++ ./hotspot/.hgtags 2009-12-20 19:49:53.000000000 -0800
-@@ -52,3 +52,4 @@
- d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
+--- ./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
455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
-+e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
-diff -urN work/openjdk/hotspot/.jcheck/conf /tmp/openjdk7/hotspot/.jcheck/conf
---- ./hotspot/.jcheck/conf 2009-12-17 01:44:19.000000000 -0800
+ e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
++a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
+--- ./hotspot/.jcheck/conf 2010-01-14 01:41:39.000000000 -0800
+++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
-diff -urN work/openjdk/hotspot/agent/make/Makefile /tmp/openjdk7/hotspot/agent/make/Makefile
---- ./hotspot/agent/make/Makefile 2009-12-17 01:44:19.000000000 -0800
+--- ./hotspot/agent/make/Makefile 2010-01-14 01:41:39.000000000 -0800
+++ ./hotspot/agent/make/Makefile 2009-06-06 16:53:52.000000000 -0700
@@ -52,6 +52,9 @@
sun.jvm.hotspot.compiler \
@@ -772,8 +697,7 @@ diff -urN work/openjdk/hotspot/agent/make/Makefile /tmp/openjdk7/hotspot/agent/m
sun/jvm/hotspot/debugger/cdbg/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c /tmp/openjdk7/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -22,6 +22,7 @@
*
@@ -914,8 +838,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c /tmp/openjdk7
#endif /* amd64 */
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/Makefile /tmp/openjdk7/hotspot/agent/src/os/bsd/Makefile
---- ./hotspot/agent/src/os/bsd/Makefile 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -19,10 +19,10 @@
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
@@ -995,7 +918,6 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/Makefile /tmp/openjdk7/hotspot/a
+ rm -f test.o
+ -rmdir $(ARCH)
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/StubDebuggerLocal.c /tmp/openjdk7/hotspot/agent/src/os/bsd/StubDebuggerLocal.c
--- ./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
@@ -0,0 +1,120 @@
@@ -1119,8 +1041,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/StubDebuggerLocal.c /tmp/openjdk
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+ return 0;
+}
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/elfmacros.h /tmp/openjdk7/hotspot/agent/src/os/bsd/elfmacros.h
---- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -25,16 +25,19 @@
#ifndef _ELFMACROS_H_
@@ -1157,7 +1078,6 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/elfmacros.h /tmp/openjdk7/hotspo
#endif
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/hsearch_r.c /tmp/openjdk7/hotspot/agent/src/os/bsd/hsearch_r.c
--- ./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
@@ -0,0 +1,217 @@
@@ -1378,7 +1298,6 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/hsearch_r.c /tmp/openjdk7/hotspo
+ *retval = NULL;
+ return 0;
+}
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/hsearch_r.h /tmp/openjdk7/hotspot/agent/src/os/bsd/hsearch_r.h
--- ./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
@@ -0,0 +1,42 @@
@@ -1424,8 +1343,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/hsearch_r.h /tmp/openjdk7/hotspo
+extern void hdestroy_r (struct hsearch_data *__htab);
+
+#endif /* _HSEARCH_R_H_ */
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/libproc.h /tmp/openjdk7/hotspot/agent/src/os/bsd/libproc.h
---- ./hotspot/agent/src/os/bsd/libproc.h 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -27,7 +27,8 @@
@@ -1487,8 +1405,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/libproc.h /tmp/openjdk7/hotspot/
// get number of shared objects
int get_num_libs(struct ps_prochandle* ph);
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/libproc_impl.c /tmp/openjdk7/hotspot/agent/src/os/bsd/libproc_impl.c
---- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -178,6 +178,9 @@
if (newlib->symtab == NULL) {
@@ -1584,8 +1501,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/libproc_impl.c /tmp/openjdk7/hot
+ print_debug("ps_pcontinue not implemented\n");
return PS_OK;
}
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/libproc_impl.h /tmp/openjdk7/hotspot/agent/src/os/bsd/libproc_impl.h
---- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -47,7 +47,7 @@
typedef struct thread_info {
@@ -1616,8 +1532,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/libproc_impl.h /tmp/openjdk7/hot
// 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
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/mapfile /tmp/openjdk7/hotspot/agent/src/os/bsd/mapfile
---- ./hotspot/agent/src/os/bsd/mapfile 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -43,13 +43,17 @@
# proc_service.h functions - to be used by libthread_db
@@ -1640,8 +1555,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/mapfile /tmp/openjdk7/hotspot/ag
# used by attach test program
init_libproc;
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/proc_service.h /tmp/openjdk7/hotspot/agent/src/os/bsd/proc_service.h
---- ./hotspot/agent/src/os/bsd/proc_service.h 2010-01-02 11:10:47.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/proc_service.h 2010-01-17 13:42:28.000000000 -0800
+++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,76 +0,0 @@
-/*
@@ -1720,8 +1634,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/proc_service.h /tmp/openjdk7/hot
-ps_err_e ps_get_thread_area();
-
-#endif /* _PROC_SERVICE_H_ */
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/ps_core.c /tmp/openjdk7/hotspot/agent/src/os/bsd/ps_core.c
---- ./hotspot/agent/src/os/bsd/ps_core.c 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -142,6 +142,7 @@
@@ -2020,8 +1933,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/ps_core.c /tmp/openjdk7/hotspot/
struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
if (ph == NULL) {
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/ps_proc.c /tmp/openjdk7/hotspot/agent/src/os/bsd/ps_proc.c
---- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -22,20 +22,22 @@
*
@@ -2586,8 +2498,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/ps_proc.c /tmp/openjdk7/hotspot/
- }
return ph;
}
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/salibelf.c /tmp/openjdk7/hotspot/agent/src/os/bsd/salibelf.c
---- ./hotspot/agent/src/os/bsd/salibelf.c 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -25,6 +25,7 @@
#include "salibelf.h"
@@ -2597,8 +2508,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/salibelf.c /tmp/openjdk7/hotspot
extern void print_debug(const char*,...);
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/symtab.c /tmp/openjdk7/hotspot/agent/src/os/bsd/symtab.c
---- ./hotspot/agent/src/os/bsd/symtab.c 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -23,10 +23,10 @@
*/
@@ -2664,8 +2574,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/symtab.c /tmp/openjdk7/hotspot/a
ELF_SYM *syms;
int j, n, rslt;
size_t size;
-diff -urN work/openjdk/hotspot/agent/src/os/bsd/test.c /tmp/openjdk7/hotspot/agent/src/os/bsd/test.c
---- ./hotspot/agent/src/os/bsd/test.c 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -44,7 +44,7 @@
}
@@ -2676,8 +2585,7 @@ diff -urN work/openjdk/hotspot/agent/src/os/bsd/test.c /tmp/openjdk7/hotspot/age
return 1;
}
}
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2009-12-17 01:44:20.000000000 -0800
+--- ./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
@@ -28,6 +28,7 @@
import java.net.*;
@@ -2748,8 +2656,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAg
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2009-12-17 01:44:20.000000000 -0800
+--- ./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
@@ -29,6 +29,7 @@
import java.rmi.*;
@@ -2822,8 +2729,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/B
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -30,10 +30,8 @@
import sun.jvm.hotspot.debugger.cdbg.*;
@@ -2850,8 +2756,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -26,9 +26,7 @@
@@ -2874,8 +2779,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/
} else {
throw new RuntimeException("cpu " + cpu + " is not yet supported");
}
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -2924,8 +2828,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/
- return debugger.newAddress(getRegister(index));
- }
-}
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,81 +0,0 @@
-/*
@@ -3009,8 +2912,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/
- private Address sp;
- private BsdDebugger dbg;
-}
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -3059,8 +2961,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/
- return debugger.newAddress(getRegister(index));
- }
-}
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2009-12-17 01:44:22.000000000 -0800
+--- ./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
@@ -37,6 +37,8 @@
import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
@@ -3085,8 +2986,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/T
}
if (access == null) {
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -28,37 +28,36 @@
private static String[] signalNames = {
@@ -3148,8 +3048,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/b
};
public static String getSignalName(int sigNum) {
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,137 +0,0 @@
-/*
@@ -3289,8 +3188,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/b
- return debugger.getThreadForIdentifierAddress(pthreadIdAddr);
- }
-}
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,165 +0,0 @@
-/*
@@ -3458,8 +3356,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/b
-
-
-}
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -28,37 +28,36 @@
private static String[] signalNames = {
@@ -3521,8 +3418,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/b
};
public static String getSignalName(int sigNum) {
-diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java /tmp/openjdk7/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2009-12-17 01:44:23.000000000 -0800
+--- ./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
@@ -37,6 +37,14 @@
return "solaris";
@@ -3539,8 +3435,7 @@ diff -urN work/openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities
} else if (os.startsWith("Windows")) {
return "win32";
} else {
-diff -urN work/openjdk/hotspot/make/Makefile /tmp/openjdk7/hotspot/make/Makefile
---- ./hotspot/make/Makefile 2009-12-17 01:44:24.000000000 -0800
+--- ./hotspot/make/Makefile 2010-01-14 01:41:43.000000000 -0800
+++ ./hotspot/make/Makefile 2009-11-02 22:42:17.000000000 -0800
@@ -290,20 +290,20 @@
# Shared Library
@@ -3570,8 +3465,7 @@ diff -urN work/openjdk/hotspot/make/Makefile /tmp/openjdk7/hotspot/make/Makefile
$(install-file)
endif
endif
-diff -urN work/openjdk/hotspot/make/bsd/Makefile /tmp/openjdk7/hotspot/make/bsd/Makefile
---- ./hotspot/make/bsd/Makefile 2010-01-02 11:10:47.000000000 -0800
+--- ./hotspot/make/bsd/Makefile 2010-01-17 13:42:28.000000000 -0800
+++ ./hotspot/make/bsd/Makefile 2009-11-04 19:52:29.000000000 -0800
@@ -39,11 +39,11 @@
# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
@@ -3611,8 +3505,7 @@ diff -urN work/openjdk/hotspot/make/bsd/Makefile /tmp/openjdk7/hotspot/make/bsd/
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/buildtree.make /tmp/openjdk7/hotspot/make/bsd/makefiles/buildtree.make
---- ./hotspot/make/bsd/makefiles/buildtree.make 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -287,10 +287,11 @@
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
@@ -3627,8 +3520,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/buildtree.make /tmp/openjdk7/h
) > $@
env.csh: env.sh
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/cscope.make /tmp/openjdk7/hotspot/make/bsd/makefiles/cscope.make
---- ./hotspot/make/bsd/makefiles/cscope.make 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -71,7 +71,7 @@
# OS-specific files for other systems are excluded by default. Use CS_OS=yes
@@ -3639,8 +3531,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/cscope.make /tmp/openjdk7/hots
CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
endif
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/defs.make /tmp/openjdk7/hotspot/make/bsd/makefiles/defs.make
---- ./hotspot/make/bsd/makefiles/defs.make 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -72,8 +72,8 @@
HS_ARCH = sparc
@@ -3729,8 +3620,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/defs.make /tmp/openjdk7/hotspo
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
endif
endif
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/gcc.make /tmp/openjdk7/hotspot/make/bsd/makefiles/gcc.make
---- ./hotspot/make/bsd/makefiles/gcc.make 2010-01-02 11:10:47.000000000 -0800
+--- ./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
@@ -22,12 +22,15 @@
#
@@ -3843,24 +3733,30 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/gcc.make /tmp/openjdk7/hotspot
#------------------------------------------------------------------------
# Debug flags
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/jsig.make /tmp/openjdk7/hotspot/make/bsd/makefiles/jsig.make
---- ./hotspot/make/bsd/makefiles/jsig.make 2010-01-02 11:10:47.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/jsig.make 2009-10-05 21:49:06.000000000 -0700
-@@ -26,7 +26,12 @@
+--- ./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
+@@ -25,11 +25,16 @@
+ # Rules to build signal interposition library, used by vm.make
# libjsig[_g].so: signal interposition library
- JSIG = jsig$(G_SUFFIX)
+-JSIG = jsig
-LIBJSIG = lib$(JSIG).so
-+
++JSIG = jsig
++JSIG_G = $(JSIG)$(G_SUFFIX)
+
+-JSIG_G = $(JSIG)$(G_SUFFIX)
+-LIBJSIG_G = lib$(JSIG_G).so
+ifeq ($(OS_VENDOR), Darwin)
-+ LIBJSIG = lib$(JSIG).dylib
++ LIBJSIG = lib$(JSIG).dylib
++ LIBJSIG_G = lib$(JSIG_G).dylib
+else
-+ LIBJSIG = lib$(JSIG).so
++ LIBJSIG = lib$(JSIG).so
++ LIBJSIG_G = lib$(JSIG_G).so
+endif
JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
-@@ -39,7 +44,7 @@
+@@ -42,7 +47,7 @@
# cause problems with interposing. See CR: 6466665
# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
@@ -3869,19 +3765,18 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/jsig.make /tmp/openjdk7/hotspo
# DEBUG_BINARIES overrides everything, use full -g debug information
ifeq ($(DEBUG_BINARIES), true)
-@@ -49,7 +54,7 @@
+@@ -52,7 +57,7 @@
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
@echo Making signal interposition lib...
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
+ $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
install_jsig: $(LIBJSIG)
- @echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/launcher.make /tmp/openjdk7/hotspot/make/bsd/makefiles/launcher.make
---- ./hotspot/make/bsd/makefiles/launcher.make 2010-01-02 11:10:47.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/launcher.make 2009-06-06 16:53:58.000000000 -0700
-@@ -44,7 +44,7 @@
+--- ./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
+@@ -46,7 +46,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
LAUNCHER.o = launcher.o
@@ -3890,8 +3785,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/launcher.make /tmp/openjdk7/ho
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/sa.make /tmp/openjdk7/hotspot/make/bsd/makefiles/sa.make
---- ./hotspot/make/bsd/makefiles/sa.make 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -42,8 +42,8 @@
@@ -3904,19 +3798,26 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/sa.make /tmp/openjdk7/hotspot/
SA_CLASSDIR = $(GENERATED)/saclasses
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/saproc.make /tmp/openjdk7/hotspot/make/bsd/makefiles/saproc.make
---- ./hotspot/make/bsd/makefiles/saproc.make 2010-01-02 11:10:48.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/saproc.make 2009-11-04 19:52:29.000000000 -0800
-@@ -26,18 +26,30 @@
+--- ./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
+@@ -25,23 +25,34 @@
+ # Rules to build serviceability agent library, used by vm.make
# libsaproc[_g].so: serviceability agent
- SAPROC = saproc$(G_SUFFIX)
+-
+-SAPROC = saproc
-LIBSAPROC = lib$(SAPROC).so
+-
++SAPROC = saproc
+ SAPROC_G = $(SAPROC)$(G_SUFFIX)
+-LIBSAPROC_G = lib$(SAPROC_G).so
+
+ifeq ($(OS_VENDOR), Darwin)
-+ LIBSAPROC = lib$(SAPROC).dylib
++ LIBSAPROC = lib$(SAPROC).dylib
++ LIBSAPROC_G = lib$(SAPROC_G).dylib
+else
-+ LIBSAPROC = lib$(SAPROC).so
++ LIBSAPROC = lib$(SAPROC).so
++ LIBSAPROC_G = lib$(SAPROC_G).so
+endif
AGENT_DIR = $(GAMMADIR)/agent
@@ -3939,7 +3840,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/saproc.make /tmp/openjdk7/hots
SAMAPFILE = $(SASRCDIR)/mapfile
-@@ -56,7 +68,10 @@
+@@ -60,7 +71,10 @@
$(MAKE) -f vm.make $(LIBSAPROC); \
fi
@@ -3951,7 +3852,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/saproc.make /tmp/openjdk7/hots
$(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-@@ -69,12 +84,12 @@
+@@ -73,12 +87,12 @@
-I$(SASRCDIR) \
-I$(GENERATED) \
-I$(BOOT_JAVA_HOME)/include \
@@ -3963,12 +3864,11 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/saproc.make /tmp/openjdk7/hots
-o $@ \
- -lthread_db
+ $(SALIBS)
+ $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
install_saproc: checkAndBuildSA
- $(QUIETLY) if [ -e $(LIBSAPROC) ] ; then \
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/vm.make /tmp/openjdk7/hotspot/make/bsd/makefiles/vm.make
---- ./hotspot/make/bsd/makefiles/vm.make 2010-01-02 11:10:48.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/vm.make 2009-11-04 19:52:29.000000000 -0800
+--- ./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
@@ -99,7 +99,7 @@
# Extra flags from gnumake's invocation or environment
CFLAGS += $(EXTRA_CFLAGS)
@@ -3978,21 +3878,26 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/vm.make /tmp/openjdk7/hotspot/
# By default, link the *.o into the library, not the executable.
LINK_INTO$(LINK_INTO) = LIBJVM
-@@ -114,7 +114,12 @@
+@@ -113,9 +113,15 @@
+ #----------------------------------------------------------------------
# JVM
- JVM = jvm$(G_SUFFIX)
--LIBJVM = lib$(JVM).so
+-JVM = jvm
+-LIBJVM = lib$(JVM).so
+-LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
++JVM = jvm
+ifeq ($(OS_VENDOR), Darwin)
-+ LIBJVM = lib$(JVM).dylib
-+ CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE
++ LIBJVM = lib$(JVM).dylib
++ LIBJVM_G = lib$(JVM)$(G_SUFFIX).dylib
++ CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE
+else
-+ LIBJVM = lib$(JVM).so
++ LIBJVM = lib$(JVM).so
++ LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
+endif
JVM_OBJ_FILES = $(Obj_Files)
-@@ -128,11 +133,7 @@
+@@ -129,11 +135,7 @@
rm -f $@
cat $^ > $@
@@ -4005,7 +3910,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/vm.make /tmp/openjdk7/hotspot/
ifeq ($(LINK_INTO),AOUT)
LIBJVM.o =
-@@ -150,8 +151,9 @@
+@@ -151,8 +153,9 @@
ifeq ($(STATIC_CXX), true)
LFLAGS_VM += $(STATIC_LIBGCC)
LIBS_VM += $(STATIC_STDCXX)
@@ -4016,7 +3921,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/vm.make /tmp/openjdk7/hotspot/
endif
LIBS_VM += $(LIBS)
-@@ -160,7 +162,6 @@
+@@ -161,7 +164,6 @@
LIBS_VM += $(LIBFFI_LIBS)
endif
@@ -4024,7 +3929,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/vm.make /tmp/openjdk7/hotspot/
# rule for building precompiled header
$(PRECOMPILED_HEADER): $(Precompiled_Files)
-@@ -188,11 +189,6 @@
+@@ -189,11 +191,6 @@
LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT)
endif
@@ -4036,10 +3941,10 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/vm.make /tmp/openjdk7/hotspot/
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
$(QUIETLY) { \
echo Linking vm...; \
-@@ -201,15 +197,6 @@
- $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
+@@ -203,15 +200,6 @@
$(LINK_LIB.CC/POST_HOOK) \
rm -f $@.1; ln -s $@ $@.1; \
+ [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
- if [ -x /usr/sbin/sebsdenabled ] ; then \
- /usr/sbin/sebsdenabled; \
- if [ $$? = 0 ] ; then \
@@ -4052,8 +3957,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/vm.make /tmp/openjdk7/hotspot/
}
DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
-diff -urN work/openjdk/hotspot/make/bsd/makefiles/zeroshark.make /tmp/openjdk7/hotspot/make/bsd/makefiles/zeroshark.make
---- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -40,4 +40,23 @@
CFLAGS += -D_LP64=1
@@ -4079,8 +3983,7 @@ diff -urN work/openjdk/hotspot/make/bsd/makefiles/zeroshark.make /tmp/openjdk7/h
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
OPT_CFLAGS/compactingPermGenGen.o = -O1
-diff -urN work/openjdk/hotspot/make/bsd/platform_amd64 /tmp/openjdk7/hotspot/make/bsd/platform_amd64
---- ./hotspot/make/bsd/platform_amd64 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -12,4 +12,4 @@
@@ -4088,8 +3991,7 @@ diff -urN work/openjdk/hotspot/make/bsd/platform_amd64 /tmp/openjdk7/hotspot/mak
-sysdefs = -DBSD -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
-diff -urN work/openjdk/hotspot/make/bsd/platform_amd64.suncc /tmp/openjdk7/hotspot/make/bsd/platform_amd64.suncc
---- ./hotspot/make/bsd/platform_amd64.suncc 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -14,4 +14,4 @@
@@ -4097,8 +3999,7 @@ diff -urN work/openjdk/hotspot/make/bsd/platform_amd64.suncc /tmp/openjdk7/hotsp
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
+sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
-diff -urN work/openjdk/hotspot/make/bsd/platform_i486 /tmp/openjdk7/hotspot/make/bsd/platform_i486
---- ./hotspot/make/bsd/platform_i486 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -12,4 +12,4 @@
@@ -4106,8 +4007,7 @@ diff -urN work/openjdk/hotspot/make/bsd/platform_i486 /tmp/openjdk7/hotspot/make
-sysdefs = -DBSD -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
-diff -urN work/openjdk/hotspot/make/bsd/platform_i486.suncc /tmp/openjdk7/hotspot/make/bsd/platform_i486.suncc
---- ./hotspot/make/bsd/platform_i486.suncc 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -14,4 +14,4 @@
@@ -4115,8 +4015,7 @@ diff -urN work/openjdk/hotspot/make/bsd/platform_i486.suncc /tmp/openjdk7/hotspo
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32
+sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32
-diff -urN work/openjdk/hotspot/make/bsd/platform_ia64 /tmp/openjdk7/hotspot/make/bsd/platform_ia64
---- ./hotspot/make/bsd/platform_ia64 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -10,6 +10,6 @@
@@ -4126,8 +4025,7 @@ diff -urN work/openjdk/hotspot/make/bsd/platform_ia64 /tmp/openjdk7/hotspot/make
+sysdefs = -DLINUX -D_GNU_SOURCE -DIA64 -DCC_INTERP
mark_style = alignment
-diff -urN work/openjdk/hotspot/make/bsd/platform_sparc /tmp/openjdk7/hotspot/make/bsd/platform_sparc
---- ./hotspot/make/bsd/platform_sparc 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -12,4 +12,4 @@
@@ -4135,8 +4033,7 @@ diff -urN work/openjdk/hotspot/make/bsd/platform_sparc /tmp/openjdk7/hotspot/mak
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
-diff -urN work/openjdk/hotspot/make/bsd/platform_sparcv9 /tmp/openjdk7/hotspot/make/bsd/platform_sparcv9
---- ./hotspot/make/bsd/platform_sparcv9 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -12,4 +12,4 @@
@@ -4144,8 +4041,7 @@ diff -urN work/openjdk/hotspot/make/bsd/platform_sparcv9 /tmp/openjdk7/hotspot/m
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -DLINUX -D_GNU_SOURCE -DSPARC
-diff -urN work/openjdk/hotspot/make/bsd/platform_zero.in /tmp/openjdk7/hotspot/make/bsd/platform_zero.in
---- ./hotspot/make/bsd/platform_zero.in 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -14,4 +14,4 @@
@@ -4153,8 +4049,7 @@ diff -urN work/openjdk/hotspot/make/bsd/platform_zero.in /tmp/openjdk7/hotspot/m
-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@\"
-diff -urN work/openjdk/hotspot/make/defs.make /tmp/openjdk7/hotspot/make/defs.make
---- ./hotspot/make/defs.make 2009-12-17 01:44:24.000000000 -0800
+--- ./hotspot/make/defs.make 2010-01-14 01:41:43.000000000 -0800
+++ ./hotspot/make/defs.make 2009-10-31 08:51:23.000000000 -0700
@@ -119,13 +119,23 @@
# Windows should have OS predefined
@@ -4182,8 +4077,7 @@ diff -urN work/openjdk/hotspot/make/defs.make /tmp/openjdk7/hotspot/make/defs.ma
else
OSNAME=solaris
endif
-diff -urN work/openjdk/hotspot/make/linux/makefiles/defs.make /tmp/openjdk7/hotspot/make/linux/makefiles/defs.make
---- ./hotspot/make/linux/makefiles/defs.make 2009-12-17 01:44:24.000000000 -0800
+--- ./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
@@ -100,28 +100,31 @@
@@ -4222,8 +4116,7 @@ diff -urN work/openjdk/hotspot/make/linux/makefiles/defs.make /tmp/openjdk7/hots
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
endif
endif
-diff -urN work/openjdk/hotspot/make/sa.files /tmp/openjdk7/hotspot/make/sa.files
---- ./hotspot/make/sa.files 2009-12-17 01:44:24.000000000 -0800
+--- ./hotspot/make/sa.files 2010-01-14 01:41:43.000000000 -0800
+++ ./hotspot/make/sa.files 2009-06-06 16:53:58.000000000 -0700
@@ -50,6 +50,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
@@ -4245,8 +4138,7 @@ diff -urN work/openjdk/hotspot/make/sa.files /tmp/openjdk7/hotspot/make/sa.files
$(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 \
-diff -urN work/openjdk/hotspot/make/solaris/makefiles/defs.make /tmp/openjdk7/hotspot/make/solaris/makefiles/defs.make
---- ./hotspot/make/solaris/makefiles/defs.make 2009-12-17 01:44:24.000000000 -0800
+--- ./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
@@ -61,32 +61,35 @@
@@ -4296,8 +4188,7 @@ diff -urN work/openjdk/hotspot/make/solaris/makefiles/defs.make /tmp/openjdk7/ho
-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
-diff -urN work/openjdk/hotspot/make/windows/makefiles/defs.make /tmp/openjdk7/hotspot/make/windows/makefiles/defs.make
---- ./hotspot/make/windows/makefiles/defs.make 2009-12-17 01:44:24.000000000 -0800
+--- ./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
@@ -69,6 +69,9 @@
@@ -4340,10 +4231,9 @@ diff -urN work/openjdk/hotspot/make/windows/makefiles/defs.make /tmp/openjdk7/ho
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
-diff -urN work/openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp /tmp/openjdk7/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2009-12-17 01:44:25.000000000 -0800
-+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2009-10-05 22:35:23.000000000 -0700
-@@ -452,10 +452,10 @@
+--- ./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
+@@ -455,10 +455,10 @@
void InterpreterMacroAssembler::tag_local(frame::Tag tag, int n) {
if (TaggedStackInterpreter) {
if (tag == frame::TagCategory2) {
@@ -4357,7 +4247,7 @@ diff -urN work/openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp /tmp/openjd
}
}
}
-@@ -464,12 +464,12 @@
+@@ -467,12 +467,12 @@
if (TaggedStackInterpreter) {
if (tag == frame::TagCategory2) {
movptr(Address(rdi, idx, Interpreter::stackElementScale(),
@@ -4373,7 +4263,7 @@ diff -urN work/openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp /tmp/openjd
}
}
}
-@@ -1318,7 +1318,7 @@
+@@ -1321,7 +1321,7 @@
int recvr_offset = in_bytes(VirtualCallData::receiver_offset(start_row));
set_mdp_data_at(mdp, recvr_offset, receiver);
int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row));
@@ -4382,7 +4272,7 @@ diff -urN work/openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp /tmp/openjd
set_mdp_data_at(mdp, count_offset, reg2);
jmp(done);
}
-@@ -1459,7 +1459,7 @@
+@@ -1462,7 +1462,7 @@
test_method_data_pointer(mdp, profile_continue);
// Build the base (index * per_case_size_in_bytes()) + case_array_offset_in_bytes()
@@ -4391,8 +4281,7 @@ diff -urN work/openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp /tmp/openjd
// index is positive and so should have correct value if this code were
// used on 64bits
imulptr(index, reg2);
-diff -urN work/openjdk/hotspot/src/cpu/x86/vm/jni_x86.h /tmp/openjdk7/hotspot/src/cpu/x86/vm/jni_x86.h
---- ./hotspot/src/cpu/x86/vm/jni_x86.h 2009-12-17 01:44:25.000000000 -0800
+--- ./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
@@ -26,7 +26,7 @@
#ifndef _JAVASOFT_JNI_MD_H_
@@ -4403,8 +4292,7 @@ diff -urN work/openjdk/hotspot/src/cpu/x86/vm/jni_x86.h /tmp/openjdk7/hotspot/sr
#define JNIEXPORT
#define JNIIMPORT
#define JNICALL
-diff -urN work/openjdk/hotspot/src/os/bsd/launcher/java_md.c /tmp/openjdk7/hotspot/src/os/bsd/launcher/java_md.c
---- ./hotspot/src/os/bsd/launcher/java_md.c 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -45,8 +45,15 @@
#include "version_comp.h"
@@ -4543,8 +4431,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/launcher/java_md.c /tmp/openjdk7/hotsp
result = bsd_i586_ServerClassMachine();
#else
if (_launcher_debug) {
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/attachListener_bsd.cpp /tmp/openjdk7/hotspot/src/os/bsd/vm/attachListener_bsd.cpp
---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -179,32 +179,19 @@
struct sockaddr_un addr;
@@ -4638,8 +4525,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/attachListener_bsd.cpp /tmp/openjdk
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/hpi_bsd.cpp /tmp/openjdk7/hotspot/src/os/bsd/vm/hpi_bsd.cpp
---- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -28,6 +28,14 @@
# include <sys/param.h>
@@ -4670,8 +4556,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/hpi_bsd.cpp /tmp/openjdk7/hotspot/s
#endif
*(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/hpi_bsd.hpp /tmp/openjdk7/hotspot/src/os/bsd/vm/hpi_bsd.hpp
---- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -36,7 +36,7 @@
// HPI_FileInterface
@@ -4723,8 +4608,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/hpi_bsd.hpp /tmp/openjdk7/hotspot/s
}
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/jsig.c /tmp/openjdk7/hotspot/src/os/bsd/vm/jsig.c
---- ./hotspot/src/os/bsd/vm/jsig.c 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -143,7 +143,8 @@
}
@@ -4736,8 +4620,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/jsig.c /tmp/openjdk7/hotspot/src/os
}
static int call_os_sigaction(int sig, const struct sigaction *act,
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/jvm_bsd.cpp /tmp/openjdk7/hotspot/src/os/bsd/vm/jvm_bsd.cpp
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -144,38 +144,31 @@
"ILL", SIGILL, /* Illegal instruction (ANSI). */
@@ -4788,8 +4671,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/jvm_bsd.cpp /tmp/openjdk7/hotspot/s
};
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/jvm_bsd.h /tmp/openjdk7/hotspot/src/os/bsd/vm/jvm_bsd.h
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -51,7 +51,11 @@
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
@@ -4824,8 +4706,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/jvm_bsd.h /tmp/openjdk7/hotspot/src
#endif /* JVM_MD_H */
// Reconciliation History
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/osThread_bsd.cpp /tmp/openjdk7/hotspot/src/os/bsd/vm/osThread_bsd.cpp
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -28,8 +28,8 @@
@@ -4838,8 +4719,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/osThread_bsd.cpp /tmp/openjdk7/hots
_siginfo = NULL;
_ucontext = NULL;
_expanding_stack = 0;
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/osThread_bsd.hpp /tmp/openjdk7/hotspot/src/os/bsd/vm/osThread_bsd.hpp
---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -36,6 +36,12 @@
@@ -4898,9 +4778,8 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/osThread_bsd.hpp /tmp/openjdk7/hots
pthread_t pthread_id() const {
return _pthread_id;
}
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/src/os/bsd/vm/os_bsd.cpp
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-01-02 11:10:48.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2009-11-28 13:11:22.000000000 -0800
+--- ./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
@@ -42,17 +42,39 @@
# include <sys/utsname.h>
# include <sys/socket.h>
@@ -5017,12 +4896,12 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// pid_t gettid()
//
// Returns the kernel thread id of the currently running thread. Kernel
-@@ -221,7 +255,47 @@
+@@ -221,7 +255,48 @@
static const char *unstable_chroot_error = "/proc file system not found.\n"
"Java may be unstable running multithreaded in a chroot "
"environment on Bsd when /proc filesystem is not mounted.";
+#endif
-
++
+#ifdef _ALLBSD_SOURCE
+void os::Bsd::initialize_system_info() {
+ int mib[2];
@@ -5034,11 +4913,12 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
+ mib[0] = CTL_HW;
+ mib[1] = HW_NCPU;
+ len = sizeof(cpu_val);
-+ if (sysctl(mib, 2, &cpu_val, &len, NULL, 0) != -1)
-+ _processor_count = cpu_val;
-+
-+ if (_processor_count < 1)
-+ _processor_count = 1; // fallback
++ if (sysctl(mib, 2, &cpu_val, &len, NULL, 0) != -1 && cpu_val >= 1) {
++ set_processor_count(cpu_val);
++ }
++ else {
++ set_processor_count(1); // fallback
++ }
+
+ /* get physical memory via hw.usermem sysctl (hw.usermem is used
+ * instead of hw.physmem because we need size of allocatable memory
@@ -5050,7 +4930,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
+ _physical_memory = mem_val;
+ else
+ _physical_memory = 256*1024*1024; // fallback (XXXBSD?)
-+
+
+#ifdef __OpenBSD__
+ {
+ // limit _physical_memory memory view on OpenBSD since
@@ -5063,17 +4943,17 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
+}
+#else
void os::Bsd::initialize_system_info() {
- _processor_count = sysconf(_SC_NPROCESSORS_CONF);
- if (_processor_count == 1) {
-@@ -238,6 +312,7 @@
+ set_processor_count(sysconf(_SC_NPROCESSORS_CONF));
+ if (processor_count() == 1) {
+@@ -238,6 +313,7 @@
_physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
- assert(_processor_count > 0, "bsd error");
+ assert(processor_count() > 0, "bsd error");
}
+#endif
void os::init_system_properties_values() {
// char arch[12];
-@@ -281,9 +356,7 @@
+@@ -281,9 +357,7 @@
* ...
* 7: The default directories, normally /lib and /usr/lib.
*/
@@ -5084,7 +4964,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
#define DEFAULT_LIBPATH "/lib:/usr/lib"
#endif
-@@ -362,7 +435,11 @@
+@@ -362,7 +436,11 @@
* should always exist (until the legacy problem cited above is
* addressed).
*/
@@ -5096,7 +4976,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (v != NULL) {
char *t = ld_library_path;
/* That's +1 for the colon and +1 for the trailing '\0' */
-@@ -521,6 +598,7 @@
+@@ -521,6 +599,7 @@
}
}
@@ -5104,7 +4984,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
//////////////////////////////////////////////////////////////////////////////
// detecting pthread library
-@@ -684,6 +762,7 @@
+@@ -684,6 +763,7 @@
}
return false;
}
@@ -5112,7 +4992,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
//////////////////////////////////////////////////////////////////////////////
// create new thread
-@@ -692,6 +771,9 @@
+@@ -692,6 +772,9 @@
// check if it's safe to start a new thread
static bool _thread_safety_check(Thread* thread) {
@@ -5122,7 +5002,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (os::Bsd::is_BsdThreads() && !os::Bsd::is_floating_stack()) {
// Fixed stack BsdThreads (SuSE Bsd/x86, and some versions of Redhat)
// Heap is mmap'ed at lower end of memory space. Thread stacks are
-@@ -725,6 +807,7 @@
+@@ -725,6 +808,7 @@
// here, that means enough space has been reserved for stack.
return true;
}
@@ -5130,7 +5010,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
// Thread start routine for all newly created threads
-@@ -752,6 +835,10 @@
+@@ -752,6 +836,10 @@
return NULL;
}
@@ -5141,7 +5021,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// thread_id is kernel thread id (similar to Solaris LWP id)
osthread->set_thread_id(os::Bsd::gettid());
-@@ -761,6 +848,7 @@
+@@ -761,6 +849,7 @@
thread->set_lgrp_id(lgrp_id);
}
}
@@ -5149,7 +5029,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// initialize signal mask for this thread
os::Bsd::hotspot_sigmask(thread);
-@@ -841,17 +929,22 @@
+@@ -841,17 +930,22 @@
// let pthread_create() pick the default value.
}
@@ -5172,7 +5052,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
pthread_t tid;
int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
-@@ -865,7 +958,9 @@
+@@ -865,7 +959,9 @@
// Need to clean up stuff we've allocated so far
thread->set_osthread(NULL);
delete osthread;
@@ -5182,7 +5062,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
return false;
}
-@@ -881,9 +976,11 @@
+@@ -881,9 +977,11 @@
}
}
@@ -5194,7 +5074,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
// Aborted due to thread limit being reached
-@@ -921,7 +1018,11 @@
+@@ -921,7 +1019,11 @@
}
// Store pthread info into the OSThread
@@ -5206,7 +5086,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
osthread->set_pthread_id(::pthread_self());
// initialize floating point control register
-@@ -932,6 +1033,7 @@
+@@ -932,6 +1034,7 @@
thread->set_osthread(osthread);
@@ -5214,7 +5094,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (UseNUMA) {
int lgrp_id = os::numa_get_group_id();
if (lgrp_id != -1) {
-@@ -958,6 +1060,7 @@
+@@ -958,6 +1061,7 @@
os::Bsd::manually_expand_stack(jt, addr);
osthread->clear_expanding_stack();
}
@@ -5222,7 +5102,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// initialize signal mask for this thread
// and save the caller's signal mask
-@@ -1016,6 +1119,7 @@
+@@ -1016,6 +1120,7 @@
//////////////////////////////////////////////////////////////////////////////
// initial thread
@@ -5230,7 +5110,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// Check if current thread is the initial thread, similar to Solaris thr_main.
bool os::Bsd::is_initial_thread(void) {
char dummy;
-@@ -1249,6 +1353,7 @@
+@@ -1249,6 +1354,7 @@
_initial_thread_stack_size = align_size_down(_initial_thread_stack_size, page_size());
_initial_thread_stack_bottom = (address)stack_top - _initial_thread_stack_size;
}
@@ -5238,7 +5118,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
////////////////////////////////////////////////////////////////////////////////
// time support
-@@ -1270,9 +1375,7 @@
+@@ -1270,9 +1376,7 @@
return (1000 * 1000);
}
@@ -5249,7 +5129,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
bool os::supports_vtime() { return false; }
bool os::enable_vtime() { return false; }
bool os::vtime_enabled() { return false; }
-@@ -1292,6 +1395,21 @@
+@@ -1292,6 +1396,21 @@
#define CLOCK_MONOTONIC (1)
#endif
@@ -5271,7 +5151,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
void os::Bsd::clock_init() {
// we do dlopen's in this particular order due to bug in bsd
// dynamical loader (see 6348968) leading to crash on exit
-@@ -1327,7 +1445,9 @@
+@@ -1327,7 +1446,9 @@
}
}
}
@@ -5281,7 +5161,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
#ifndef SYS_clock_getres
#if defined(IA32) || defined(AMD64)
-@@ -1366,6 +1486,7 @@
+@@ -1366,6 +1487,7 @@
_pthread_getcpuclockid = pthread_getcpuclockid_func;
}
}
@@ -5289,7 +5169,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
jlong os::javaTimeNanos() {
if (Bsd::supports_monotonic_clock()) {
-@@ -1516,7 +1637,14 @@
+@@ -1516,7 +1638,14 @@
// DLL functions
@@ -5305,7 +5185,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
const char* os::get_temp_directory() { return "/tmp/"; }
-@@ -1534,13 +1662,13 @@
+@@ -1534,13 +1663,13 @@
const size_t pnamelen = pname ? strlen(pname) : 0;
// Quietly truncate on buffer overflow. Should be an error.
@@ -5321,7 +5201,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
} else if (strchr(pname, *os::path_separator()) != NULL) {
int n;
char** pelements = split_path(pname, &n);
-@@ -1549,7 +1677,8 @@
+@@ -1549,7 +1678,8 @@
if (pelements[i] == NULL || strlen(pelements[i]) == 0) {
continue; // skip the empty path values
}
@@ -5331,7 +5211,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (file_exists(buffer)) {
break;
}
-@@ -1564,7 +1693,7 @@
+@@ -1564,7 +1694,7 @@
FREE_C_HEAP_ARRAY(char*, pelements);
}
} else {
@@ -5340,7 +5220,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
}
-@@ -1605,6 +1734,23 @@
+@@ -1605,6 +1735,23 @@
}
}
@@ -5364,7 +5244,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
struct _address_to_library_name {
address addr; // input : memory address
size_t buflen; // size of fname
-@@ -1679,11 +1825,27 @@
+@@ -1679,11 +1826,27 @@
return false;
}
}
@@ -5381,18 +5261,18 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
+ // Successful loading
+ return result;
+ }
-+
+
+ // Read system error message into ebuf
+ ::strncpy(ebuf, ::dlerror(), ebuflen-1);
+ ebuf[ebuflen-1]='\0';
-
++
+ return NULL;
+}
+#else
void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
{
void * result= ::dlopen(filename, RTLD_LAZY);
-@@ -1736,6 +1898,26 @@
+@@ -1736,6 +1899,26 @@
#define EM_486 6 /* Intel 80486 */
#endif
@@ -5419,7 +5299,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
static const arch_t arch_array[]={
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
{EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
-@@ -1839,17 +2021,11 @@
+@@ -1839,17 +2022,11 @@
return NULL;
}
@@ -5440,7 +5320,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
-@@ -1872,7 +2048,51 @@
+@@ -1872,7 +2049,51 @@
void os::print_dll_info(outputStream *st) {
st->print_cr("Dynamic libraries:");
@@ -5493,7 +5373,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
char fname[32];
pid_t pid = os::Bsd::gettid();
-@@ -1881,6 +2101,7 @@
+@@ -1881,6 +2102,7 @@
if (!_print_ascii_file(fname, st)) {
st->print("Can not get library information for pid = %d\n", pid);
}
@@ -5501,7 +5381,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
-@@ -1913,6 +2134,7 @@
+@@ -1913,6 +2135,7 @@
st->print(name.machine);
st->cr();
@@ -5509,7 +5389,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// Print warning if unsafe chroot environment detected
if (unsafe_chroot_detected) {
st->print("WARNING!! ");
-@@ -1927,6 +2149,7 @@
+@@ -1927,6 +2150,7 @@
st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed");
}
st->cr();
@@ -5517,7 +5397,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// rlimit
st->print("rlimit:");
-@@ -1952,6 +2175,7 @@
+@@ -1952,6 +2176,7 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -5525,7 +5405,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
st->print(", AS ");
getrlimit(RLIMIT_AS, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
-@@ -1964,6 +2188,7 @@
+@@ -1964,6 +2189,7 @@
os::loadavg(loadavg, 3);
st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]);
st->cr();
@@ -5533,7 +5413,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
void os::print_memory_info(outputStream* st) {
-@@ -1971,18 +2196,22 @@
+@@ -1971,18 +2197,22 @@
st->print("Memory:");
st->print(" %dk page", os::vm_page_size()>>10);
@@ -5556,7 +5436,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
st->cr();
}
-@@ -2209,19 +2438,29 @@
+@@ -2209,19 +2439,29 @@
static volatile jint pending_signals[NSIG+1] = { 0 };
// Bsd(POSIX) specific hand shaking semaphore.
@@ -5588,7 +5468,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
static int check_pending_signals(bool wait) {
-@@ -2243,7 +2482,7 @@
+@@ -2243,7 +2483,7 @@
do {
thread->set_suspend_equivalent();
// cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
@@ -5597,7 +5477,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// were we externally suspended while we were waiting?
threadIsSuspended = thread->handle_special_suspend_equivalent_condition();
-@@ -2254,7 +2493,7 @@
+@@ -2254,7 +2494,7 @@
// while suspended because that would surprise the thread that
// suspended us.
//
@@ -5606,7 +5486,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
thread->java_suspend_self();
}
-@@ -2326,9 +2565,14 @@
+@@ -2326,9 +2566,14 @@
// problem.
bool os::commit_memory(char* addr, size_t size, bool exec) {
int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
@@ -5621,7 +5501,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
-@@ -2344,36 +2588,27 @@
+@@ -2344,36 +2589,27 @@
}
void os::numa_make_global(char *addr, size_t bytes) {
@@ -5663,7 +5543,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
bool os::get_page_info(char *start, page_info* info) {
-@@ -2384,6 +2619,7 @@
+@@ -2384,6 +2620,7 @@
return end;
}
@@ -5671,7 +5551,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
extern "C" void numa_warn(int number, char *where, ...) { }
extern "C" void numa_error(char *where) { }
-@@ -2485,11 +2721,18 @@
+@@ -2485,11 +2722,18 @@
os::Bsd::numa_tonode_memory_func_t os::Bsd::_numa_tonode_memory;
os::Bsd::numa_interleave_memory_func_t os::Bsd::_numa_interleave_memory;
unsigned long* os::Bsd::_numa_all_nodes;
@@ -5691,7 +5571,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
static address _highest_vm_reserved_address = NULL;
-@@ -2593,6 +2836,9 @@
+@@ -2593,6 +2837,9 @@
static size_t _large_page_size = 0;
bool os::large_page_init() {
@@ -5701,7 +5581,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (!UseLargePages) return false;
if (LargePageSizeInBytes) {
-@@ -2649,6 +2895,7 @@
+@@ -2649,6 +2896,7 @@
// We optimistically assume the support is available. If later it turns out
// not true, VM will automatically switch to use regular page size.
return true;
@@ -5709,7 +5589,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
#ifndef SHM_HUGETLB
-@@ -2825,7 +3072,7 @@
+@@ -2825,7 +3073,7 @@
}
size_t os::read(int fd, void *buf, unsigned int nBytes) {
@@ -5718,7 +5598,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
// TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation.
-@@ -2961,6 +3208,44 @@
+@@ -2961,6 +3209,44 @@
// this reason, the code should not be used as default (ThreadPriorityPolicy=0).
// It is only used when ThreadPriorityPolicy=1 and requires root privilege.
@@ -5763,7 +5643,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
int os::java_to_os_priority[MaxPriority + 1] = {
19, // 0 Entry should never be used
-@@ -2978,6 +3263,7 @@
+@@ -2978,6 +3264,7 @@
-5 // 10 MaxPriority
};
@@ -5771,7 +5651,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
static int prio_init() {
if (ThreadPriorityPolicy == 1) {
-@@ -2997,8 +3283,28 @@
+@@ -2997,8 +3284,28 @@
OSReturn os::set_native_priority(Thread* thread, int newpri) {
if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK;
@@ -5800,7 +5680,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
-@@ -3008,7 +3314,17 @@
+@@ -3008,7 +3315,17 @@
}
errno = 0;
@@ -5818,7 +5698,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
}
-@@ -3118,7 +3434,7 @@
+@@ -3118,7 +3435,7 @@
/* Get signal number to use for suspend/resume */
if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
int sig = ::strtol(s, 0, 10);
@@ -5827,7 +5707,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
SR_signum = sig;
}
}
-@@ -3461,6 +3777,28 @@
+@@ -3461,6 +3778,28 @@
set_signal_handler(SIGFPE, true);
set_signal_handler(SIGXFSZ, true);
@@ -5856,7 +5736,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (libjsig_is_loaded) {
// Tell libjsig jvm finishes setting signal handlers
(*end_signal_setting)();
-@@ -3481,6 +3819,7 @@
+@@ -3481,6 +3820,7 @@
}
}
@@ -5864,7 +5744,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// This is the fastest way to get thread cpu time on Bsd.
// Returns cpu time (user+sys) for any thread, not only for current.
// POSIX compliant clocks are implemented in the kernels 2.6.16+.
-@@ -3495,6 +3834,7 @@
+@@ -3495,6 +3835,7 @@
return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
}
@@ -5872,7 +5752,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
/////
// glibc on Bsd platform uses non-documented flag
-@@ -3716,13 +4056,13 @@
+@@ -3716,13 +4057,13 @@
_initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid();
@@ -5888,7 +5768,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (Bsd::page_size() == -1) {
fatal1("os_bsd.cpp: os::init: sysconf failed (%s)", strerror(errno));
}
-@@ -3735,7 +4075,16 @@
+@@ -3735,7 +4076,16 @@
Bsd::clock_init();
initial_time_count = os::elapsed_counter();
@@ -5906,7 +5786,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
// To install functions for atexit system call
-@@ -3748,7 +4097,9 @@
+@@ -3748,7 +4098,9 @@
// this is called _after_ the global arguments have been parsed
jint os::init_2(void)
{
@@ -5916,7 +5796,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// Allocate a single page and mark it as readable for safepoint polling
address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-@@ -3797,6 +4148,7 @@
+@@ -3797,6 +4149,7 @@
JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes,
vm_page_size()));
@@ -5924,7 +5804,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
Bsd::capture_initial_stack(JavaThread::stack_size_at_create());
Bsd::libpthread_init();
-@@ -3819,6 +4171,7 @@
+@@ -3819,6 +4172,7 @@
UseNUMA = true;
}
}
@@ -5932,7 +5812,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (MaxFDLimit) {
// set the number of file descriptors to max. print out error
-@@ -3830,6 +4183,14 @@
+@@ -3830,6 +4184,14 @@
perror("os::init_2 getrlimit failed");
} else {
nbr_files.rlim_cur = nbr_files.rlim_max;
@@ -5947,7 +5827,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
status = setrlimit(RLIMIT_NOFILE, &nbr_files);
if (status != 0) {
if (PrintMiscellaneous && (Verbose || WizardMode))
-@@ -3838,8 +4199,10 @@
+@@ -3838,8 +4200,10 @@
}
}
@@ -5958,7 +5838,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// Initialize HPI.
jint hpi_result = hpi::initialize();
-@@ -3887,11 +4250,15 @@
+@@ -3887,11 +4251,15 @@
};
int os::active_processor_count() {
@@ -5974,7 +5854,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
bool os::distribute_processes(uint length, uint* distribution) {
-@@ -3933,6 +4300,9 @@
+@@ -3933,6 +4301,9 @@
int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
{
@@ -5984,7 +5864,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (is_NPTL()) {
return pthread_cond_timedwait(_cond, _mutex, _abstime);
} else {
-@@ -3948,6 +4318,7 @@
+@@ -3948,6 +4319,7 @@
#endif // IA64
return status;
}
@@ -5992,7 +5872,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
////////////////////////////////////////////////////////////////////////////////
-@@ -4083,17 +4454,17 @@
+@@ -4083,17 +4455,17 @@
if (!rewrite_existing) {
oflags |= O_EXCL;
}
@@ -6013,7 +5893,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
// Map a block of memory.
-@@ -4143,6 +4514,7 @@
+@@ -4143,6 +4515,7 @@
return munmap(addr, bytes) == 0;
}
@@ -6021,7 +5901,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
static clockid_t thread_cpu_clockid(Thread* thread) {
-@@ -4154,6 +4526,7 @@
+@@ -4154,6 +4527,7 @@
assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
return clockid;
}
@@ -6029,7 +5909,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
// are used by JVM M&M and JVMTI to get user+sys or user CPU time
-@@ -4163,39 +4536,71 @@
+@@ -4163,39 +4537,71 @@
// the fast estimate available on the platform.
jlong os::current_thread_cpu_time() {
@@ -6101,7 +5981,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
//
// -1 on error.
//
-@@ -4284,6 +4689,7 @@
+@@ -4284,6 +4690,7 @@
return (jlong)user_time * (1000000000 / clock_tics_per_sec);
}
}
@@ -6109,7 +5989,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits
-@@ -4300,7 +4706,13 @@
+@@ -4300,7 +4707,13 @@
}
bool os::is_thread_cpu_time_supported() {
@@ -6123,7 +6003,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
}
// System loadavg support. Returns -1 if load average cannot be obtained.
-@@ -4433,7 +4845,7 @@
+@@ -4433,7 +4846,7 @@
// abstime will be the absolute timeout time
// TODO: replace compute_abstime() with unpackTime()
@@ -6132,7 +6012,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (millis < 0) millis = 0;
struct timeval now;
int status = gettimeofday(&now, NULL);
-@@ -4485,7 +4897,7 @@
+@@ -4485,7 +4898,7 @@
status = pthread_cond_wait(_cond, _mutex);
// for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
// Treat this the same as if the wait was interrupted
@@ -6141,7 +6021,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
assert_status(status == 0 || status == EINTR, status, "cond_wait");
}
-- _nParked ;
-@@ -4543,10 +4955,10 @@
+@@ -4543,10 +4956,10 @@
pthread_cond_init (_cond, NULL) ;
}
assert_status(status == 0 || status == EINTR ||
@@ -6154,7 +6034,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// We consume and ignore EINTR and spurious wakeups.
}
--_nParked ;
-@@ -4638,7 +5050,7 @@
+@@ -4638,7 +5051,7 @@
* years from "now".
*/
@@ -6163,7 +6043,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
assert (time > 0, "convertTime");
struct timeval now;
-@@ -4697,7 +5109,7 @@
+@@ -4698,7 +5111,7 @@
}
// Next, demultiplex/decode time arguments
@@ -6172,7 +6052,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (time < 0) { // don't wait at all
return;
}
-@@ -4750,7 +5162,7 @@
+@@ -4752,7 +5165,7 @@
}
}
assert_status(status == 0 || status == EINTR ||
@@ -6181,7 +6061,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
status, "cond_timedwait");
#ifdef ASSERT
-@@ -4792,14 +5204,12 @@
+@@ -4795,14 +5208,12 @@
}
@@ -6201,7 +6081,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
#endif
// Run the specified command in a separate process. Return its exit value,
-@@ -4814,8 +5224,7 @@
+@@ -4817,8 +5228,7 @@
// separate process to execve. Make a direct syscall to fork process.
// On IA64 there's no fork syscall, we have to use fork() and hope for
// the best...
@@ -6211,7 +6091,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
if (pid < 0) {
// fork failed
-@@ -4831,8 +5240,7 @@
+@@ -4834,8 +5244,7 @@
// in the new process, so make a system call directly.
// IA64 should use normal execve() from glibc to match the glibc fork()
// above.
@@ -6221,8 +6101,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.cpp /tmp/openjdk7/hotspot/sr
// execve failed
_exit(-1);
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.hpp /tmp/openjdk7/hotspot/src/os/bsd/vm/os_bsd.hpp
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -27,6 +27,12 @@
/* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
@@ -6360,8 +6239,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.hpp /tmp/openjdk7/hotspot/sr
// Stack repair handling
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.inline.hpp /tmp/openjdk7/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -61,7 +61,15 @@
@@ -6379,8 +6257,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/os_bsd.inline.hpp /tmp/openjdk7/hot
}
-diff -urN work/openjdk/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp /tmp/openjdk7/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -241,7 +241,7 @@
@@ -6391,8 +6268,7 @@ diff -urN work/openjdk/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp /tmp/openjdk7/ho
struct passwd* p;
int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p);
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,45 +0,0 @@
-/*
@@ -6440,8 +6316,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp /
-// 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); }
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,206 +0,0 @@
-/*
@@ -6650,8 +6525,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.h
-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);
-}
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-//
@@ -6681,8 +6555,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad /tmp/openjdk
-//
-
-// SPARC Bsd Architecture Description File
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,105 +0,0 @@
-#
@@ -6790,8 +6663,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s /tmp/openjdk7
- ta 0x03
- retl
- mov %fp, %o0
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,36 +0,0 @@
-/*
@@ -6830,8 +6702,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp /tm
-define_pd_global(uintx, HeapBaseMinAddress, 4*G);
-// Only used on 64 bit Windows platforms
-define_pd_global(bool, UseVectoredExceptions, false);
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,102 +0,0 @@
-/*
@@ -6936,8 +6807,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inl
-
-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(); }
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,648 +0,0 @@
-/*
@@ -7588,8 +7458,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp /tmp/ope
- // guard page, only enable glibc guard page for non-Java threads.
- return (thr_type == java_thread ? 0 : page_size());
-}
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,44 +0,0 @@
-/*
@@ -7636,8 +7505,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp /tmp/ope
- // 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; }
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,40 +0,0 @@
-/*
@@ -7680,8 +7548,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline
-inline void Prefetch::write(void *loc, intx interval) {}
-
-#endif
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,37 +0,0 @@
-/*
@@ -7721,8 +7588,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp /t
-void ThreadLocalStorage::pd_set_thread(Thread* thread) {
- os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
-}
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,28 +0,0 @@
-/*
@@ -7753,8 +7619,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp /t
- static Thread* thread() {
- return (Thread*) os::thread_local_storage_at(thread_index());
- }
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,107 +0,0 @@
-/*
@@ -7864,8 +7729,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp /tmp
- // nothing else to try
- return false;
-}
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,98 +0,0 @@
-/*
@@ -7966,8 +7830,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp /tmp
- static bool register_stack_overflow() { return false; }
- static void enable_register_stack_guard() {}
- static void disable_register_stack_guard() {}
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,69 +0,0 @@
-/*
@@ -8039,8 +7902,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp /
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,61 +0,0 @@
-/*
@@ -8104,8 +7966,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp
-
- return features;
-}
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s /tmp/openjdk7/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -19,8 +19,19 @@
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
@@ -8310,8 +8171,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s /tmp/openjdk7/
# 8(%esp) : return PC
pushl %ebx # 4(%esp) : old %ebx
pushl %edi # 0(%esp) : old %edi
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s /tmp/openjdk7/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -21,6 +21,14 @@
# have any questions.
@@ -8460,8 +8320,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s /tmp/openjdk7/
cmpq %rdi,%rsi
leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8
jbe acl_CopyRight
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp
---- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-01-02 11:10:48.000000000 -0800
+--- ./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
@@ -22,7 +22,33 @@
*
@@ -8497,8 +8356,35 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp /t
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-01-02 11:10:49.000000000 -0800
+--- ./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
+@@ -22,9 +22,10 @@
+ *
+ */
+
++//
+ // Sets the default values for platform dependent flags used by the runtime system.
+ // (see globals.hpp)
+-
++//
+ define_pd_global(bool, DontYieldALot, false);
+ #ifdef AMD64
+ define_pd_global(intx, ThreadStackSize, 1024); // 0 => use system default
+@@ -38,10 +39,11 @@
+ #endif // AMD64
+
+ define_pd_global(intx, CompilerThreadStackSize, 0);
++define_pd_global(intx, SurvivorRatio, 8);
+
+-define_pd_global(uintx,JVMInvokeMethodSlack, 8192);
++define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
+
+ // Only used on 64 bit platforms
+-define_pd_global(uintx,HeapBaseMinAddress, 2*G);
++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
@@ -44,23 +44,202 @@
# include <sys/wait.h>
@@ -9034,8 +8920,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp /tmp/openjdk
#endif // AMD64
st->cr();
st->cr();
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp
---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-01-02 11:10:49.000000000 -0800
+--- ./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
@@ -27,8 +27,10 @@
#ifndef AMD64
@@ -9048,8 +8933,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp /tmp/o
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
#endif // !AMD64
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp
---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-01-02 11:10:49.000000000 -0800
+--- ./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
@@ -31,7 +31,7 @@
/******************************/ \
@@ -9060,8 +8944,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp /tmp/
nonstatic_field(OSThread, _pthread_id, pthread_t) \
/* This must be the last entry, and must be present */ \
last_entry()
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
---- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-01-02 11:10:49.000000000 -0800
+--- ./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
@@ -23,136 +23,441 @@
*
@@ -9735,8 +9618,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
- (intptr_t) compare_value);
+ return atomic_cas_ptr((volatile void *)dest, compare_value, exchange_value);
}
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp
---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-01-02 11:10:49.000000000 -0800
+--- ./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
@@ -25,16 +25,23 @@
// Efficient swapping of data bytes from Java byte
@@ -9766,8 +9648,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp
- return bswap_64(x);
+ return bswap64(x);
}
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp
---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-01-02 11:10:49.000000000 -0800
+--- ./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
@@ -40,7 +40,12 @@
@@ -9782,8 +9663,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inlin
#ifdef PPC
-diff -urN work/openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp /tmp/openjdk7/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-01-02 11:10:49.000000000 -0800
+--- ./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
@@ -23,6 +23,10 @@
*
@@ -9900,8 +9780,7 @@ diff -urN work/openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp /tmp/openj
assert(os::current_stack_pointer() >= stack_bottom, "should do");
assert(os::current_stack_pointer() < stack_top, "should do");
-diff -urN work/openjdk/hotspot/src/share/vm/adlc/adlc.hpp /tmp/openjdk7/hotspot/src/share/vm/adlc/adlc.hpp
---- ./hotspot/src/share/vm/adlc/adlc.hpp 2009-12-17 01:44:28.000000000 -0800
+--- ./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
@@ -69,9 +69,9 @@
#endif
@@ -9915,9 +9794,8 @@ diff -urN work/openjdk/hotspot/src/share/vm/adlc/adlc.hpp /tmp/openjdk7/hotspot/
// Macros
#define uint32 unsigned int
-diff -urN work/openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp /tmp/openjdk7/hotspot/src/share/vm/classfile/javaClasses.cpp
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2009-12-17 01:44:29.000000000 -0800
-+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2009-11-28 13:11:22.000000000 -0800
+--- ./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
@@ -952,7 +952,7 @@
}
nmethod* nm = method->code();
@@ -9927,9 +9805,8 @@ diff -urN work/openjdk/hotspot/src/share/vm/classfile/javaClasses.cpp /tmp/openj
}
}
-diff -urN work/openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp /tmp/openjdk7/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2009-12-17 01:44:30.000000000 -0800
-+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2009-09-07 10:57:22.000000000 -0700
+--- ./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
@@ -77,7 +77,7 @@
// the incoming method. We could lose a line of trace output.
// This is acceptable in a debug-only feature.
@@ -9948,8 +9825,7 @@ diff -urN work/openjdk/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp /tmp/
if (Verbose) {
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
-diff -urN work/openjdk/hotspot/src/share/vm/prims/forte.cpp /tmp/openjdk7/hotspot/src/share/vm/prims/forte.cpp
---- ./hotspot/src/share/vm/prims/forte.cpp 2009-12-17 01:44:32.000000000 -0800
+--- ./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
@@ -626,6 +626,11 @@
// Method to let libcollector know about a dynamically loaded function.
@@ -9971,10 +9847,9 @@ diff -urN work/openjdk/hotspot/src/share/vm/prims/forte.cpp /tmp/openjdk7/hotspo
#endif // !_WINDOWS
} // end extern "C"
-diff -urN work/openjdk/hotspot/src/share/vm/runtime/globals.hpp /tmp/openjdk7/hotspot/src/share/vm/runtime/globals.hpp
---- ./hotspot/src/share/vm/runtime/globals.hpp 2009-12-17 01:44:32.000000000 -0800
-+++ ./hotspot/src/share/vm/runtime/globals.hpp 2009-10-31 08:51:25.000000000 -0700
-@@ -315,7 +315,7 @@
+--- ./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
+@@ -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 \
* been re-added (see 6401008) */ \
@@ -9983,8 +9858,7 @@ diff -urN work/openjdk/hotspot/src/share/vm/runtime/globals.hpp /tmp/openjdk7/ho
"(Unstable) Issues membars on thread state transitions") \
\
product(bool, PrintCommandLineFlags, false, \
-diff -urN work/openjdk/hotspot/src/share/vm/runtime/os.cpp /tmp/openjdk7/hotspot/src/share/vm/runtime/os.cpp
---- ./hotspot/src/share/vm/runtime/os.cpp 2009-12-17 01:44:32.000000000 -0800
+--- ./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
@@ -79,7 +79,11 @@
assert(false, "Failed localtime_pd");
@@ -9998,8 +9872,7 @@ diff -urN work/openjdk/hotspot/src/share/vm/runtime/os.cpp /tmp/openjdk7/hotspot
// If daylight savings time is in effect,
// we are 1 hour East of our time zone
-diff -urN work/openjdk/hotspot/src/share/vm/runtime/vm_version.cpp /tmp/openjdk7/hotspot/src/share/vm/runtime/vm_version.cpp
---- ./hotspot/src/share/vm/runtime/vm_version.cpp 2009-12-17 01:44:32.000000000 -0800
+--- ./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
@@ -144,7 +144,8 @@
@@ -10011,8 +9884,7 @@ diff -urN work/openjdk/hotspot/src/share/vm/runtime/vm_version.cpp /tmp/openjdk7
#ifdef ZERO
#define CPU ZERO_LIBARCH
-diff -urN work/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp /tmp/openjdk7/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2009-12-17 01:44:32.000000000 -0800
+--- ./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
@@ -71,12 +71,25 @@
# include <sys/procfs.h>
@@ -10080,8 +9952,7 @@ diff -urN work/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
inline int g_isnan(float f) { return isnanf(f); }
inline int g_isnan(double f) { return isnan(f); }
#else
-diff -urN work/openjdk/hotspot/src/share/vm/utilities/macros.hpp /tmp/openjdk7/hotspot/src/share/vm/utilities/macros.hpp
---- ./hotspot/src/share/vm/utilities/macros.hpp 2009-12-17 01:44:33.000000000 -0800
+--- ./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
@@ -148,6 +148,14 @@
#define NOT_WINDOWS(code) code
@@ -10098,8 +9969,7 @@ diff -urN work/openjdk/hotspot/src/share/vm/utilities/macros.hpp /tmp/openjdk7/h
#if defined(IA32) || defined(AMD64)
#define X86
#define X86_ONLY(code) code
-diff -urN work/openjdk/hotspot/src/share/vm/utilities/ostream.cpp /tmp/openjdk7/hotspot/src/share/vm/utilities/ostream.cpp
---- ./hotspot/src/share/vm/utilities/ostream.cpp 2009-12-17 01:44:33.000000000 -0800
+--- ./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
@@ -827,7 +827,7 @@
@@ -10110,9 +9980,8 @@ diff -urN work/openjdk/hotspot/src/share/vm/utilities/ostream.cpp /tmp/openjdk7/
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
-diff -urN work/openjdk/hotspot/src/share/vm/utilities/vmError.cpp /tmp/openjdk7/hotspot/src/share/vm/utilities/vmError.cpp
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2009-12-17 01:44:33.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2009-10-31 08:51:25.000000000 -0700
+--- ./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
@@ -31,13 +31,18 @@
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
"JAVA_COMPILER", "PATH", "USERNAME",
@@ -10133,7 +10002,7 @@ diff -urN work/openjdk/hotspot/src/share/vm/utilities/vmError.cpp /tmp/openjdk7/
// defined on Windows
"OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR",
-@@ -834,7 +839,7 @@
+@@ -851,7 +856,7 @@
const char* ptr = OnError;
while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
out.print_raw ("# Executing ");
@@ -10142,8 +10011,7 @@ diff -urN work/openjdk/hotspot/src/share/vm/utilities/vmError.cpp /tmp/openjdk7/
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
-diff -urN work/openjdk/hotspot/test/Makefile /tmp/openjdk7/hotspot/test/Makefile
---- ./hotspot/test/Makefile 2009-12-17 01:44:33.000000000 -0800
+--- ./hotspot/test/Makefile 2010-01-14 01:41:51.000000000 -0800
+++ ./hotspot/test/Makefile 2009-06-28 17:58:24.000000000 -0700
@@ -44,6 +44,22 @@
ARCH = i586
@@ -10186,8 +10054,7 @@ diff -urN work/openjdk/hotspot/test/Makefile /tmp/openjdk7/hotspot/test/Makefile
ifdef TESTDIRS
JTREG_TESTDIRS = $(TESTDIRS)
endif
-diff -urN work/openjdk/hotspot/test/jprt.config /tmp/openjdk7/hotspot/test/jprt.config
---- ./hotspot/test/jprt.config 2009-12-17 01:44:33.000000000 -0800
+--- ./hotspot/test/jprt.config 2010-01-14 01:41:51.000000000 -0800
+++ ./hotspot/test/jprt.config 2009-06-06 16:54:10.000000000 -0700
@@ -75,8 +75,8 @@
@@ -10256,21 +10123,40 @@ diff -urN work/openjdk/hotspot/test/jprt.config /tmp/openjdk7/hotspot/test/jprt.
# Export PATH setting
PATH="${path4sdk}"
-diff -urN work/openjdk/jdk/.hgtags /tmp/openjdk7/jdk/.hgtags
---- ./jdk/.hgtags 2009-12-17 01:47:40.000000000 -0800
-+++ ./jdk/.hgtags 2009-12-20 19:50:45.000000000 -0800
-@@ -52,3 +52,4 @@
- 8885b22565077236a927e824ef450742e434a230 jdk7-b75
+--- ./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
+ bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
+ 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
++b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79
+--- ./jaxp/.jcheck/conf 2010-01-14 01:42:03.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
+ 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77
+ fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78
++c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79
+--- ./jaxws/.jcheck/conf 2010-01-14 01:42:21.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
e6a5d095c356a547cf5b3c8885885aca5e91e09b jdk7-b77
-+1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
-diff -urN work/openjdk/jdk/.jcheck/conf /tmp/openjdk7/jdk/.jcheck/conf
---- ./jdk/.jcheck/conf 2009-12-17 01:47:40.000000000 -0800
+ 1143e498f813b8223b5e3a696d79da7ff7c25354 jdk7-b78
++918920710d65432a2d54fdf407c1524a5571c4ad jdk7-b79
+--- ./jdk/.jcheck/conf 2010-01-14 01:45:10.000000000 -0800
+++ ./jdk/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
-diff -urN work/openjdk/jdk/make/com/sun/java/pack/Makefile /tmp/openjdk7/jdk/make/com/sun/java/pack/Makefile
---- ./jdk/make/com/sun/java/pack/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -61,6 +61,7 @@
@@ -10303,8 +10189,7 @@ diff -urN work/openjdk/jdk/make/com/sun/java/pack/Makefile /tmp/openjdk7/jdk/mak
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
-diff -urN work/openjdk/jdk/make/com/sun/nio/Makefile /tmp/openjdk7/jdk/make/com/sun/nio/Makefile
---- ./jdk/make/com/sun/nio/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -30,7 +30,16 @@
BUILDDIR = ../../..
@@ -10323,8 +10208,7 @@ diff -urN work/openjdk/jdk/make/com/sun/nio/Makefile /tmp/openjdk7/jdk/make/com/
all build clean clobber::
$(SUBDIRS-loop)
-diff -urN work/openjdk/jdk/make/com/sun/nio/sctp/Makefile /tmp/openjdk7/jdk/make/com/sun/nio/sctp/Makefile
---- ./jdk/make/com/sun/nio/sctp/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -68,6 +68,9 @@
#LIBSCTP = -lsctp
@@ -10336,8 +10220,7 @@ diff -urN work/openjdk/jdk/make/com/sun/nio/sctp/Makefile /tmp/openjdk7/jdk/make
else # windows
include $(BUILDDIR)/common/Classes.gmk
-diff -urN work/openjdk/jdk/make/com/sun/security/auth/module/Makefile /tmp/openjdk7/jdk/make/com/sun/security/auth/module/Makefile
---- ./jdk/make/com/sun/security/auth/module/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
@@ -10348,8 +10231,7 @@ diff -urN work/openjdk/jdk/make/com/sun/security/auth/module/Makefile /tmp/openj
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
-diff -urN work/openjdk/jdk/make/com/sun/tools/attach/Exportedfiles.gmk /tmp/openjdk7/jdk/make/com/sun/tools/attach/Exportedfiles.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -43,5 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
@@ -10361,8 +10243,7 @@ diff -urN work/openjdk/jdk/make/com/sun/tools/attach/Exportedfiles.gmk /tmp/open
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
-diff -urN work/openjdk/jdk/make/com/sun/tools/attach/FILES_c.gmk /tmp/openjdk7/jdk/make/com/sun/tools/attach/FILES_c.gmk
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -39,4 +39,7 @@
LinuxVirtualMachine.c
@@ -10373,8 +10254,7 @@ diff -urN work/openjdk/jdk/make/com/sun/tools/attach/FILES_c.gmk /tmp/openjdk7/j
+FILES_c = \
+ BsdVirtualMachine.c
+endif
-diff -urN work/openjdk/jdk/make/com/sun/tools/attach/FILES_java.gmk /tmp/openjdk7/jdk/make/com/sun/tools/attach/FILES_java.gmk
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -43,6 +43,11 @@
sun/tools/attach/LinuxAttachProvider.java
@@ -10388,8 +10268,7 @@ diff -urN work/openjdk/jdk/make/com/sun/tools/attach/FILES_java.gmk /tmp/openjdk
#
# Files that need to be copied
#
-diff -urN work/openjdk/jdk/make/com/sun/tools/attach/Makefile /tmp/openjdk7/jdk/make/com/sun/tools/attach/Makefile
---- ./jdk/make/com/sun/tools/attach/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -36,6 +36,9 @@
ifeq ($(PLATFORM), linux)
@@ -10401,8 +10280,7 @@ diff -urN work/openjdk/jdk/make/com/sun/tools/attach/Makefile /tmp/openjdk7/jdk/
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
-diff -urN work/openjdk/jdk/make/com/sun/tools/attach/mapfile-bsd /tmp/openjdk7/jdk/make/com/sun/tools/attach/mapfile-bsd
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -30,14 +30,12 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
@@ -10420,8 +10298,7 @@ diff -urN work/openjdk/jdk/make/com/sun/tools/attach/mapfile-bsd /tmp/openjdk7/j
local:
*;
};
-diff -urN work/openjdk/jdk/make/common/Defs-bsd.gmk /tmp/openjdk7/jdk/make/common/Defs-bsd.gmk
---- ./jdk/make/common/Defs-bsd.gmk 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -25,7 +25,7 @@
@@ -10599,8 +10476,7 @@ diff -urN work/openjdk/jdk/make/common/Defs-bsd.gmk /tmp/openjdk7/jdk/make/commo
ifeq ($(ARCH), ia64)
INCLUDE_SA = false
else
-diff -urN work/openjdk/jdk/make/common/Defs-linux.gmk /tmp/openjdk7/jdk/make/common/Defs-linux.gmk
---- ./jdk/make/common/Defs-linux.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -314,7 +314,7 @@
override LIBTHREAD =
@@ -10611,8 +10487,7 @@ diff -urN work/openjdk/jdk/make/common/Defs-linux.gmk /tmp/openjdk7/jdk/make/com
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
-diff -urN work/openjdk/jdk/make/common/Defs.gmk /tmp/openjdk7/jdk/make/common/Defs.gmk
---- ./jdk/make/common/Defs.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -181,6 +181,36 @@
endif
@@ -10670,8 +10545,7 @@ diff -urN work/openjdk/jdk/make/common/Defs.gmk /tmp/openjdk7/jdk/make/common/De
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
-diff -urN work/openjdk/jdk/make/common/Program.gmk /tmp/openjdk7/jdk/make/common/Program.gmk
---- ./jdk/make/common/Program.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -67,11 +67,27 @@
# Create a dependency on libjli (Java Launcher Infrastructure)
@@ -10733,8 +10607,7 @@ diff -urN work/openjdk/jdk/make/common/Program.gmk /tmp/openjdk7/jdk/make/common
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
-diff -urN work/openjdk/jdk/make/common/Release.gmk /tmp/openjdk7/jdk/make/common/Release.gmk
---- ./jdk/make/common/Release.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -148,14 +148,13 @@
tnameserv.1 \
@@ -10795,8 +10668,7 @@ diff -urN work/openjdk/jdk/make/common/Release.gmk /tmp/openjdk7/jdk/make/common
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
-diff -urN work/openjdk/jdk/make/common/internal/BinaryPlugs.gmk /tmp/openjdk7/jdk/make/common/internal/BinaryPlugs.gmk
---- ./jdk/make/common/internal/BinaryPlugs.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -49,8 +49,6 @@
com/sun/jmx/snmp/SnmpDataTypeEnums.class \
@@ -10885,8 +10757,7 @@ diff -urN work/openjdk/jdk/make/common/internal/BinaryPlugs.gmk /tmp/openjdk7/jd
import-binary-plug-jar \
import-binary-plugs-completed
-diff -urN work/openjdk/jdk/make/common/shared/Compiler-gcc.gmk /tmp/openjdk7/jdk/make/common/shared/Compiler-gcc.gmk
---- ./jdk/make/common/shared/Compiler-gcc.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -72,6 +72,24 @@
@@ -10913,8 +10784,7 @@ diff -urN work/openjdk/jdk/make/common/shared/Compiler-gcc.gmk /tmp/openjdk7/jdk
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
-diff -urN work/openjdk/jdk/make/common/shared/Defs-bsd.gmk /tmp/openjdk7/jdk/make/common/shared/Defs-bsd.gmk
---- ./jdk/make/common/shared/Defs-bsd.gmk 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -54,7 +54,7 @@
endef
@@ -10954,8 +10824,7 @@ diff -urN work/openjdk/jdk/make/common/shared/Defs-bsd.gmk /tmp/openjdk7/jdk/mak
# Import JDK images allow for partial builds, components not built are
# imported (or copied from) these import areas when needed.
-diff -urN work/openjdk/jdk/make/common/shared/Defs-utils.gmk /tmp/openjdk7/jdk/make/common/shared/Defs-utils.gmk
---- ./jdk/make/common/shared/Defs-utils.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -67,6 +67,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
@@ -11009,8 +10878,7 @@ diff -urN work/openjdk/jdk/make/common/shared/Defs-utils.gmk /tmp/openjdk7/jdk/m
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
-diff -urN work/openjdk/jdk/make/common/shared/Defs.gmk /tmp/openjdk7/jdk/make/common/shared/Defs.gmk
---- ./jdk/make/common/shared/Defs.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -589,8 +589,8 @@
override CC_VERSION = sun
@@ -11023,8 +10891,7 @@ diff -urN work/openjdk/jdk/make/common/shared/Defs.gmk /tmp/openjdk7/jdk/make/co
override CC_VERSION = gcc
endif
-diff -urN work/openjdk/jdk/make/common/shared/Platform.gmk /tmp/openjdk7/jdk/make/common/shared/Platform.gmk
---- ./jdk/make/common/shared/Platform.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -82,7 +82,7 @@
SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
@@ -11171,8 +11038,7 @@ diff -urN work/openjdk/jdk/make/common/shared/Platform.gmk /tmp/openjdk7/jdk/mak
# If blanks in the username, use the first 4 words and pack them together
_USER1:=$(subst ', ,$(_USER))
_USER2:=$(subst ", ,$(_USER1))
-diff -urN work/openjdk/jdk/make/common/shared/Sanity-Settings.gmk /tmp/openjdk7/jdk/make/common/shared/Sanity-Settings.gmk
---- ./jdk/make/common/shared/Sanity-Settings.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -244,6 +244,7 @@
ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
@@ -11182,8 +11048,7 @@ diff -urN work/openjdk/jdk/make/common/shared/Sanity-Settings.gmk /tmp/openjdk7/
ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS)
ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
-diff -urN work/openjdk/jdk/make/common/shared/Sanity.gmk /tmp/openjdk7/jdk/make/common/shared/Sanity.gmk
---- ./jdk/make/common/shared/Sanity.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -142,6 +142,11 @@
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
@@ -11216,8 +11081,7 @@ diff -urN work/openjdk/jdk/make/common/shared/Sanity.gmk /tmp/openjdk7/jdk/make/
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
-diff -urN work/openjdk/jdk/make/docs/Makefile /tmp/openjdk7/jdk/make/docs/Makefile
---- ./jdk/make/docs/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./jdk/make/docs/Makefile 2010-01-14 01:45:11.000000000 -0800
+++ ./jdk/make/docs/Makefile 2009-06-28 17:59:21.000000000 -0700
@@ -214,7 +214,7 @@
# you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR)
@@ -11228,8 +11092,7 @@ diff -urN work/openjdk/jdk/make/docs/Makefile /tmp/openjdk7/jdk/make/docs/Makefi
JAAS_DOCDIR = $(DOCSDIR)/jre/api/security/jaas/spec
JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \
-encoding ascii \
-diff -urN work/openjdk/jdk/make/java/Makefile /tmp/openjdk7/jdk/make/java/Makefile
---- ./jdk/make/java/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./jdk/make/java/Makefile 2010-01-14 01:45:11.000000000 -0800
+++ ./jdk/make/java/Makefile 2009-06-06 17:25:51.000000000 -0700
@@ -49,7 +49,7 @@
endif
@@ -11240,8 +11103,7 @@ diff -urN work/openjdk/jdk/make/java/Makefile /tmp/openjdk7/jdk/make/java/Makefi
SUBDIRS += jexec
endif # PLATFORM
-diff -urN work/openjdk/jdk/make/java/hpi/hpi_common.gmk /tmp/openjdk7/jdk/make/java/hpi/hpi_common.gmk
---- ./jdk/make/java/hpi/hpi_common.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -86,5 +86,9 @@
# Things that must be linked in.
@@ -11253,8 +11115,7 @@ diff -urN work/openjdk/jdk/make/java/hpi/hpi_common.gmk /tmp/openjdk7/jdk/make/j
OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
endif
+endif
-diff -urN work/openjdk/jdk/make/java/hpi/native/Makefile /tmp/openjdk7/jdk/make/java/hpi/native/Makefile
---- ./jdk/make/java/hpi/native/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -72,16 +72,25 @@
ifeq ($(MOOT_PRIORITIES),true)
@@ -11282,8 +11143,7 @@ diff -urN work/openjdk/jdk/make/java/hpi/native/Makefile /tmp/openjdk7/jdk/make/
ifeq ($(HAVE_FILIOH),true)
OTHER_CPPFLAGS += -DHAVE_FILIOH
endif
-diff -urN work/openjdk/jdk/make/java/instrument/Makefile /tmp/openjdk7/jdk/make/java/instrument/Makefile
---- ./jdk/make/java/instrument/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -102,6 +102,26 @@
# equivalent of strcasecmp is stricmp on Windows
@@ -11320,8 +11180,7 @@ diff -urN work/openjdk/jdk/make/java/instrument/Makefile /tmp/openjdk7/jdk/make/
#
# Library to compile.
-diff -urN work/openjdk/jdk/make/java/java/Makefile /tmp/openjdk7/jdk/make/java/java/Makefile
---- ./jdk/make/java/java/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -165,8 +165,10 @@
# Is the altzone extern documented in ctime(3C) available?
@@ -11349,8 +11208,7 @@ diff -urN work/openjdk/jdk/make/java/java/Makefile /tmp/openjdk7/jdk/make/java/j
#
# Rules.
-diff -urN work/openjdk/jdk/make/java/java/genlocales.gmk /tmp/openjdk7/jdk/make/java/java/genlocales.gmk
---- ./jdk/make/java/java/genlocales.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -76,10 +76,14 @@
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
@@ -11371,8 +11229,7 @@ diff -urN work/openjdk/jdk/make/java/java/genlocales.gmk /tmp/openjdk7/jdk/make/
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
-diff -urN work/openjdk/jdk/make/java/java/localegen.sh /tmp/openjdk7/jdk/make/java/java/localegen.sh
---- ./jdk/make/java/java/localegen.sh 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -55,9 +55,9 @@
for FILE in $RESOURCE_NAMES
@@ -11386,8 +11243,7 @@ diff -urN work/openjdk/jdk/make/java/java/localegen.sh /tmp/openjdk7/jdk/make/ja
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
-diff -urN work/openjdk/jdk/make/java/java_hprof_demo/Makefile /tmp/openjdk7/jdk/make/java/java_hprof_demo/Makefile
---- ./jdk/make/java/java_hprof_demo/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -83,8 +83,10 @@
ifeq ($(PLATFORM), windows)
@@ -11400,9 +11256,8 @@ diff -urN work/openjdk/jdk/make/java/java_hprof_demo/Makefile /tmp/openjdk7/jdk/
#
# Tell library.gmk to copy the txt file first
-diff -urN work/openjdk/jdk/make/java/jli/Makefile /tmp/openjdk7/jdk/make/java/jli/Makefile
---- ./jdk/make/java/jli/Makefile 2009-12-17 01:47:41.000000000 -0800
-+++ ./jdk/make/java/jli/Makefile 2009-12-20 19:50:46.000000000 -0800
+--- ./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
@@ -44,7 +44,9 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -11465,7 +11320,7 @@ diff -urN work/openjdk/jdk/make/java/jli/Makefile /tmp/openjdk7/jdk/make/java/jl
#
# Library to compile.
-@@ -163,7 +175,28 @@
+@@ -162,7 +174,28 @@
endif # PLATFORM
@@ -11495,8 +11350,7 @@ diff -urN work/openjdk/jdk/make/java/jli/Makefile /tmp/openjdk7/jdk/make/java/jl
+ vpath %.c $(ZIP_SRC)
+endif
+
-diff -urN work/openjdk/jdk/make/java/management/Makefile /tmp/openjdk7/jdk/make/java/management/Makefile
---- ./jdk/make/java/management/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -85,6 +85,11 @@
OTHER_INCLUDES += \
@@ -11510,8 +11364,7 @@ diff -urN work/openjdk/jdk/make/java/management/Makefile /tmp/openjdk7/jdk/make/
ifeq ($(PLATFORM),windows)
OTHER_LDLIBS += $(JVMLIB)
endif
-diff -urN work/openjdk/jdk/make/java/net/FILES_c.gmk /tmp/openjdk7/jdk/make/java/net/FILES_c.gmk
---- ./jdk/make/java/net/FILES_c.gmk 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -47,6 +47,10 @@
FILES_c += linux_close.c
@@ -11524,8 +11377,7 @@ diff -urN work/openjdk/jdk/make/java/net/FILES_c.gmk /tmp/openjdk7/jdk/make/java
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
-diff -urN work/openjdk/jdk/make/java/net/Makefile /tmp/openjdk7/jdk/make/java/net/Makefile
---- ./jdk/make/java/net/Makefile 2009-12-17 01:47:41.000000000 -0800
+--- ./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
@@ -92,6 +92,12 @@
@@ -11548,8 +11400,7 @@ diff -urN work/openjdk/jdk/make/java/net/Makefile /tmp/openjdk7/jdk/make/java/ne
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
-diff -urN work/openjdk/jdk/make/java/nio/Makefile /tmp/openjdk7/jdk/make/java/nio/Makefile
---- ./jdk/make/java/nio/Makefile 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -260,6 +260,69 @@
sun/nio/fs/UnixConstants.java
@@ -11653,8 +11504,7 @@ diff -urN work/openjdk/jdk/make/java/nio/Makefile /tmp/openjdk7/jdk/make/java/ni
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
-diff -urN work/openjdk/jdk/make/java/nio/mapfile-bsd /tmp/openjdk7/jdk/make/java/nio/mapfile-bsd
---- ./jdk/make/java/nio/mapfile-bsd 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -36,25 +36,6 @@
Java_sun_nio_ch_DatagramDispatcher_readv0;
@@ -11713,8 +11563,7 @@ diff -urN work/openjdk/jdk/make/java/nio/mapfile-bsd /tmp/openjdk7/jdk/make/java
Java_sun_nio_fs_UnixNativeDispatcher_init;
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
Java_sun_nio_fs_UnixNativeDispatcher_strerror;
-diff -urN work/openjdk/jdk/make/java/npt/Makefile /tmp/openjdk7/jdk/make/java/npt/Makefile
---- ./jdk/make/java/npt/Makefile 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -65,6 +65,18 @@
OTHER_LCF += -export:nptInitialize -export:nptTerminate
@@ -11735,8 +11584,7 @@ diff -urN work/openjdk/jdk/make/java/npt/Makefile /tmp/openjdk7/jdk/make/java/np
#
# Add to ambient vpath so we pick up the library files
#
-diff -urN work/openjdk/jdk/make/java/redist/FILES.gmk /tmp/openjdk7/jdk/make/java/redist/FILES.gmk
---- ./jdk/make/java/redist/FILES.gmk 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -38,6 +38,14 @@
$(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
@@ -11753,8 +11601,7 @@ diff -urN work/openjdk/jdk/make/java/redist/FILES.gmk /tmp/openjdk7/jdk/make/jav
# 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
-diff -urN work/openjdk/jdk/make/java/redist/Makefile /tmp/openjdk7/jdk/make/java/redist/Makefile
---- ./jdk/make/java/redist/Makefile 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -333,7 +333,7 @@
$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
@@ -11774,8 +11621,7 @@ diff -urN work/openjdk/jdk/make/java/redist/Makefile /tmp/openjdk7/jdk/make/java
endif # !OPENJDK
# Import internal files (ones that are stashed in this source tree)
-diff -urN work/openjdk/jdk/make/java/security/Makefile /tmp/openjdk7/jdk/make/java/security/Makefile
---- ./jdk/make/java/security/Makefile 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -51,7 +51,15 @@
ifneq ($(ARCH_DATA_MODEL), 64)
@@ -11793,8 +11639,7 @@ diff -urN work/openjdk/jdk/make/java/security/Makefile /tmp/openjdk7/jdk/make/ja
endif # PLATFORM
-diff -urN work/openjdk/jdk/make/java/zip/FILES_c.gmk /tmp/openjdk7/jdk/make/java/zip/FILES_c.gmk
---- ./jdk/make/java/zip/FILES_c.gmk 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -29,7 +29,10 @@
Deflater.c \
@@ -11815,8 +11660,7 @@ diff -urN work/openjdk/jdk/make/java/zip/FILES_c.gmk /tmp/openjdk7/jdk/make/java
- zutil.c
+ zutil.c
+endif
-diff -urN work/openjdk/jdk/make/java/zip/Makefile /tmp/openjdk7/jdk/make/java/zip/Makefile
---- ./jdk/make/java/zip/Makefile 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -71,16 +71,28 @@
CPPFLAGS += -UDEBUG
@@ -11848,8 +11692,7 @@ diff -urN work/openjdk/jdk/make/java/zip/Makefile /tmp/openjdk7/jdk/make/java/zi
OTHER_LDLIBS = $(JVMLIB)
+endif
+
-diff -urN work/openjdk/jdk/make/javax/sound/FILES_c.gmk /tmp/openjdk7/jdk/make/javax/sound/FILES_c.gmk
---- ./jdk/make/javax/sound/FILES_c.gmk 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -34,6 +34,8 @@
@@ -11860,8 +11703,7 @@ diff -urN work/openjdk/jdk/make/javax/sound/FILES_c.gmk /tmp/openjdk7/jdk/make/j
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
-diff -urN work/openjdk/jdk/make/javax/sound/Makefile /tmp/openjdk7/jdk/make/javax/sound/Makefile
---- ./jdk/make/javax/sound/Makefile 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -107,6 +107,16 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
@@ -11880,8 +11722,7 @@ diff -urN work/openjdk/jdk/make/javax/sound/Makefile /tmp/openjdk7/jdk/make/java
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
-diff -urN work/openjdk/jdk/make/javax/sound/SoundDefs.gmk /tmp/openjdk7/jdk/make/javax/sound/SoundDefs.gmk
---- ./jdk/make/javax/sound/SoundDefs.gmk 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
@@ -11894,8 +11735,7 @@ diff -urN work/openjdk/jdk/make/javax/sound/SoundDefs.gmk /tmp/openjdk7/jdk/make
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
-diff -urN work/openjdk/jdk/make/jpda/back/Makefile /tmp/openjdk7/jdk/make/jpda/back/Makefile
---- ./jdk/make/jpda/back/Makefile 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -49,8 +49,10 @@
-I$(GENNATIVESRCDIR)/jdwp
@@ -11908,8 +11748,7 @@ diff -urN work/openjdk/jdk/make/jpda/back/Makefile /tmp/openjdk7/jdk/make/jpda/b
#
# This controls the ability to do logging in the library.
-diff -urN work/openjdk/jdk/make/jpda/transport/socket/Makefile /tmp/openjdk7/jdk/make/jpda/transport/socket/Makefile
---- ./jdk/make/jpda/transport/socket/Makefile 2009-12-17 01:47:42.000000000 -0800
+--- ./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
@@ -40,6 +40,11 @@
OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
@@ -11923,8 +11762,7 @@ diff -urN work/openjdk/jdk/make/jpda/transport/socket/Makefile /tmp/openjdk7/jdk
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += -lnsl $(LIBSOCKET)
endif
-diff -urN work/openjdk/jdk/make/sun/awt/Makefile /tmp/openjdk7/jdk/make/sun/awt/Makefile
---- ./jdk/make/sun/awt/Makefile 2009-12-17 01:47:43.000000000 -0800
+--- ./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
@@ -123,6 +123,13 @@
OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
@@ -11994,8 +11832,7 @@ diff -urN work/openjdk/jdk/make/sun/awt/Makefile /tmp/openjdk7/jdk/make/sun/awt/
LDFLAGS += -L$(OPENWIN_LIB)
endif
-diff -urN work/openjdk/jdk/make/sun/awt/mapfile-vers-bsd /tmp/openjdk7/jdk/make/sun/awt/mapfile-vers-bsd
---- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -532,11 +532,11 @@
@@ -12014,8 +11851,7 @@ diff -urN work/openjdk/jdk/make/sun/awt/mapfile-vers-bsd /tmp/openjdk7/jdk/make/
# CDE private entry point
Java_sun_awt_motif_XsessionWMcommand;
-diff -urN work/openjdk/jdk/make/sun/awt/mawt.gmk /tmp/openjdk7/jdk/make/sun/awt/mawt.gmk
---- ./jdk/make/sun/awt/mawt.gmk 2009-12-17 01:47:43.000000000 -0800
+--- ./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
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
@@ -12083,8 +11919,7 @@ diff -urN work/openjdk/jdk/make/sun/awt/mawt.gmk /tmp/openjdk7/jdk/make/sun/awt/
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
-diff -urN work/openjdk/jdk/make/sun/font/Makefile /tmp/openjdk7/jdk/make/sun/font/Makefile
---- ./jdk/make/sun/font/Makefile 2009-12-17 01:47:43.000000000 -0800
+--- ./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
@@ -169,6 +169,15 @@
# Libraries to link, and other C flags.
@@ -12110,8 +11945,7 @@ diff -urN work/openjdk/jdk/make/sun/font/Makefile /tmp/openjdk7/jdk/make/sun/fon
endif # PLATFORM
-diff -urN work/openjdk/jdk/make/sun/image/generic/Makefile /tmp/openjdk7/jdk/make/sun/image/generic/Makefile
---- ./jdk/make/sun/image/generic/Makefile 2009-12-17 01:47:43.000000000 -0800
+--- ./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
@@ -68,5 +68,9 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib
@@ -12124,8 +11958,7 @@ diff -urN work/openjdk/jdk/make/sun/image/generic/Makefile /tmp/openjdk7/jdk/mak
+endif
+
-diff -urN work/openjdk/jdk/make/sun/jawt/Makefile /tmp/openjdk7/jdk/make/sun/jawt/Makefile
---- ./jdk/make/sun/jawt/Makefile 2009-12-17 01:47:43.000000000 -0800
+--- ./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
@@ -92,8 +92,7 @@
#
@@ -12154,8 +11987,7 @@ diff -urN work/openjdk/jdk/make/sun/jawt/Makefile /tmp/openjdk7/jdk/make/sun/jaw
OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
endif # PLATFORM
-diff -urN work/openjdk/jdk/make/sun/security/ec/Makefile /tmp/openjdk7/jdk/make/sun/security/ec/Makefile
---- ./jdk/make/sun/security/ec/Makefile 2009-12-17 01:47:43.000000000 -0800
+--- ./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
@@ -192,7 +192,11 @@
ifeq ($(PLATFORM), windows)
@@ -12170,8 +12002,7 @@ diff -urN work/openjdk/jdk/make/sun/security/ec/Makefile /tmp/openjdk7/jdk/make/
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
-diff -urN work/openjdk/jdk/make/sun/security/jgss/wrapper/Makefile /tmp/openjdk7/jdk/make/sun/security/jgss/wrapper/Makefile
---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2009-12-17 01:47:44.000000000 -0800
+--- ./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
@@ -71,6 +71,10 @@
#
@@ -12185,8 +12016,7 @@ diff -urN work/openjdk/jdk/make/sun/security/jgss/wrapper/Makefile /tmp/openjdk7
+ifeq ($(PLATFORM), bsd)
+ OTHER_LDLIBS = $(JVMLIB)
+endif
-diff -urN work/openjdk/jdk/make/sun/security/pkcs11/Makefile /tmp/openjdk7/jdk/make/sun/security/pkcs11/Makefile
---- ./jdk/make/sun/security/pkcs11/Makefile 2009-12-17 01:47:44.000000000 -0800
+--- ./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
@@ -155,7 +155,7 @@
#
@@ -12197,8 +12027,7 @@ diff -urN work/openjdk/jdk/make/sun/security/pkcs11/Makefile /tmp/openjdk7/jdk/m
OTHER_LDLIBS = $(JVMLIB)
else
OTHER_LDLIBS = -ldl $(JVMLIB)
-diff -urN work/openjdk/jdk/make/sun/security/smartcardio/Makefile /tmp/openjdk7/jdk/make/sun/security/smartcardio/Makefile
---- ./jdk/make/sun/security/smartcardio/Makefile 2009-12-17 01:47:44.000000000 -0800
+--- ./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
@@ -75,6 +75,10 @@
ifeq ($(PLATFORM), windows)
@@ -12212,8 +12041,7 @@ diff -urN work/openjdk/jdk/make/sun/security/smartcardio/Makefile /tmp/openjdk7/
+ endif
OTHER_CFLAGS = -D__sun_jdk
endif
-diff -urN work/openjdk/jdk/make/sun/splashscreen/FILES_c.gmk /tmp/openjdk7/jdk/make/sun/splashscreen/FILES_c.gmk
---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2009-12-17 01:47:44.000000000 -0800
+--- ./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
@@ -49,18 +49,6 @@
dgif_lib.c \
@@ -12253,8 +12081,7 @@ diff -urN work/openjdk/jdk/make/sun/splashscreen/FILES_c.gmk /tmp/openjdk7/jdk/m
+ zcrc32.c \
+ zutil.c
+endif
-diff -urN work/openjdk/jdk/make/sun/splashscreen/Makefile /tmp/openjdk7/jdk/make/sun/splashscreen/Makefile
---- ./jdk/make/sun/splashscreen/Makefile 2009-12-17 01:47:44.000000000 -0800
+--- ./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
@@ -63,8 +63,24 @@
@@ -12306,8 +12133,7 @@ diff -urN work/openjdk/jdk/make/sun/splashscreen/Makefile /tmp/openjdk7/jdk/make
# Shun the less than portable MMX assembly code in pnggccrd.c,
# and use alternative implementations in C.
-diff -urN work/openjdk/jdk/make/sun/xawt/Makefile /tmp/openjdk7/jdk/make/sun/xawt/Makefile
---- ./jdk/make/sun/xawt/Makefile 2009-12-17 01:47:44.000000000 -0800
+--- ./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
@@ -47,12 +47,20 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -12381,8 +12207,7 @@ diff -urN work/openjdk/jdk/make/sun/xawt/Makefile /tmp/openjdk7/jdk/make/sun/xaw
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
-diff -urN work/openjdk/jdk/make/tools/freetypecheck/Makefile /tmp/openjdk7/jdk/make/tools/freetypecheck/Makefile
---- ./jdk/make/tools/freetypecheck/Makefile 2009-12-17 01:47:46.000000000 -0800
+--- ./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
@@ -49,8 +49,15 @@
# Add runtime lib search path to ensure test will be runnable
@@ -12401,8 +12226,7 @@ diff -urN work/openjdk/jdk/make/tools/freetypecheck/Makefile /tmp/openjdk7/jdk/m
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
-diff -urN work/openjdk/jdk/src/share/back/commonRef.c /tmp/openjdk7/jdk/src/share/back/commonRef.c
---- ./jdk/src/share/back/commonRef.c 2009-12-17 01:47:47.000000000 -0800
+--- ./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
@@ -23,6 +23,10 @@
* have any questions.
@@ -12415,9 +12239,8 @@ diff -urN work/openjdk/jdk/src/share/back/commonRef.c /tmp/openjdk7/jdk/src/shar
#include "util.h"
#include "commonRef.h"
-diff -urN work/openjdk/jdk/src/share/bin/java.c /tmp/openjdk7/jdk/src/share/bin/java.c
---- ./jdk/src/share/bin/java.c 2009-12-17 01:47:48.000000000 -0800
-+++ ./jdk/src/share/bin/java.c 2009-12-20 19:50:46.000000000 -0800
+--- ./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
@@ -66,6 +66,10 @@
static jboolean printUsage = JNI_FALSE; /* print and exit*/
static jboolean printXUsage = JNI_FALSE; /* print and exit*/
@@ -12429,7 +12252,7 @@ diff -urN work/openjdk/jdk/src/share/bin/java.c /tmp/openjdk7/jdk/src/share/bin/
static const char *_program_name;
static const char *_launcher_name;
static jboolean _is_java_args = JNI_FALSE;
-@@ -114,6 +118,10 @@
+@@ -115,6 +119,10 @@
static void DumpState();
static jboolean RemovableOption(char *option);
@@ -12440,7 +12263,7 @@ diff -urN work/openjdk/jdk/src/share/bin/java.c /tmp/openjdk7/jdk/src/share/bin/
/* Maximum supported entries from jvm.cfg. */
#define INIT_MAX_KNOWN_VMS 10
-@@ -293,9 +301,16 @@
+@@ -297,9 +305,16 @@
/* Show the splash screen if needed */
ShowSplashScreen();
@@ -12459,7 +12282,7 @@ diff -urN work/openjdk/jdk/src/share/bin/java.c /tmp/openjdk7/jdk/src/share/bin/
}
#define CHECK_EXCEPTION_NULL_LEAVE(e) \
-@@ -973,6 +988,12 @@
+@@ -1015,6 +1030,12 @@
} else if (JLI_StrCmp(arg, "-X") == 0) {
printXUsage = JNI_TRUE;
return JNI_TRUE;
@@ -12472,7 +12295,7 @@ diff -urN work/openjdk/jdk/src/share/bin/java.c /tmp/openjdk7/jdk/src/share/bin/
/*
* The following case provide backward compatibility with old-style
* command line options.
-@@ -1860,6 +1881,44 @@
+@@ -1902,6 +1923,44 @@
}
}
@@ -12517,8 +12340,7 @@ diff -urN work/openjdk/jdk/src/share/bin/java.c /tmp/openjdk7/jdk/src/share/bin/
static void
DumpState()
{
-diff -urN work/openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java /tmp/openjdk7/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2009-12-17 01:47:49.000000000 -0800
+--- ./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
@@ -477,6 +477,10 @@
String[] dirs = new String[] {
@@ -12531,8 +12353,7 @@ diff -urN work/openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacit
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
-diff -urN work/openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java /tmp/openjdk7/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
---- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2009-12-17 01:47:51.000000000 -0800
+--- ./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
@@ -78,6 +78,9 @@
*/
@@ -12544,8 +12365,7 @@ diff -urN work/openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java /
/**
-diff -urN work/openjdk/jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider /tmp/openjdk7/jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider
---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-01-02 11:10:50.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,6 +0,0 @@
-# service provider file for Bsd: with DirectAudioDeviceProvider
@@ -12554,8 +12374,7 @@ diff -urN work/openjdk/jdk/src/share/classes/com/sun/media/sound/services/bsd-i5
-com.sun.media.sound.SimpleInputDeviceProvider
-com.sun.media.sound.DirectAudioDeviceProvider
-com.sun.media.sound.HeadspaceMixerProvider
-diff -urN work/openjdk/jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java /tmp/openjdk7/jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java
---- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -12751,8 +12570,7 @@ diff -urN work/openjdk/jdk/src/share/classes/com/sun/servicetag/BsdSystemEnviron
- }
-
-}
-diff -urN work/openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java /tmp/openjdk7/jdk/src/share/classes/java/awt/GraphicsEnvironment.java
---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-12-17 01:47:56.000000000 -0800
+--- ./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
@@ -172,7 +172,12 @@
} else {
@@ -12768,8 +12586,7 @@ diff -urN work/openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java /
(System.getenv("DISPLAY") == null));
}
} else if (nm.equals("true")) {
-diff -urN work/openjdk/jdk/src/share/classes/java/util/TimeZone.java /tmp/openjdk7/jdk/src/share/classes/java/util/TimeZone.java
---- ./jdk/src/share/classes/java/util/TimeZone.java 2009-12-17 01:48:03.000000000 -0800
+--- ./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
@@ -776,15 +776,13 @@
}
@@ -12788,8 +12605,7 @@ diff -urN work/openjdk/jdk/src/share/classes/java/util/TimeZone.java /tmp/openjd
}
return zi;
}
-diff -urN work/openjdk/jdk/src/share/classes/sun/awt/FontConfiguration.java /tmp/openjdk7/jdk/src/share/classes/sun/awt/FontConfiguration.java
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2009-12-17 01:48:13.000000000 -0800
+--- ./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
@@ -1122,7 +1122,7 @@
*/
@@ -12809,8 +12625,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/awt/FontConfiguration.java /tmp
errors++;
}
}
-diff -urN work/openjdk/jdk/src/share/classes/sun/awt/OSInfo.java /tmp/openjdk7/jdk/src/share/classes/sun/awt/OSInfo.java
---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2009-12-17 01:48:13.000000000 -0800
+--- ./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
@@ -39,6 +39,7 @@
WINDOWS,
@@ -12835,8 +12650,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/awt/OSInfo.java /tmp/openjdk7/j
// determine another OS here
}
-diff -urN work/openjdk/jdk/src/share/classes/sun/font/FontUtilities.java /tmp/openjdk7/jdk/src/share/classes/sun/font/FontUtilities.java
---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2009-12-17 01:48:14.000000000 -0800
+--- ./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
@@ -46,6 +46,8 @@
@@ -12859,8 +12673,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/font/FontUtilities.java /tmp/op
String t2kStr = AccessController.doPrivileged(
new GetPropertyAction("sun.java2d.font.scaler"));
if (t2kStr != null) {
-diff -urN work/openjdk/jdk/src/share/classes/sun/font/SunFontManager.java /tmp/openjdk7/jdk/src/share/classes/sun/font/SunFontManager.java
---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2009-12-17 01:48:14.000000000 -0800
+--- ./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
@@ -409,7 +409,7 @@
* registerFonts method as on-screen these JRE fonts
@@ -12871,8 +12684,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/font/SunFontManager.java /tmp/o
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
-diff -urN work/openjdk/jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java /tmp/openjdk7/jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java
---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,190 +0,0 @@
-/*
@@ -13065,8 +12877,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java /t
- return charOff - outOff;
- }
-}
-diff -urN work/openjdk/jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java /tmp/openjdk7/jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java
---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13262,8 +13073,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java /t
- return 2;
- }
-}
-diff -urN work/openjdk/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java /tmp/openjdk7/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java
---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,374 +0,0 @@
-/*
@@ -13640,8 +13450,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java /tmp
- }
- }
-}
-diff -urN work/openjdk/jdk/src/share/classes/sun/print/PSPrinterJob.java /tmp/openjdk7/jdk/src/share/classes/sun/print/PSPrinterJob.java
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2009-12-17 01:48:18.000000000 -0800
+--- ./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
@@ -1534,7 +1534,9 @@
pFlags |= NOSHEET;
@@ -13654,16 +13463,14 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/print/PSPrinterJob.java /tmp/op
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
-diff -urN work/openjdk/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider /tmp/openjdk7/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2009-12-17 01:48:23.000000000 -0800
+--- ./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
@@ -30,3 +30,4 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[bsd]sun.tools.attach.BsdAttachProvider
-diff -urN work/openjdk/jdk/src/share/classes/sun/tools/jar/Main.java /tmp/openjdk7/jdk/src/share/classes/sun/tools/jar/Main.java
---- ./jdk/src/share/classes/sun/tools/jar/Main.java 2009-12-17 01:48:23.000000000 -0800
+--- ./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
@@ -50,6 +50,7 @@
String zname = "";
@@ -13735,8 +13542,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/tools/jar/Main.java /tmp/openjd
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
-diff -urN work/openjdk/jdk/src/share/classes/sun/tools/jar/resources/jar.properties /tmp/openjdk7/jdk/src/share/classes/sun/tools/jar/resources/jar.properties
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2009-12-17 01:48:23.000000000 -0800
+--- ./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
@@ -44,6 +44,8 @@
{0} : could not create directory
@@ -13747,8 +13553,7 @@ diff -urN work/openjdk/jdk/src/share/classes/sun/tools/jar/resources/jar.propert
out.added.manifest=\
added manifest
out.update.manifest=\
-diff -urN work/openjdk/jdk/src/share/hpi/include/hpi_impl.h /tmp/openjdk7/jdk/src/share/hpi/include/hpi_impl.h
---- ./jdk/src/share/hpi/include/hpi_impl.h 2009-12-17 01:48:26.000000000 -0800
+--- ./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
@@ -138,7 +138,11 @@
int sysBind(int fd, struct sockaddr *him, int len);
@@ -13763,7 +13568,6 @@ diff -urN work/openjdk/jdk/src/share/hpi/include/hpi_impl.h /tmp/openjdk7/jdk/sr
ssize_t sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to,
int tolen);
ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags,
-diff -urN work/openjdk/jdk/src/share/lib/security/java.security-openbsd /tmp/openjdk7/jdk/src/share/lib/security/java.security-openbsd
--- ./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
@@ -0,0 +1,269 @@
@@ -14036,8 +13840,7 @@ diff -urN work/openjdk/jdk/src/share/lib/security/java.security-openbsd /tmp/ope
+# Example,
+# ocsp.responderCertSerialNumber=2A:FF:00
+
-diff -urN work/openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h /tmp/openjdk7/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -32,6 +32,10 @@
#include <unistd.h>
@@ -14064,8 +13867,7 @@ diff -urN work/openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
-diff -urN work/openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp /tmp/openjdk7/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -22,6 +22,9 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
@@ -14107,8 +13909,7 @@ diff -urN work/openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
true));
}
-diff -urN work/openjdk/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c /tmp/openjdk7/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -33,7 +33,11 @@
@@ -14122,8 +13923,7 @@ diff -urN work/openjdk/jdk/src/share/native/com/sun/media/sound/DirectAudioDevic
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
-diff -urN work/openjdk/jdk/src/share/native/com/sun/media/sound/Platform.c /tmp/openjdk7/jdk/src/share/native/com/sun/media/sound/Platform.c
---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -99,5 +99,17 @@
return com_sun_media_sound_Platform_LIB_ALSA;
@@ -14143,8 +13943,7 @@ diff -urN work/openjdk/jdk/src/share/native/com/sun/media/sound/Platform.c /tmp/
+#endif
return 0;
}
-diff -urN work/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h /tmp/openjdk7/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -31,6 +31,7 @@
#define X_WINDOWS 1
@@ -14173,8 +13972,7 @@ diff -urN work/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h /tmp
+
+
#endif // __SOUNDDEFS_INCLUDED__
-diff -urN work/openjdk/jdk/src/share/native/common/check_code.c /tmp/openjdk7/jdk/src/share/native/common/check_code.c
---- ./jdk/src/share/native/common/check_code.c 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -1065,7 +1065,7 @@
* Make sure that branches don't go into the middle of nowhere.
@@ -14237,8 +14035,7 @@ diff -urN work/openjdk/jdk/src/share/native/common/check_code.c /tmp/openjdk7/jd
/* There can't be more than 64K labels because of the limit
* on per-method byte code length.
*/
-diff -urN work/openjdk/jdk/src/share/native/java/io/io_util.h /tmp/openjdk7/jdk/src/share/native/java/io/io_util.h
---- ./jdk/src/share/native/java/io/io_util.h 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -29,7 +29,15 @@
extern jfieldID IO_fd_fdID;
@@ -14257,8 +14054,7 @@ diff -urN work/openjdk/jdk/src/share/native/java/io/io_util.h /tmp/openjdk7/jdk/
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
-diff -urN work/openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h /tmp/openjdk7/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -24,6 +24,15 @@
* have any questions.
@@ -14300,8 +14096,7 @@ diff -urN work/openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h /t
/*
* ANSI/POSIX
-diff -urN work/openjdk/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h /tmp/openjdk7/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
---- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -61,7 +61,7 @@
#define log1p jlog1p
@@ -14312,8 +14107,7 @@ diff -urN work/openjdk/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h /
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_acosh __j__ieee754_acosh
-diff -urN work/openjdk/jdk/src/share/native/java/util/zip/Inflater.c /tmp/openjdk7/jdk/src/share/native/java/util/zip/Inflater.c
---- ./jdk/src/share/native/java/util/zip/Inflater.c 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -67,6 +67,10 @@
return jlong_zero;
@@ -14337,8 +14131,7 @@ diff -urN work/openjdk/jdk/src/share/native/java/util/zip/Inflater.c /tmp/openjd
}
JNIEXPORT void JNICALL
-diff -urN work/openjdk/jdk/src/share/native/java/util/zip/zip_util.c /tmp/openjdk7/jdk/src/share/native/java/util/zip/zip_util.c
---- ./jdk/src/share/native/java/util/zip/zip_util.c 2009-12-17 01:48:27.000000000 -0800
+--- ./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
@@ -46,6 +46,10 @@
#include "zip_util.h"
@@ -14351,8 +14144,7 @@ diff -urN work/openjdk/jdk/src/share/native/java/util/zip/zip_util.c /tmp/openjd
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
#include <sys/mman.h>
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/debug/debug_util.h /tmp/openjdk7/jdk/src/share/native/sun/awt/debug/debug_util.h
---- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2009-12-17 01:48:28.000000000 -0800
+--- ./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
@@ -50,7 +50,9 @@
#include <stdio.h>
@@ -14364,8 +14156,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/debug/debug_util.h /tmp/open
#include <limits.h>
/* keep these after the other headers */
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c /tmp/openjdk7/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c
---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2009-12-17 01:48:28.000000000 -0800
+--- ./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
@@ -24,7 +24,11 @@
*/
@@ -14379,8 +14170,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c /t
#include "sun_awt_image_BufImgSurfaceData.h"
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/image/DataBufferNative.c /tmp/openjdk7/jdk/src/share/native/sun/awt/image/DataBufferNative.c
---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2009-12-17 01:48:28.000000000 -0800
+--- ./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
@@ -23,7 +23,11 @@
* have any questions.
@@ -14394,8 +14184,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/image/DataBufferNative.c /tm
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -14436,8 +14225,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f
#endif /* _NO_LONGLONG */
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14478,8 +14266,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ex
#endif /* _NO_LONGLONG */
/***************************************************************/
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14520,8 +14307,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw
#endif /* _NO_LONGLONG */
/***************************************************************/
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14562,8 +14348,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext
#endif /* _NO_LONGLONG */
/***************************************************************/
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14604,8 +14389,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.
#endif /* _NO_LONGLONG */
/***************************************************************/
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14646,8 +14430,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16e
#endif /* _NO_LONGLONG */
/***************************************************************/
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14688,8 +14471,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16n
#endif /* _NO_LONGLONG */
/***************************************************************/
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -95,7 +95,7 @@
dst = dp[0];
@@ -14910,8 +14692,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.
}
#else /* _LONGLONG */
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -168,7 +168,7 @@
}
@@ -15193,8 +14974,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -15347,8 +15127,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bi
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -30,7 +30,7 @@
typedef union {
@@ -15359,8 +15138,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c /
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
@@ -15460,8 +15238,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c
s0 = s1;
dp += SIZE;
sp += SIZE;
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -120,7 +120,7 @@
} \
@@ -16695,8 +16472,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_image.h /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_image.h
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -27,6 +27,16 @@
#ifndef MLIB_IMAGE_H
@@ -16715,8 +16491,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_image.h /tmp/o
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_sys.c /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_sys.c
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -26,9 +26,15 @@
@@ -16748,8 +16523,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_sys.c /tmp/ope
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
-diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h /tmp/openjdk7/jdk/src/share/native/sun/awt/medialib/mlib_types.h
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -59,7 +59,10 @@
@@ -16763,8 +16537,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h /tmp/o
#include <stdint.h> /* for uintptr_t */
#include <malloc.h> /* for ptrdiff_t */
#else
-diff -urN work/openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c /tmp/openjdk7/jdk/src/share/native/sun/font/AccelGlyphCache.c
---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -23,7 +23,11 @@
* have any questions.
@@ -16778,8 +16551,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/font/AccelGlyphCache.c /tmp/open
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
-diff -urN work/openjdk/jdk/src/share/native/sun/font/DrawGlyphList.c /tmp/openjdk7/jdk/src/share/native/sun/font/DrawGlyphList.c
---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2009-12-17 01:48:29.000000000 -0800
+--- ./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
@@ -26,7 +26,11 @@
#include "jlong.h"
@@ -16793,8 +16565,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/font/DrawGlyphList.c /tmp/openjd
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
-diff -urN work/openjdk/jdk/src/share/native/sun/font/sunFont.c /tmp/openjdk7/jdk/src/share/native/sun/font/sunFont.c
---- ./jdk/src/share/native/sun/font/sunFont.c 2009-12-17 01:48:30.000000000 -0800
+--- ./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
@@ -24,7 +24,9 @@
*/
@@ -16806,8 +16577,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/font/sunFont.c /tmp/openjdk7/jdk
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
-diff -urN work/openjdk/jdk/src/share/native/sun/java2d/SurfaceData.c /tmp/openjdk7/jdk/src/share/native/sun/java2d/SurfaceData.c
---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2009-12-17 01:48:30.000000000 -0800
+--- ./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
@@ -28,7 +28,11 @@
#include "jni_util.h"
@@ -16821,8 +16591,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/java2d/SurfaceData.c /tmp/openjd
#include "string.h"
/**
-diff -urN work/openjdk/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h /tmp/openjdk7/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2009-12-17 01:48:30.000000000 -0800
+--- ./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
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
@@ -16834,8 +16603,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h /tmp/op
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
-diff -urN work/openjdk/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c /tmp/openjdk7/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c
---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2009-12-17 01:48:30.000000000 -0800
+--- ./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
@@ -25,7 +25,11 @@
@@ -16849,8 +16617,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c /
#include "sun_java2d_pipe_BufferedOpCodes.h"
-diff -urN work/openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c /tmp/openjdk7/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2009-12-17 01:48:30.000000000 -0800
+--- ./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
@@ -25,7 +25,11 @@
@@ -16864,8 +16631,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
#include <math.h>
#include <jlong.h>
-diff -urN work/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c /tmp/openjdk7/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c
---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -28,6 +28,7 @@
#include <winsock2.h>
@@ -16875,8 +16641,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
-diff -urN work/openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h /tmp/openjdk7/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -78,6 +78,14 @@
typedef enum { B_FALSE, B_TRUE } boolean_t;
@@ -16893,8 +16658,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h /tmp
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
-diff -urN work/openjdk/jdk/src/share/native/sun/security/ec/impl/ecdecode.c /tmp/openjdk7/jdk/src/share/native/sun/security/ec/impl/ecdecode.c
---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -60,9 +60,9 @@
#include <sys/types.h>
@@ -16908,8 +16672,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/security/ec/impl/ecdecode.c /tmp
#include <sys/param.h>
#endif /* _WIN32 */
-diff -urN work/openjdk/jdk/src/share/native/sun/security/ec/impl/oid.c /tmp/openjdk7/jdk/src/share/native/sun/security/ec/impl/oid.c
---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -59,9 +59,9 @@
#include <sys/types.h>
@@ -16923,8 +16686,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/security/ec/impl/oid.c /tmp/open
#include <sys/param.h>
#endif /* _WIN32 */
-diff -urN work/openjdk/jdk/src/share/native/sun/security/ec/impl/secitem.c /tmp/openjdk7/jdk/src/share/native/sun/security/ec/impl/secitem.c
---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -64,9 +64,9 @@
#include <sys/types.h>
@@ -16938,8 +16700,7 @@ diff -urN work/openjdk/jdk/src/share/native/sun/security/ec/impl/secitem.c /tmp/
#include <sys/param.h>
#endif /* _WIN32 */
-diff -urN work/openjdk/jdk/src/share/transport/socket/socketTransport.c /tmp/openjdk7/jdk/src/share/transport/socket/socketTransport.c
---- ./jdk/src/share/transport/socket/socketTransport.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -65,6 +65,9 @@
#define HEADER_SIZE 11
@@ -17028,8 +16789,7 @@ diff -urN work/openjdk/jdk/src/share/transport/socket/socketTransport.c /tmp/ope
return res;
} else if (res == 0) {
break; /* eof, return nbytes which is less than len */
-diff -urN work/openjdk/jdk/src/solaris/back/exec_md.c /tmp/openjdk7/jdk/src/solaris/back/exec_md.c
---- ./jdk/src/solaris/back/exec_md.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -30,7 +30,7 @@
#include "sys.h"
@@ -17040,8 +16800,7 @@ diff -urN work/openjdk/jdk/src/solaris/back/exec_md.c /tmp/openjdk7/jdk/src/sola
/* Linux */
#define FORK() fork()
#else
-diff -urN work/openjdk/jdk/src/solaris/back/linker_md.c /tmp/openjdk7/jdk/src/solaris/back/linker_md.c
---- ./jdk/src/solaris/back/linker_md.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -48,6 +48,12 @@
#include "threads_md.h"
@@ -17068,8 +16827,7 @@ diff -urN work/openjdk/jdk/src/solaris/back/linker_md.c /tmp/openjdk7/jdk/src/so
}
}
-diff -urN work/openjdk/jdk/src/solaris/back/util_md.h /tmp/openjdk7/jdk/src/solaris/back/util_md.h
---- ./jdk/src/solaris/back/util_md.h 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -31,6 +31,11 @@
@@ -17092,8 +16850,7 @@ diff -urN work/openjdk/jdk/src/solaris/back/util_md.h /tmp/openjdk7/jdk/src/sola
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
-diff -urN work/openjdk/jdk/src/solaris/bin/ergo.c /tmp/openjdk7/jdk/src/solaris/bin/ergo.c
---- ./jdk/src/solaris/bin/ergo.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -71,14 +71,39 @@
/* Compute physical memory by asking the OS */
@@ -17137,8 +16894,7 @@ diff -urN work/openjdk/jdk/src/solaris/bin/ergo.c /tmp/openjdk7/jdk/src/solaris/
return result;
+#endif /* _ALLBSD_SOURCE */
}
-diff -urN work/openjdk/jdk/src/solaris/bin/ergo.h /tmp/openjdk7/jdk/src/solaris/bin/ergo.h
---- ./jdk/src/solaris/bin/ergo.h 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -33,6 +33,10 @@
#include <sys/stat.h>
@@ -17151,8 +16907,7 @@ diff -urN work/openjdk/jdk/src/solaris/bin/ergo.h /tmp/openjdk7/jdk/src/solaris/
#include "java.h"
-diff -urN work/openjdk/jdk/src/solaris/bin/ergo_i586.c /tmp/openjdk7/jdk/src/solaris/bin/ergo_i586.c
---- ./jdk/src/solaris/bin/ergo_i586.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -106,7 +106,7 @@
@@ -17234,8 +16989,7 @@ diff -urN work/openjdk/jdk/src/solaris/bin/ergo_i586.c /tmp/openjdk7/jdk/src/sol
JLI_TraceLauncher("physical processors: %lu\n", result);
return result;
}
-diff -urN work/openjdk/jdk/src/solaris/bin/java_md.c /tmp/openjdk7/jdk/src/solaris/bin/java_md.c
---- ./jdk/src/solaris/bin/java_md.c 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -24,6 +24,7 @@
*/
@@ -17343,8 +17097,7 @@ diff -urN work/openjdk/jdk/src/solaris/bin/java_md.c /tmp/openjdk7/jdk/src/solar
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
-diff -urN work/openjdk/jdk/src/solaris/bin/java_md.h /tmp/openjdk7/jdk/src/solaris/bin/java_md.h
---- ./jdk/src/solaris/bin/java_md.h 2009-12-17 01:48:31.000000000 -0800
+--- ./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
@@ -47,10 +47,14 @@
#include <sys/time.h>
@@ -17362,8 +17115,7 @@ diff -urN work/openjdk/jdk/src/solaris/bin/java_md.h /tmp/openjdk7/jdk/src/solar
/*
* Function prototypes.
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/awt/X11FontManager.java /tmp/openjdk7/jdk/src/solaris/classes/sun/awt/X11FontManager.java
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2009-12-17 01:48:32.000000000 -0800
+--- ./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
@@ -213,7 +213,7 @@
if (fontID != null) {
@@ -17392,8 +17144,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/awt/X11FontManager.java /tmp/
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties /tmp/openjdk7/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,189 +0,0 @@
-#
@@ -17585,8 +17336,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfi
-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
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties /tmp/openjdk7/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,154 +0,0 @@
-#
@@ -17743,8 +17493,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfi
-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
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties /tmp/openjdk7/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,151 +0,0 @@
-#
@@ -17898,8 +17647,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfi
-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
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java /tmp/openjdk7/jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java
---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,99 +0,0 @@
-/*
@@ -18001,8 +17749,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannel
- return new SimpleAsynchronousDatagramChannelImpl(family, toPort(group));
- }
-}
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java /tmp/openjdk7/jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,288 +0,0 @@
-/*
@@ -18293,8 +18040,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeVie
- }
- }
-}
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java /tmp/openjdk7/jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -36,10 +36,6 @@
class BsdFileStore
@@ -18374,8 +18120,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java /tmp
return super.supportsFileAttributeView(name);
}
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java /tmp/openjdk7/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -31,49 +31,23 @@
import java.util.*;
@@ -18509,8 +18254,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java /tm
@Override
FileStore getFileStore(UnixPath path) throws IOException {
return new BsdFileStore(path);
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java /tmp/openjdk7/jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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
@@ -1,5 +1,5 @@
/*
@@ -18622,8 +18366,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.ja
+ initIDs();
}
}
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java /tmp/openjdk7/jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,350 +0,0 @@
-/*
@@ -18976,8 +18719,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttr
- }
- }
-}
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java /tmp/openjdk7/jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-01-02 11:10:53.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,466 +0,0 @@
-/*
@@ -19446,8 +19188,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java /
- init();
- }
-}
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java /tmp/openjdk7/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2009-12-17 01:48:33.000000000 -0800
+--- ./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
@@ -68,6 +68,8 @@
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
@@ -19458,8 +19199,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvi
throw new AssertionError("Platform not recognized");
}
}
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java /tmp/openjdk7/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2009-12-17 01:48:33.000000000 -0800
+--- ./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
@@ -119,7 +119,11 @@
}
@@ -19494,8 +19234,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
-diff -urN work/openjdk/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java /tmp/openjdk7/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-01-02 11:10:54.000000000 -0800
+--- ./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
@@ -38,9 +38,6 @@
*/
@@ -19600,8 +19339,7 @@ diff -urN work/openjdk/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachin
- isBsdThreads = isBsdThreads();
}
}
-diff -urN work/openjdk/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c /tmp/openjdk7/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2009-12-17 01:48:33.000000000 -0800
+--- ./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
@@ -33,7 +33,7 @@
#include <sys/stat.h>
@@ -19668,8 +19406,7 @@ diff -urN work/openjdk/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c /tmp/openjdk7
}
}
-diff -urN work/openjdk/jdk/src/solaris/hpi/include/interrupt.h /tmp/openjdk7/jdk/src/solaris/hpi/include/interrupt.h
---- ./jdk/src/solaris/hpi/include/interrupt.h 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -75,7 +75,7 @@
* N_INTERRUPTS - The number of interrupt channels. These
@@ -19691,8 +19428,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/include/interrupt.h /tmp/openjdk7/jdk
#ifdef SA_SIGINFO
/* Thread implementation dependent interrupt dispatcher. */
void intrDispatchMD(int sig, siginfo_t *info, void *uc);
-diff -urN work/openjdk/jdk/src/solaris/hpi/include/largefile.h /tmp/openjdk7/jdk/src/solaris/hpi/include/largefile.h
---- ./jdk/src/solaris/hpi/include/largefile.h 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -34,6 +34,10 @@
#include "largefile_linux.h"
@@ -19705,8 +19441,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/include/largefile.h /tmp/openjdk7/jdk
/*
* Prototypes for wrappers that we define. These wrapper functions
* are low-level I/O routines that will use 64 bit versions if
-diff -urN work/openjdk/jdk/src/solaris/hpi/include/largefile_bsd.h /tmp/openjdk7/jdk/src/solaris/hpi/include/largefile_bsd.h
---- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-01-02 11:10:54.000000000 -0800
+--- ./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
@@ -26,11 +26,29 @@
#ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_
@@ -19742,8 +19477,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/include/largefile_bsd.h /tmp/openjdk7
+#define pwrite64 pwrite
+
#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */
-diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/include/threads_md.h /tmp/openjdk7/jdk/src/solaris/hpi/native_threads/include/threads_md.h
---- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -36,6 +36,8 @@
#define N_TRACED_REGS 12
@@ -19791,8 +19525,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/include/threads_md.h /
#ifdef __linux__
extern thread_key_t intrJmpbufkey;
-diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/src/condvar_md.c /tmp/openjdk7/jdk/src/solaris/hpi/native_threads/src/condvar_md.c
---- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -58,7 +58,7 @@
{
@@ -19803,8 +19536,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/src/condvar_md.c /tmp/
err = pthread_cond_destroy((cond_t *) &condvar->cond);
#else
err = cond_destroy((cond_t *) condvar);
-diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/src/monitor_md.c /tmp/openjdk7/jdk/src/solaris/hpi/native_threads/src/monitor_md.c
---- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -147,7 +147,7 @@
mid->monitor_owner = self;
@@ -19815,8 +19547,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/src/monitor_md.c /tmp/
if (mid->monitor_owner == self) {
mid->entry_count++;
return SYS_OK;
-diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c /tmp/openjdk7/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
---- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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
@@ -1,5 +1,5 @@
/*
@@ -20510,8 +20241,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c /tmp
+ pthread_attr_destroy(&attr);
+#endif
}
-diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/src/threads_md.c /tmp/openjdk7/jdk/src/solaris/hpi/native_threads/src/threads_md.c
---- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -54,6 +54,10 @@
#error That can NOT possibly be right.
@@ -20594,8 +20324,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/native_threads/src/threads_md.c /tmp/
info.isMP = (cpus < 0) ? 1 : (cpus > 1);
info.name = "native threads";
-diff -urN work/openjdk/jdk/src/solaris/hpi/src/linker_md.c /tmp/openjdk7/jdk/src/solaris/hpi/src/linker_md.c
---- ./jdk/src/solaris/hpi/src/linker_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -44,11 +44,19 @@
#include "threads_md.h"
@@ -20663,8 +20392,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/src/linker_md.c /tmp/openjdk7/jdk/src
#endif
/*
* This is a bit of bulletproofing to catch the commonly occurring
-diff -urN work/openjdk/jdk/src/solaris/hpi/src/memory_md.c /tmp/openjdk7/jdk/src/solaris/hpi/src/memory_md.c
---- ./jdk/src/solaris/hpi/src/memory_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -50,12 +50,24 @@
#include <stdlib.h>
@@ -20755,8 +20483,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/src/memory_md.c /tmp/openjdk7/jdk/src
ret = committedAddr;
#else
ret = requestedAddr;
-diff -urN work/openjdk/jdk/src/solaris/hpi/src/system_md.c /tmp/openjdk7/jdk/src/solaris/hpi/src/system_md.c
---- ./jdk/src/solaris/hpi/src/system_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -41,6 +41,7 @@
#include <dlfcn.h>
@@ -20811,8 +20538,7 @@ diff -urN work/openjdk/jdk/src/solaris/hpi/src/system_md.c /tmp/openjdk7/jdk/src
fd = open64_w(path, oflag, mode);
if (delete != 0) {
unlink(path);
-diff -urN work/openjdk/jdk/src/solaris/instrument/EncodingSupport_md.c /tmp/openjdk7/jdk/src/solaris/instrument/EncodingSupport_md.c
---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -28,7 +28,10 @@
#include <string.h>
@@ -20843,8 +20569,7 @@ diff -urN work/openjdk/jdk/src/solaris/instrument/EncodingSupport_md.c /tmp/open
/* Open conversion descriptors */
iconvToPlatform = iconv_open(codeset, "UTF-8");
-diff -urN work/openjdk/jdk/src/solaris/javavm/export/jvm_md.h /tmp/openjdk7/jdk/src/solaris/javavm/export/jvm_md.h
---- ./jdk/src/solaris/javavm/export/jvm_md.h 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -41,7 +41,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
@@ -20870,8 +20595,7 @@ diff -urN work/openjdk/jdk/src/solaris/javavm/export/jvm_md.h /tmp/openjdk7/jdk/
/* Signals */
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c /tmp/openjdk7/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -32,10 +32,16 @@
@@ -21035,8 +20759,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/management/UnixOperatingSy
}
JNIEXPORT jlong JNICALL
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,180 +0,0 @@
-/*
@@ -21219,8 +20942,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-
-
-/* end */
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,82 +0,0 @@
-/*
@@ -21305,8 +21027,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-
-
-#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,322 +0,0 @@
-/*
@@ -21631,8 +21352,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-}
-
-#endif /* USE_PLATFORM_MIDI_IN */
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,179 +0,0 @@
-/*
@@ -21814,8 +21534,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-
-
-#endif /* USE_PLATFORM_MIDI_OUT */
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,480 +0,0 @@
-/*
@@ -22298,8 +22017,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-
-
-/* end */
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,85 +0,0 @@
-/*
@@ -22387,8 +22105,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-INT64 getMidiTimestamp(MidiDeviceHandle* handle);
-
-#endif // PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,938 +0,0 @@
-/*
@@ -23329,8 +23046,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-
-
-#endif // USE_DAUDIO
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,291 +0,0 @@
-/*
@@ -23624,8 +23340,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-
-
-/* end */
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,72 +0,0 @@
-/*
@@ -23700,8 +23415,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
- int isSigned, int isBigEndian, int enc);
-
-#endif // PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
-diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c /tmp/openjdk7/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,723 +0,0 @@
-/*
@@ -24427,8 +24141,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_B
-
-
-#endif // USE_PORTS
-diff -urN work/openjdk/jdk/src/solaris/native/java/io/UnixFileSystem_md.c /tmp/openjdk7/jdk/src/solaris/native/java/io/UnixFileSystem_md.c
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -41,6 +41,11 @@
#include "java_io_FileSystem.h"
@@ -24450,8 +24163,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/io/UnixFileSystem_md.c /tmp/o
JNIEXPORT jboolean JNICALL
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
-diff -urN work/openjdk/jdk/src/solaris/native/java/io/canonicalize_md.c /tmp/openjdk7/jdk/src/solaris/native/java/io/canonicalize_md.c
---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -33,7 +33,9 @@
#include <sys/stat.h>
@@ -24463,8 +24175,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/io/canonicalize_md.c /tmp/ope
/* Note: The comments in this file use the terminology
-diff -urN work/openjdk/jdk/src/solaris/native/java/io/io_util_md.c /tmp/openjdk7/jdk/src/solaris/native/java/io/io_util_md.c
---- ./jdk/src/solaris/native/java/io/io_util_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -36,7 +36,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
@@ -24475,8 +24186,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/io/io_util_md.c /tmp/openjdk7
/* Remove trailing slashes, since the kernel won't */
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
-diff -urN work/openjdk/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c /tmp/openjdk7/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -28,6 +28,11 @@
#include "jni.h"
@@ -24518,8 +24228,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
-diff -urN work/openjdk/jdk/src/solaris/native/java/lang/UNIXProcess_md.c /tmp/openjdk7/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -40,7 +40,11 @@
#include <stdlib.h>
@@ -24623,8 +24332,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/lang/UNIXProcess_md.c /tmp/op
if (envp == NULL || (char **) envp == environ) {
execvp(file, (char **) argv);
return;
-diff -urN work/openjdk/jdk/src/solaris/native/java/lang/java_props_md.c /tmp/openjdk7/jdk/src/solaris/native/java/lang/java_props_md.c
---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -23,7 +23,7 @@
* have any questions.
@@ -24768,8 +24476,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/lang/java_props_md.c /tmp/ope
return &sprops;
}
-diff -urN work/openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c /tmp/openjdk7/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -36,17 +36,293 @@
#include <stdlib.h>
@@ -25127,8 +24834,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c /tmp/o
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
-diff -urN work/openjdk/jdk/src/solaris/native/java/net/Inet6AddressImpl.c /tmp/openjdk7/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -33,6 +33,9 @@
#include <strings.h>
@@ -25179,8 +24885,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/net/Inet6AddressImpl.c /tmp/o
}
return (*env)->NewStringUTF(env, hostname);
}
-diff -urN work/openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c /tmp/openjdk7/jdk/src/solaris/native/java/net/NetworkInterface.c
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -23,13 +23,13 @@
* have any questions.
@@ -25460,8 +25165,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c /tmp/o
memset((char *) &if2, 0, sizeof(if2));
strcpy(if2.ifr_name, name_utf);
-diff -urN work/openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c /tmp/openjdk7/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -23,12 +23,12 @@
* have any questions.
@@ -25587,8 +25291,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
}
}
}
-diff -urN work/openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c /tmp/openjdk7/jdk/src/solaris/native/java/net/PlainSocketImpl.c
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -467,9 +467,11 @@
if (connect_rv == JVM_IO_INTR) {
@@ -25611,8 +25314,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c /tmp/op
int port;
jobject iaObj;
jclass iaCntrClass;
-diff -urN work/openjdk/jdk/src/solaris/native/java/net/bsd_close.c /tmp/openjdk7/jdk/src/solaris/native/java/net/bsd_close.c
---- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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
@@ -57,7 +57,7 @@
/*
@@ -25649,8 +25351,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/net/bsd_close.c /tmp/openjdk7
}
int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
-diff -urN work/openjdk/jdk/src/solaris/native/java/net/net_util_md.c /tmp/openjdk7/jdk/src/solaris/native/java/net/net_util_md.c
---- ./jdk/src/solaris/native/java/net/net_util_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -34,6 +34,15 @@
#include <stdlib.h>
@@ -25851,8 +25552,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/net/net_util_md.c /tmp/openjd
len = sizeof(arg);
if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg,
-diff -urN work/openjdk/jdk/src/solaris/native/java/net/net_util_md.h /tmp/openjdk7/jdk/src/solaris/native/java/net/net_util_md.h
---- ./jdk/src/solaris/native/java/net/net_util_md.h 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -37,7 +37,7 @@
#endif
@@ -25863,8 +25563,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/net/net_util_md.h /tmp/openjd
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,
-diff -urN work/openjdk/jdk/src/solaris/native/java/nio/MappedByteBuffer.c /tmp/openjdk7/jdk/src/solaris/native/java/nio/MappedByteBuffer.c
---- ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -38,7 +38,11 @@
jlong address, jlong len)
@@ -25890,8 +25589,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/nio/MappedByteBuffer.c /tmp/o
unsigned long lAddress = address;
jlong offset = lAddress % pageSize;
-diff -urN work/openjdk/jdk/src/solaris/native/java/util/FileSystemPreferences.c /tmp/openjdk7/jdk/src/solaris/native/java/util/FileSystemPreferences.c
---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -47,8 +47,11 @@
return (jint) result;
@@ -25930,8 +25628,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/util/FileSystemPreferences.c
if (rc < 0) {
close(fd);
-diff -urN work/openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c /tmp/openjdk7/jdk/src/solaris/native/java/util/TimeZone_md.c
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -31,7 +31,7 @@
#include <errno.h>
@@ -26069,8 +25766,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c /tmp/openj
sprintf(buf, (const char *)"GMT%c%02d:%02d",
sign, (int)(offset/3600), (int)((offset%3600)/60));
return strdup(buf);
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/CUPSfuncs.c
---- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -25,6 +25,7 @@
@@ -26094,8 +25790,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c /tmp/openjdk7/
if (handle == NULL) {
return JNI_FALSE;
}
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/VDrawingArea.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/VDrawingArea.c
---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -26109,8 +25804,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/VDrawingArea.c /tmp/openjd
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/X11Color.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/X11Color.c
---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -33,7 +33,9 @@
#include <math.h>
@@ -26122,8 +25816,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/X11Color.c /tmp/openjdk7/j
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/XDrawingArea.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/XDrawingArea.c
---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -31,7 +31,11 @@
#include <Xm/XmP.h>
@@ -26137,8 +25830,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/XDrawingArea.c /tmp/openjd
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_Font.c
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
@@ -26149,8 +25841,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_Font.c /tmp/openjdk7/j
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -40,6 +40,7 @@
#include <jni.h>
@@ -26279,8 +25970,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c /tmp/ope
if (pLibRandR == NULL) {
J2dRlsTraceLn(J2D_TRACE_ERROR,
"X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -69,7 +69,7 @@
XIMPreeditDrawCallbackStruct *);
@@ -26521,8 +26211,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c /tmp/ope
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -143,7 +143,11 @@
(*env)->DeleteLocalRef(env, propname);
@@ -26536,8 +26225,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c /tmp/ope
JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
"(Ljava/lang/String;)V",
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_MToolkit.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_MToolkit.c
---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -63,8 +63,9 @@
extern JavaVM *jvm;
@@ -26559,8 +26247,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_MToolkit.c /tmp/openjd
statusWindowEventHandler(xev);
#endif
xembed_eventHandler(&xev);
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_Mlib.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_Mlib.c
---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -32,6 +32,7 @@
#include <dlfcn.h>
@@ -26584,8 +26271,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_Mlib.c /tmp/openjdk7/j
}
if (handle == NULL) {
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_Robot.c
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -45,7 +45,7 @@
#include "wsutils.h"
@@ -26596,8 +26282,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c /tmp/openjdk7/
#include <sys/socket.h>
#endif
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_util.h /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_util.h
---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -187,15 +187,20 @@
#ifdef __solaris__
@@ -26621,8 +26306,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_util.h /tmp/openjdk7/j
typedef struct _XmImRefRec {
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_wm.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_wm.c
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -26721,8 +26405,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_wm.c /tmp/openjdk7/jdk
awt_wmgr = OPENLOOK_WM;
}
else {
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_wm.h /tmp/openjdk7/jdk/src/solaris/native/sun/awt/awt_wm.h
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -45,7 +45,10 @@
KDE2_WM,
@@ -26736,8 +26419,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/awt_wm.h /tmp/openjdk7/jdk
};
extern void awt_wm_init(void);
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/extutil.h /tmp/openjdk7/jdk/src/solaris/native/sun/awt/extutil.h
---- ./jdk/src/solaris/native/sun/awt/extutil.h 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -58,7 +58,7 @@
*/
@@ -26754,8 +26436,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/extutil.h /tmp/openjdk7/jd
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/fontpath.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/fontpath.c
---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -23,7 +23,7 @@
* have any questions.
@@ -26914,8 +26595,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/fontpath.c /tmp/openjdk7/j
if (libfontconfig == NULL) {
return NULL;
}
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/gtk2_interface.c
---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -30,8 +30,10 @@
#include <string.h>
@@ -26960,8 +26640,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c /tmp/open
if (setjmp(j) == 0)
{
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/list.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/list.c
---- ./jdk/src/solaris/native/sun/awt/list.c 2009-12-17 01:48:34.000000000 -0800
+--- ./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
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -26975,8 +26654,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/list.c /tmp/openjdk7/jdk/s
#include "list.h"
-diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/robot_common.c /tmp/openjdk7/jdk/src/solaris/native/sun/awt/robot_common.c
---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
@@ -26988,8 +26666,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/awt/robot_common.c /tmp/openjd
#include "robot_common.h"
/*
-diff -urN work/openjdk/jdk/src/solaris/native/sun/font/X11FontScaler.c /tmp/openjdk7/jdk/src/solaris/native/sun/font/X11FontScaler.c
---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -32,7 +32,11 @@
* into X11FontScaler_md.c, which is compiled into another library.
@@ -27003,8 +26680,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/font/X11FontScaler.c /tmp/open
#include <ctype.h>
#include <sys/utsname.h>
-diff -urN work/openjdk/jdk/src/solaris/native/sun/font/X11TextRenderer.c /tmp/openjdk7/jdk/src/solaris/native/sun/font/X11TextRenderer.c
---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -39,7 +39,11 @@
#include "GraphicsPrimitiveMgr.h"
@@ -27018,8 +26694,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/font/X11TextRenderer.c /tmp/op
JNIEXPORT void JNICALL AWTDrawGlyphList
-diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/j2d_md.h /tmp/openjdk7/jdk/src/solaris/native/sun/java2d/j2d_md.h
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -27036,8 +26711,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/j2d_md.h /tmp/openjdk7/
typedef unsigned char jubyte;
typedef unsigned short jushort;
-diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c /tmp/openjdk7/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -63,6 +63,10 @@
* MLIB_EDGE_SRC_PADDED
@@ -27144,8 +26818,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
-diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c /tmp/openjdk7/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -794,7 +794,7 @@
static int initialized;
@@ -27156,8 +26829,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c /
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
-diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h /tmp/openjdk7/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h
---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
@@ -27179,8 +26851,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h /t
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
-diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c /tmp/openjdk7/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -32,6 +32,7 @@
#include "gdefs.h"
@@ -27199,8 +26870,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c /t
}
dgaAvailable = JNI_FALSE;
if (lib != NULL) {
-diff -urN work/openjdk/jdk/src/solaris/native/sun/jdga/dgalock.c /tmp/openjdk7/jdk/src/solaris/native/sun/jdga/dgalock.c
---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
@@ -27224,8 +26894,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/jdga/dgalock.c /tmp/openjdk7/j
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
-diff -urN work/openjdk/jdk/src/solaris/native/sun/management/FileSystemImpl.c /tmp/openjdk7/jdk/src/solaris/native/sun/management/FileSystemImpl.c
---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -26,6 +26,10 @@
#include <sys/types.h>
@@ -27238,8 +26907,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/management/FileSystemImpl.c /t
#include "jni.h"
#include "jni_util.h"
#include "sun_management_FileSystemImpl.h"
-diff -urN work/openjdk/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c /tmp/openjdk7/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c
---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -33,7 +33,7 @@
#include <strings.h>
@@ -27250,8 +26918,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationI
#include <string.h>
#endif
-diff -urN work/openjdk/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c /tmp/openjdk7/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -26,11 +26,12 @@
#include "jni.h"
@@ -27279,8 +26946,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
gconf_ver = 2;
}
if (gconf_ver > 0) {
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -35,7 +35,7 @@
#include <string.h>
@@ -27331,8 +26997,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c /
}
#endif
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -26,15 +26,21 @@
#include "jni.h"
@@ -27434,8 +27099,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c /tmp/
+ return (0);
+#endif
}
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -33,9 +33,13 @@
#include <sys/socket.h>
@@ -27475,8 +27139,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c /t
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/FileKey.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/ch/FileKey.c
---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -30,6 +30,10 @@
#include "nio_util.h"
@@ -27489,8 +27152,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/FileKey.c /tmp/openjdk7
static jfieldID key_st_dev; /* id for FileKey.st_dev */
static jfieldID key_st_ino; /* id for FileKey.st_ino */
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/ch/Net.c
---- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -116,6 +116,47 @@
@@ -27670,8 +27332,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/Net.c /tmp/openjdk7/jdk
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/Sctp.h /tmp/openjdk7/jdk/src/solaris/native/sun/nio/ch/Sctp.h
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -67,7 +67,7 @@
@@ -27721,8 +27382,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/Sctp.h /tmp/openjdk7/jd
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c
---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -337,11 +337,11 @@
break;
@@ -27738,8 +27398,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c /tmp/
}
addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/SctpNet.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/ch/SctpNet.c
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -55,6 +55,7 @@
*/
@@ -27757,8 +27416,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/ch/SctpNet.c /tmp/openjdk7
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c
---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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
@@ -1,5 +1,5 @@
/*
@@ -28047,8 +27705,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c /
+ free(iter);
+ }
}
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c
---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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 1969-12-31 16:00:00.000000000 -0800
@@ -1,195 +0,0 @@
-/*
@@ -28246,8 +27903,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c /tmp/
-
-
-}
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c
---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -30,7 +30,9 @@
@@ -28259,8 +27915,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c
#ifdef __solaris__
#include <strings.h>
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -49,6 +49,11 @@
#include <mntent.h>
@@ -28320,8 +27975,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
-diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c /tmp/openjdk7/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c
---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -63,7 +63,12 @@
DEFX(O_EXCL);
@@ -28349,8 +28003,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c /tmp
DEF(ERANGE);
// flags used with openat/unlinkat/etc.
-diff -urN work/openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c /tmp/openjdk7/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -26,7 +26,9 @@
#include <stdio.h>
@@ -28362,8 +28015,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFu
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
-diff -urN work/openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c /tmp/openjdk7/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -28,12 +28,19 @@
#include <string.h>
@@ -28407,8 +28059,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
-diff -urN work/openjdk/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c /tmp/openjdk7/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -64,7 +64,9 @@
#include <assert.h>
@@ -28420,8 +28071,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md
#include <jni.h>
-diff -urN work/openjdk/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c /tmp/openjdk7/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2009-12-17 01:48:35.000000000 -0800
+--- ./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
@@ -29,7 +29,9 @@
#include <assert.h>
@@ -28433,8 +28083,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
#include <winscard.h>
-diff -urN work/openjdk/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c /tmp/openjdk7/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-01-02 11:10:54.000000000 -0800
+--- ./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
@@ -35,10 +35,10 @@
#include <dirent.h>
@@ -28740,8 +28389,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine
+ JNU_ReleaseStringPlatformChars(env, path, _path);
+ }
+}
-diff -urN work/openjdk/jdk/src/solaris/native/sun/xawt/XWindow.c /tmp/openjdk7/jdk/src/solaris/native/sun/xawt/XWindow.c
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2009-12-17 01:48:36.000000000 -0800
+--- ./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
@@ -228,10 +228,10 @@
{java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
@@ -28767,8 +28415,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/xawt/XWindow.c /tmp/openjdk7/j
/* 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.
-diff -urN work/openjdk/jdk/src/solaris/native/sun/xawt/awt_Desktop.c /tmp/openjdk7/jdk/src/solaris/native/sun/xawt/awt_Desktop.c
---- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2009-12-17 01:48:36.000000000 -0800
+--- ./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
@@ -24,6 +24,7 @@
*/
@@ -28816,8 +28463,7 @@ diff -urN work/openjdk/jdk/src/solaris/native/sun/xawt/awt_Desktop.c /tmp/openjd
}
dlerror(); /* Clear errors */
gnome_url_show = dlsym(gnome_handle, "gnome_url_show");
-diff -urN work/openjdk/jdk/src/solaris/npt/npt_md.h /tmp/openjdk7/jdk/src/solaris/npt/npt_md.h
---- ./jdk/src/solaris/npt/npt_md.h 2009-12-17 01:48:36.000000000 -0800
+--- ./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
@@ -32,9 +32,10 @@
#include <string.h>
@@ -28841,8 +28487,7 @@ diff -urN work/openjdk/jdk/src/solaris/npt/npt_md.h /tmp/openjdk7/jdk/src/solari
if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
_sym = dlsym(_handle, "nptInitialize"); \
if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
-diff -urN work/openjdk/jdk/src/solaris/transport/socket/socket_md.c /tmp/openjdk7/jdk/src/solaris/transport/socket/socket_md.c
---- ./jdk/src/solaris/transport/socket/socket_md.c 2009-12-17 01:48:36.000000000 -0800
+--- ./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
@@ -36,7 +36,7 @@
#ifdef __solaris__
@@ -28862,9 +28507,8 @@ diff -urN work/openjdk/jdk/src/solaris/transport/socket/socket_md.c /tmp/openjdk
int
dbgsysTlsAlloc() {
pthread_key_t key;
-diff -urN work/openjdk/jdk/test/Makefile /tmp/openjdk7/jdk/test/Makefile
---- ./jdk/test/Makefile 2009-12-17 01:48:40.000000000 -0800
-+++ ./jdk/test/Makefile 2009-12-20 21:04:58.000000000 -0800
+--- ./jdk/test/Makefile 2010-01-14 01:45:52.000000000 -0800
++++ ./jdk/test/Makefile 2010-01-16 12:51:02.000000000 -0800
@@ -78,6 +78,16 @@
OS_ARCH := $(shell $(UNAME) -m)
OS_VERSION := $(shell $(UNAME) -r)
@@ -28882,8 +28526,17 @@ diff -urN work/openjdk/jdk/test/Makefile /tmp/openjdk7/jdk/test/Makefile
ifndef OS_NAME
ifneq ($(PROCESSOR_IDENTIFIER), )
OS_NAME = windows
-diff -urN work/openjdk/jdk/test/com/sun/jdi/ImmutableResourceTest.sh /tmp/openjdk7/jdk/test/com/sun/jdi/ImmutableResourceTest.sh
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2009-12-17 01:48:40.000000000 -0800
+--- ./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
@@ -56,7 +56,7 @@
@@ -28894,8 +28547,7 @@ diff -urN work/openjdk/jdk/test/com/sun/jdi/ImmutableResourceTest.sh /tmp/openjd
PATHSEP=":"
;;
-diff -urN work/openjdk/jdk/test/com/sun/jdi/JITDebug.sh /tmp/openjdk7/jdk/test/com/sun/jdi/JITDebug.sh
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2009-12-17 01:48:40.000000000 -0800
+--- ./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
@@ -63,7 +63,7 @@
OS=`uname -s`
@@ -28906,8 +28558,7 @@ diff -urN work/openjdk/jdk/test/com/sun/jdi/JITDebug.sh /tmp/openjdk7/jdk/test/c
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
-diff -urN work/openjdk/jdk/test/com/sun/jdi/PrivateTransportTest.sh /tmp/openjdk7/jdk/test/com/sun/jdi/PrivateTransportTest.sh
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2009-12-17 01:48:41.000000000 -0800
+--- ./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
@@ -121,10 +121,14 @@
esac
@@ -28925,8 +28576,7 @@ diff -urN work/openjdk/jdk/test/com/sun/jdi/PrivateTransportTest.sh /tmp/openjdk
Windows*)
libloc=${jreloc}/bin
sep=';'
-diff -urN work/openjdk/jdk/test/com/sun/jdi/ShellScaffold.sh /tmp/openjdk7/jdk/test/com/sun/jdi/ShellScaffold.sh
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2009-12-17 01:48:41.000000000 -0800
+--- ./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
@@ -289,7 +289,7 @@
psCmd=ps
@@ -28937,8 +28587,7 @@ diff -urN work/openjdk/jdk/test/com/sun/jdi/ShellScaffold.sh /tmp/openjdk7/jdk/t
transport=dt_socket
address=
devnull=/dev/null
-diff -urN work/openjdk/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh /tmp/openjdk7/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2009-12-17 01:48:41.000000000 -0800
+--- ./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
@@ -112,7 +112,7 @@
fi
@@ -28949,8 +28598,7 @@ diff -urN work/openjdk/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh /tmp/op
pass "This test always passes on $OS"
;;
-diff -urN work/openjdk/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh /tmp/openjdk7/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2009-12-17 01:48:41.000000000 -0800
+--- ./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
@@ -45,10 +45,7 @@
@@ -28964,8 +28612,7 @@ diff -urN work/openjdk/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.
PS=":"
;;
Windows* )
-diff -urN work/openjdk/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh /tmp/openjdk7/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2009-12-17 01:48:41.000000000 -0800
+--- ./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
@@ -83,6 +83,10 @@
total_swap=`free -b | grep -i swap | awk '{print $2}'`
@@ -28978,8 +28625,7 @@ diff -urN work/openjdk/jdk/test/com/sun/management/OperatingSystemMXBean/TestTot
* )
runOne GetTotalSwapSpaceSize "sanity-only"
;;
-diff -urN work/openjdk/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh /tmp/openjdk7/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2009-12-17 01:48:41.000000000 -0800
+--- ./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
@@ -48,7 +48,7 @@
@@ -28990,8 +28636,7 @@ diff -urN work/openjdk/jdk/test/com/sun/management/UnixOperatingSystemMXBean/Get
runOne GetMaxFileDescriptorCount
;;
* )
-diff -urN work/openjdk/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh /tmp/openjdk7/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2009-12-17 01:48:41.000000000 -0800
+--- ./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
@@ -48,7 +48,7 @@
@@ -29002,8 +28647,7 @@ diff -urN work/openjdk/jdk/test/com/sun/management/UnixOperatingSystemMXBean/Get
runOne GetOpenFileDescriptorCount
;;
* )
-diff -urN work/openjdk/jdk/test/com/sun/tools/attach/CommonSetup.sh /tmp/openjdk7/jdk/test/com/sun/tools/attach/CommonSetup.sh
---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2009-12-17 01:48:42.000000000 -0800
+--- ./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
@@ -36,11 +36,7 @@
@@ -29018,8 +28662,7 @@ diff -urN work/openjdk/jdk/test/com/sun/tools/attach/CommonSetup.sh /tmp/openjdk
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/awt/PrintJob/Text/stringwidth.sh /tmp/openjdk7/jdk/test/java/awt/PrintJob/Text/stringwidth.sh
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2009-12-17 01:48:43.000000000 -0800
+--- ./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
@@ -25,10 +25,11 @@
fi
@@ -29037,8 +28680,7 @@ diff -urN work/openjdk/jdk/test/java/awt/PrintJob/Text/stringwidth.sh /tmp/openj
# Windows
if [ -z "${TESTJAVA}" ] ; then
-diff -urN work/openjdk/jdk/test/java/io/File/GetXSpace.sh /tmp/openjdk7/jdk/test/java/io/File/GetXSpace.sh
---- ./jdk/test/java/io/File/GetXSpace.sh 2009-12-17 01:48:45.000000000 -0800
+--- ./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
@@ -26,7 +26,7 @@
# set platform-dependent variable
@@ -29049,8 +28691,7 @@ diff -urN work/openjdk/jdk/test/java/io/File/GetXSpace.sh /tmp/openjdk7/jdk/test
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
-diff -urN work/openjdk/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh /tmp/openjdk7/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2009-12-17 01:48:45.000000000 -0800
+--- ./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
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
@@ -29061,8 +28702,7 @@ diff -urN work/openjdk/jdk/test/java/io/Serializable/evolution/RenamePackage/run
PS=":" ;;
Windows* )
PS=";" ;;
-diff -urN work/openjdk/jdk/test/java/io/Serializable/serialver/classpath/run.sh /tmp/openjdk7/jdk/test/java/io/Serializable/serialver/classpath/run.sh
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2009-12-17 01:48:46.000000000 -0800
+--- ./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
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -29073,8 +28713,7 @@ diff -urN work/openjdk/jdk/test/java/io/Serializable/serialver/classpath/run.sh
PS=":" ;;
Windows* )
PS=";" ;;
-diff -urN work/openjdk/jdk/test/java/io/Serializable/serialver/nested/run.sh /tmp/openjdk7/jdk/test/java/io/Serializable/serialver/nested/run.sh
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2009-12-17 01:48:46.000000000 -0800
+--- ./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
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -29085,8 +28724,7 @@ diff -urN work/openjdk/jdk/test/java/io/Serializable/serialver/nested/run.sh /tm
PS=":" ;;
Windows* )
PS=";" ;;
-diff -urN work/openjdk/jdk/test/java/lang/StringCoding/CheckEncodings.sh /tmp/openjdk7/jdk/test/java/lang/StringCoding/CheckEncodings.sh
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2009-12-17 01:48:47.000000000 -0800
+--- ./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
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -29097,8 +28735,7 @@ diff -urN work/openjdk/jdk/test/java/lang/StringCoding/CheckEncodings.sh /tmp/op
Windows* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
-diff -urN work/openjdk/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh /tmp/openjdk7/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2009-12-17 01:48:47.000000000 -0800
+--- ./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
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -29109,8 +28746,7 @@ diff -urN work/openjdk/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh /t
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/java/lang/instrument/MakeJAR2.sh /tmp/openjdk7/jdk/test/java/lang/instrument/MakeJAR2.sh
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2009-12-17 01:48:47.000000000 -0800
+--- ./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
@@ -49,7 +49,7 @@
@@ -29121,8 +28757,7 @@ diff -urN work/openjdk/jdk/test/java/lang/instrument/MakeJAR2.sh /tmp/openjdk7/j
PATHSEP=":"
;;
-diff -urN work/openjdk/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh /tmp/openjdk7/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2009-12-17 01:48:48.000000000 -0800
+--- ./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
@@ -35,11 +35,7 @@
@@ -29137,8 +28772,7 @@ diff -urN work/openjdk/jdk/test/java/lang/instrument/appendToClassLoaderSearch/C
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh /tmp/openjdk7/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2009-12-17 01:48:48.000000000 -0800
+--- ./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
@@ -61,10 +61,7 @@
while true; do
@@ -29152,8 +28786,7 @@ diff -urN work/openjdk/jdk/test/java/lang/management/OperatingSystemMXBean/TestS
runOne GetSystemLoadAverage
;;
* )
-diff -urN work/openjdk/jdk/test/java/net/Authenticator/B4933582.sh /tmp/openjdk7/jdk/test/java/net/Authenticator/B4933582.sh
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2009-12-17 01:48:48.000000000 -0800
+--- ./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
@@ -26,7 +26,7 @@
@@ -29164,8 +28797,7 @@ diff -urN work/openjdk/jdk/test/java/net/Authenticator/B4933582.sh /tmp/openjdk7
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh /tmp/openjdk7/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2009-12-17 01:48:49.000000000 -0800
+--- ./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
@@ -27,11 +27,7 @@
# set platform-dependent variables
@@ -29180,8 +28812,7 @@ diff -urN work/openjdk/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFac
PATHSEP=":"
FILESEP="/"
;;
-diff -urN work/openjdk/jdk/test/java/net/Socket/OldSocketImpl.sh /tmp/openjdk7/jdk/test/java/net/Socket/OldSocketImpl.sh
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2009-12-17 01:48:49.000000000 -0800
+--- ./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
@@ -28,7 +28,7 @@
@@ -29192,8 +28823,7 @@ diff -urN work/openjdk/jdk/test/java/net/Socket/OldSocketImpl.sh /tmp/openjdk7/j
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/net/URL/B5086147.sh /tmp/openjdk7/jdk/test/java/net/URL/B5086147.sh
---- ./jdk/test/java/net/URL/B5086147.sh 2009-12-17 01:48:49.000000000 -0800
+--- ./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
@@ -26,7 +26,7 @@
@@ -29204,8 +28834,7 @@ diff -urN work/openjdk/jdk/test/java/net/URL/B5086147.sh /tmp/openjdk7/jdk/test/
exit 0
;;
CYGWIN* )
-diff -urN work/openjdk/jdk/test/java/net/URL/runconstructor.sh /tmp/openjdk7/jdk/test/java/net/URL/runconstructor.sh
---- ./jdk/test/java/net/URL/runconstructor.sh 2009-12-17 01:48:49.000000000 -0800
+--- ./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
@@ -27,7 +27,7 @@
#
@@ -29216,8 +28845,7 @@ diff -urN work/openjdk/jdk/test/java/net/URL/runconstructor.sh /tmp/openjdk7/jdk
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/net/URLClassLoader/B5077773.sh /tmp/openjdk7/jdk/test/java/net/URLClassLoader/B5077773.sh
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2009-12-17 01:48:49.000000000 -0800
+--- ./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
@@ -34,11 +34,7 @@
@@ -29232,8 +28860,7 @@ diff -urN work/openjdk/jdk/test/java/net/URLClassLoader/B5077773.sh /tmp/openjdk
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh /tmp/openjdk7/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2009-12-17 01:48:49.000000000 -0800
+--- ./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
@@ -27,11 +27,7 @@
@@ -29248,8 +28875,7 @@ diff -urN work/openjdk/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh /
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/net/URLConnection/6212146/test.sh /tmp/openjdk7/jdk/test/java/net/URLConnection/6212146/test.sh
---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2009-12-17 01:48:49.000000000 -0800
+--- ./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
@@ -33,11 +33,7 @@
@@ -29264,8 +28890,7 @@ diff -urN work/openjdk/jdk/test/java/net/URLConnection/6212146/test.sh /tmp/open
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile /tmp/openjdk7/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2009-12-17 01:48:50.000000000 -0800
+--- ./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
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
@@ -29316,9 +28941,8 @@ diff -urN work/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inherited
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
-Files work/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /tmp/openjdk7/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
-diff -urN work/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh /tmp/openjdk7/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2009-12-17 01:48:50.000000000 -0800
+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
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -29388,8 +29012,7 @@ diff -urN work/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inherited
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
-diff -urN work/openjdk/jdk/test/java/rmi/reliability/launch_reliability.ksh /tmp/openjdk7/jdk/test/java/rmi/reliability/launch_reliability.ksh
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2009-12-17 01:48:51.000000000 -0800
+--- ./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
@@ -84,14 +84,12 @@
@@ -29410,8 +29033,7 @@ diff -urN work/openjdk/jdk/test/java/rmi/reliability/launch_reliability.ksh /tmp
export PATH_SEP
mainpid=$$
-diff -urN work/openjdk/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh /tmp/openjdk7/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2009-12-17 01:48:52.000000000 -0800
+--- ./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
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -29426,8 +29048,7 @@ diff -urN work/openjdk/jdk/test/java/security/Security/ClassLoaderDeadlock/Class
PATHSEP=":"
FILESEP="/"
;;
-diff -urN work/openjdk/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh /tmp/openjdk7/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2009-12-17 01:48:52.000000000 -0800
+--- ./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
@@ -34,11 +34,7 @@
# set platform-dependent variables
@@ -29442,8 +29063,7 @@ diff -urN work/openjdk/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadl
PATHSEP=":"
FILESEP="/"
;;
-diff -urN work/openjdk/jdk/test/java/security/Security/signedfirst/Dyn.sh /tmp/openjdk7/jdk/test/java/security/Security/signedfirst/Dyn.sh
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2009-12-17 01:48:52.000000000 -0800
+--- ./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
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -29458,8 +29078,7 @@ diff -urN work/openjdk/jdk/test/java/security/Security/signedfirst/Dyn.sh /tmp/o
PATHSEP=":"
FILESEP="/"
;;
-diff -urN work/openjdk/jdk/test/java/security/Security/signedfirst/Static.sh /tmp/openjdk7/jdk/test/java/security/Security/signedfirst/Static.sh
---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2009-12-17 01:48:52.000000000 -0800
+--- ./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
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -29474,8 +29093,7 @@ diff -urN work/openjdk/jdk/test/java/security/Security/signedfirst/Static.sh /tm
PATHSEP=":"
FILESEP="/"
;;
-diff -urN work/openjdk/jdk/test/java/util/Currency/PropertiesTest.sh /tmp/openjdk7/jdk/test/java/util/Currency/PropertiesTest.sh
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2009-12-17 01:48:53.000000000 -0800
+--- ./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
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -29486,8 +29104,7 @@ diff -urN work/openjdk/jdk/test/java/util/Currency/PropertiesTest.sh /tmp/openjd
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/util/PluggableLocale/ExecTest.sh /tmp/openjdk7/jdk/test/java/util/PluggableLocale/ExecTest.sh
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2009-12-17 01:48:53.000000000 -0800
+--- ./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
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -29498,8 +29115,7 @@ diff -urN work/openjdk/jdk/test/java/util/PluggableLocale/ExecTest.sh /tmp/openj
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh /tmp/openjdk7/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2009-12-17 01:48:54.000000000 -0800
+--- ./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
@@ -31,7 +31,7 @@
# set platform-dependent variables
@@ -29510,8 +29126,7 @@ diff -urN work/openjdk/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh /tmp/
PATHSEP=":"
FILESEP="/"
;;
-diff -urN work/openjdk/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh /tmp/openjdk7/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2009-12-17 01:48:54.000000000 -0800
+--- ./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
@@ -75,7 +75,7 @@
SunOS)
@@ -29522,8 +29137,7 @@ diff -urN work/openjdk/jdk/test/java/util/ResourceBundle/Control/ExpirationTest.
DEL=":"
HAS_S=YES
;;
-diff -urN work/openjdk/jdk/test/java/util/ServiceLoader/basic.sh /tmp/openjdk7/jdk/test/java/util/ServiceLoader/basic.sh
---- ./jdk/test/java/util/ServiceLoader/basic.sh 2009-12-17 01:48:54.000000000 -0800
+--- ./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
@@ -42,9 +42,7 @@
@@ -29536,8 +29150,7 @@ diff -urN work/openjdk/jdk/test/java/util/ServiceLoader/basic.sh /tmp/openjdk7/j
SEP=':' ;;
* )
SEP='\;' ;;
-diff -urN work/openjdk/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh /tmp/openjdk7/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2009-12-17 01:48:55.000000000 -0800
+--- ./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
@@ -51,7 +51,7 @@
# set platform-dependent variables
@@ -29548,8 +29161,771 @@ diff -urN work/openjdk/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh /t
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/javax/script/CommonSetup.sh /tmp/openjdk7/jdk/test/javax/script/CommonSetup.sh
---- ./jdk/test/javax/script/CommonSetup.sh 2009-12-17 01:48:57.000000000 -0800
+--- ./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
@@ -36,11 +36,7 @@
@@ -29564,8 +29940,7 @@ diff -urN work/openjdk/jdk/test/javax/script/CommonSetup.sh /tmp/openjdk7/jdk/te
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/javax/security/auth/Subject/doAs/Test.sh /tmp/openjdk7/jdk/test/javax/security/auth/Subject/doAs/Test.sh
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2009-12-17 01:48:57.000000000 -0800
+--- ./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
@@ -33,12 +33,7 @@
# set platform-dependent variables
@@ -29581,8 +29956,7 @@ diff -urN work/openjdk/jdk/test/javax/security/auth/Subject/doAs/Test.sh /tmp/op
PS=":"
FS="/"
RM="/bin/rm -f"
-diff -urN work/openjdk/jdk/test/jprt.config /tmp/openjdk7/jdk/test/jprt.config
---- ./jdk/test/jprt.config 2009-12-17 01:48:58.000000000 -0800
+--- ./jdk/test/jprt.config 2010-01-14 01:46:06.000000000 -0800
+++ ./jdk/test/jprt.config 2009-06-06 17:27:44.000000000 -0700
@@ -71,8 +71,8 @@
@@ -29651,8 +30025,7 @@ diff -urN work/openjdk/jdk/test/jprt.config /tmp/openjdk7/jdk/test/jprt.config
# Export PATH setting
PATH="${path4sdk}"
-diff -urN work/openjdk/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh /tmp/openjdk7/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2009-12-17 01:48:58.000000000 -0800
+--- ./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
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -29663,8 +30036,7 @@ diff -urN work/openjdk/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh /tmp/o
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh /tmp/openjdk7/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2009-12-17 01:48:59.000000000 -0800
+--- ./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
@@ -45,37 +45,50 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
@@ -29742,8 +30114,7 @@ diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/CustomLaunche
#
-diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh /tmp/openjdk7/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2009-12-17 01:48:59.000000000 -0800
+--- ./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
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -29754,8 +30125,7 @@ diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/GeneratePrope
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
-diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh /tmp/openjdk7/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2009-12-17 01:48:59.000000000 -0800
+--- ./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
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -29774,8 +30144,7 @@ diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/LocalManageme
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
-diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh /tmp/openjdk7/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2009-12-17 01:48:59.000000000 -0800
+--- ./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
@@ -70,10 +70,12 @@
# security the password file.
@@ -29794,8 +30163,7 @@ diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/PasswordFileP
# Create configuration file and dummy password file
-diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh /tmp/openjdk7/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2009-12-17 01:48:59.000000000 -0800
+--- ./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
@@ -69,10 +69,12 @@
# security the password file.
@@ -29814,9 +30182,8 @@ diff -urN work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFile
# Create management and SSL configuration files
-Files work/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /tmp/openjdk7/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
-diff -urN work/openjdk/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh /tmp/openjdk7/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2009-12-17 01:48:59.000000000 -0800
+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
@@ -36,11 +36,7 @@
@@ -29831,8 +30198,7 @@ diff -urN work/openjdk/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh /tmp/
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/net/www/MarkResetTest.sh /tmp/openjdk7/jdk/test/sun/net/www/MarkResetTest.sh
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2009-12-17 01:48:59.000000000 -0800
+--- ./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
@@ -28,7 +28,7 @@
@@ -29843,8 +30209,7 @@ diff -urN work/openjdk/jdk/test/sun/net/www/MarkResetTest.sh /tmp/openjdk7/jdk/t
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh /tmp/openjdk7/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh
---- ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2009-12-17 01:48:59.000000000 -0800
+--- ./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
@@ -28,7 +28,7 @@
@@ -29855,8 +30220,7 @@ diff -urN work/openjdk/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharE
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh /tmp/openjdk7/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2009-12-17 01:49:00.000000000 -0800
+--- ./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
@@ -28,7 +28,7 @@
@@ -29867,8 +30231,7 @@ diff -urN work/openjdk/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh /tmp/op
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/net/www/protocol/jar/B5105410.sh /tmp/openjdk7/jdk/test/sun/net/www/protocol/jar/B5105410.sh
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2009-12-17 01:49:00.000000000 -0800
+--- ./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
@@ -31,11 +31,7 @@
@@ -29883,8 +30246,7 @@ diff -urN work/openjdk/jdk/test/sun/net/www/protocol/jar/B5105410.sh /tmp/openjd
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh /tmp/openjdk7/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2009-12-17 01:49:00.000000000 -0800
+--- ./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
@@ -31,11 +31,7 @@
@@ -29899,8 +30261,7 @@ diff -urN work/openjdk/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh /tmp/open
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/nio/cs/EucJpBsd0212.java /tmp/openjdk7/jdk/test/sun/nio/cs/EucJpBsd0212.java
---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-01-02 11:10:54.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-01-17 13:42:34.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,79 +0,0 @@
-/*
@@ -29982,8 +30343,7 @@ diff -urN work/openjdk/jdk/test/sun/nio/cs/EucJpBsd0212.java /tmp/openjdk7/jdk/t
- System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
- if (failed > 0) throw new AssertionError("Some tests failed");}
-}
-diff -urN work/openjdk/jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java /tmp/openjdk7/jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java
---- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-01-02 11:10:54.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-01-17 13:42:34.000000000 -0800
+++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,70 +0,0 @@
-/*
@@ -30056,8 +30416,7 @@ diff -urN work/openjdk/jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java /tmp
- }
- }
-}
-diff -urN work/openjdk/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh /tmp/openjdk7/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2009-12-17 01:49:02.000000000 -0800
+--- ./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
@@ -131,6 +131,27 @@
;;
@@ -30087,8 +30446,7 @@ diff -urN work/openjdk/jdk/test/sun/security/pkcs11/KeyStore/Basic.sh /tmp/openj
Windows* )
FS="\\"
PS=";"
-diff -urN work/openjdk/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh /tmp/openjdk7/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2009-12-17 01:49:02.000000000 -0800
+--- ./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
@@ -92,6 +92,27 @@
;;
@@ -30118,8 +30476,7 @@ diff -urN work/openjdk/jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh /tmp/
Windows* )
FS="\\"
PS=";"
-diff -urN work/openjdk/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh /tmp/openjdk7/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2009-12-17 01:49:02.000000000 -0800
+--- ./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
@@ -50,13 +50,7 @@
@@ -30136,8 +30493,7 @@ diff -urN work/openjdk/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-diff -urN work/openjdk/jdk/test/sun/security/pkcs11/Provider/Login.sh /tmp/openjdk7/jdk/test/sun/security/pkcs11/Provider/Login.sh
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2009-12-17 01:49:02.000000000 -0800
+--- ./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
@@ -51,13 +51,7 @@
@@ -30154,23 +30510,22 @@ diff -urN work/openjdk/jdk/test/sun/security/pkcs11/Provider/Login.sh /tmp/openj
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
-Files work/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /tmp/openjdk7/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
-diff -urN work/openjdk/jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh /tmp/openjdk7/jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2009-12-17 01:49:04.000000000 -0800
+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
@@ -44,11 +44,7 @@
# set platform-dependent variables
@@ -30185,8 +30540,7 @@ diff -urN work/openjdk/jdk/test/sun/security/provider/PolicyFile/GrantAllPermToE
PATHSEP=":"
FILESEP="/"
;;
-diff -urN work/openjdk/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh /tmp/openjdk7/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2009-12-17 01:49:04.000000000 -0800
+--- ./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
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -30201,8 +30555,7 @@ diff -urN work/openjdk/jdk/test/sun/security/provider/PolicyFile/getinstance/get
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh /tmp/openjdk7/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2009-12-17 01:49:04.000000000 -0800
+--- ./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
@@ -42,7 +42,7 @@
@@ -30213,8 +30566,7 @@ diff -urN work/openjdk/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SS
FILESEP="/"
PATHSEP=":"
;;
-diff -urN work/openjdk/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh /tmp/openjdk7/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -30225,8 +30577,7 @@ diff -urN work/openjdk/jdk/test/sun/security/ssl/sun/net/www/protocol/https/Http
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh /tmp/openjdk7/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -30237,8 +30588,7 @@ diff -urN work/openjdk/jdk/test/sun/security/ssl/sun/net/www/protocol/https/Http
PS=":"
FS="/"
;;
-diff -urN work/openjdk/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh /tmp/openjdk7/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30249,8 +30599,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh /tmp/
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/jarsigner/PercentSign.sh /tmp/openjdk7/jdk/test/sun/security/tools/jarsigner/PercentSign.sh
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30261,8 +30610,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/jarsigner/PercentSign.sh /tmp
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/jarsigner/oldsig.sh /tmp/openjdk7/jdk/test/sun/security/tools/jarsigner/oldsig.sh
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -42,7 +42,7 @@
# set platform-dependent variables
@@ -30273,8 +30621,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/jarsigner/oldsig.sh /tmp/open
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/AltProviderPath.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30285,8 +30632,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/AltProviderPath.sh /t
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -30301,8 +30647,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.s
PATHSEP=":"
FILESEP="/"
;;
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -45,7 +45,7 @@
# set platform-dependent variables
@@ -30313,8 +30658,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh /tmp/o
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/StandardAlgName.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/StandardAlgName.sh
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30325,8 +30669,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/StandardAlgName.sh /t
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/autotest.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/autotest.sh
---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -72,6 +72,27 @@
;;
@@ -30356,8 +30699,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/autotest.sh /tmp/open
* )
echo "Will not run test on: ${OS}"
exit 0;
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/i18n.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/i18n.sh
---- ./jdk/test/sun/security/tools/keytool/i18n.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30368,8 +30710,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/i18n.sh /tmp/openjdk7
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/printssl.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/printssl.sh
---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -37,7 +37,7 @@
# set platform-dependent variables
@@ -30380,8 +30721,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/printssl.sh /tmp/open
FS="/"
;;
CYGWIN* )
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/resource.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/resource.sh
---- ./jdk/test/sun/security/tools/keytool/resource.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -30392,8 +30732,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/resource.sh /tmp/open
NULL=/dev/null
FS="/"
TMP=/tmp
-diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/standard.sh /tmp/openjdk7/jdk/test/sun/security/tools/keytool/standard.sh
---- ./jdk/test/sun/security/tools/keytool/standard.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -30404,8 +30743,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/keytool/standard.sh /tmp/open
FS="/"
;;
Windows_* )
-diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/Alias.sh /tmp/openjdk7/jdk/test/sun/security/tools/policytool/Alias.sh
---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30416,8 +30754,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/Alias.sh /tmp/open
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/ChangeUI.sh /tmp/openjdk7/jdk/test/sun/security/tools/policytool/ChangeUI.sh
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30428,8 +30765,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/ChangeUI.sh /tmp/o
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/OpenPolicy.sh /tmp/openjdk7/jdk/test/sun/security/tools/policytool/OpenPolicy.sh
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30440,8 +30776,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/OpenPolicy.sh /tmp
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/SaveAs.sh /tmp/openjdk7/jdk/test/sun/security/tools/policytool/SaveAs.sh
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30452,8 +30787,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/SaveAs.sh /tmp/ope
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh /tmp/openjdk7/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30464,8 +30798,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/UpdatePermissions.
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/UsePolicy.sh /tmp/openjdk7/jdk/test/sun/security/tools/policytool/UsePolicy.sh
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30476,8 +30809,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/UsePolicy.sh /tmp/
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/i18n.sh /tmp/openjdk7/jdk/test/sun/security/tools/policytool/i18n.sh
---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30488,8 +30820,7 @@ diff -urN work/openjdk/jdk/test/sun/security/tools/policytool/i18n.sh /tmp/openj
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh /tmp/openjdk7/jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -53,7 +53,7 @@
@@ -30500,8 +30831,7 @@ diff -urN work/openjdk/jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh /tmp
PATHSEP=":"
;;
-diff -urN work/openjdk/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh /tmp/openjdk7/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2009-12-17 01:49:05.000000000 -0800
+--- ./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
@@ -54,7 +54,7 @@
@@ -30512,8 +30842,7 @@ diff -urN work/openjdk/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh /tmp/ope
PATHSEP=":"
;;
-diff -urN work/openjdk/jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh /tmp/openjdk7/jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2009-12-17 01:49:06.000000000 -0800
+--- ./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
@@ -33,7 +33,7 @@
@@ -30524,8 +30853,7 @@ diff -urN work/openjdk/jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh /tmp
esac
N2A=$TESTJAVA/bin/native2ascii
-diff -urN work/openjdk/jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh /tmp/openjdk7/jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2009-12-17 01:49:06.000000000 -0800
+--- ./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
@@ -56,7 +56,7 @@
@@ -30536,8 +30864,7 @@ diff -urN work/openjdk/jdk/test/sun/tools/native2ascii/resources/ImmutableResour
PATHSEP=":"
;;
-diff -urN work/openjdk/jdk/test/tools/pack200/Pack200Simple.sh /tmp/openjdk7/jdk/test/tools/pack200/Pack200Simple.sh
---- ./jdk/test/tools/pack200/Pack200Simple.sh 2009-12-17 01:49:06.000000000 -0800
+--- ./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
@@ -85,7 +85,7 @@
break
@@ -30548,21 +30875,18 @@ diff -urN work/openjdk/jdk/test/tools/pack200/Pack200Simple.sh /tmp/openjdk7/jdk
PackOptions="-J-Xmx512m -J-ea"
break
;;
-diff -urN work/openjdk/langtools/.hgtags /tmp/openjdk7/langtools/.hgtags
---- ./langtools/.hgtags 2009-12-17 01:49:28.000000000 -0800
-+++ ./langtools/.hgtags 2009-12-20 19:51:06.000000000 -0800
-@@ -52,3 +52,4 @@
- 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+--- ./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
0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
-+acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
-diff -urN work/openjdk/langtools/.jcheck/conf /tmp/openjdk7/langtools/.jcheck/conf
---- ./langtools/.jcheck/conf 2009-12-17 01:49:28.000000000 -0800
+ acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
++ac5b4c5644ce54585e5287563dde2b006fa664f4 jdk7-b79
+--- ./langtools/.jcheck/conf 2010-01-14 01:46:32.000000000 -0800
+++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
-diff -urN work/openjdk/langtools/test/Makefile /tmp/openjdk7/langtools/test/Makefile
---- ./langtools/test/Makefile 2009-12-17 01:49:30.000000000 -0800
+--- ./langtools/test/Makefile 2010-01-14 01:46:34.000000000 -0800
+++ ./langtools/test/Makefile 2009-09-23 21:29:29.000000000 -0700
@@ -20,6 +20,22 @@
ARCH=i586
@@ -30607,8 +30931,7 @@ diff -urN work/openjdk/langtools/test/Makefile /tmp/openjdk7/langtools/test/Make
# Root of all test results
TEST_OUTPUT_DIR = $(TEST_ROOT)/o_$(PLATFORM)-$(ARCH)
-diff -urN work/openjdk/langtools/test/jprt.config /tmp/openjdk7/langtools/test/jprt.config
---- ./langtools/test/jprt.config 2009-12-17 01:49:31.000000000 -0800
+--- ./langtools/test/jprt.config 2010-01-14 01:46:35.000000000 -0800
+++ ./langtools/test/jprt.config 2009-06-06 17:29:59.000000000 -0700
@@ -71,8 +71,8 @@
@@ -30677,8 +31000,7 @@ diff -urN work/openjdk/langtools/test/jprt.config /tmp/openjdk7/langtools/test/j
# Export PATH setting
PATH="${path4sdk}"
-diff -urN work/openjdk/langtools/test/tools/javac/4846262/Test.sh /tmp/openjdk7/langtools/test/tools/javac/4846262/Test.sh
---- ./langtools/test/tools/javac/4846262/Test.sh 2009-12-17 01:49:32.000000000 -0800
+--- ./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
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -30689,8 +31011,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/4846262/Test.sh /tmp/openjdk7/
FS="/"
;;
CYGWIN* )
-diff -urN work/openjdk/langtools/test/tools/javac/6302184/T6302184.sh /tmp/openjdk7/langtools/test/tools/javac/6302184/T6302184.sh
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2009-12-17 01:49:32.000000000 -0800
+--- ./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
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -30701,8 +31022,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/6302184/T6302184.sh /tmp/openj
FS="/"
;;
CYGWIN* )
-diff -urN work/openjdk/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh /tmp/openjdk7/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2009-12-17 01:49:32.000000000 -0800
+--- ./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
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -30713,8 +31033,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
FS="/"
;;
Windows* )
-diff -urN work/openjdk/langtools/test/tools/javac/ExtDirs/ExtDirs.sh /tmp/openjdk7/langtools/test/tools/javac/ExtDirs/ExtDirs.sh
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2009-12-17 01:49:33.000000000 -0800
+--- ./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
@@ -54,7 +54,7 @@
# set platform-dependent variables
@@ -30725,8 +31044,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/ExtDirs/ExtDirs.sh /tmp/openjd
PS=":"
FS="/"
;;
-diff -urN work/openjdk/langtools/test/tools/javac/MissingInclude.sh /tmp/openjdk7/langtools/test/tools/javac/MissingInclude.sh
---- ./langtools/test/tools/javac/MissingInclude.sh 2009-12-17 01:49:33.000000000 -0800
+--- ./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
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30737,8 +31055,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/MissingInclude.sh /tmp/openjdk
FS="/"
;;
Windows* )
-diff -urN work/openjdk/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh /tmp/openjdk7/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2009-12-17 01:49:33.000000000 -0800
+--- ./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
@@ -52,7 +52,7 @@
# set platform-dependent variables
@@ -30749,8 +31066,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/ProtectedInnerClass/ProtectedI
PS=":"
FS="/"
;;
-diff -urN work/openjdk/langtools/test/tools/javac/T5090006/compiler.sh /tmp/openjdk7/langtools/test/tools/javac/T5090006/compiler.sh
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2009-12-17 01:49:33.000000000 -0800
+--- ./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
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30761,8 +31077,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/T5090006/compiler.sh /tmp/open
FS="/"
;;
Windows* )
-diff -urN work/openjdk/langtools/test/tools/javac/apt.sh /tmp/openjdk7/langtools/test/tools/javac/apt.sh
---- ./langtools/test/tools/javac/apt.sh 2009-12-17 01:49:34.000000000 -0800
+--- ./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
@@ -38,7 +38,7 @@
# set platform-dependent variables
@@ -30773,8 +31088,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/apt.sh /tmp/openjdk7/langtools
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/langtools/test/tools/javac/constDebug/ConstDebug.sh /tmp/openjdk7/langtools/test/tools/javac/constDebug/ConstDebug.sh
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2009-12-17 01:49:34.000000000 -0800
+--- ./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
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30785,8 +31099,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/constDebug/ConstDebug.sh /tmp/
PS=":"
FS="/"
;;
-diff -urN work/openjdk/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh /tmp/openjdk7/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2009-12-17 01:49:34.000000000 -0800
+--- ./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
@@ -48,7 +48,7 @@
# set platform-dependent variables
@@ -30797,8 +31110,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh /tmp
FS="/"
;;
CYGWIN* )
-diff -urN work/openjdk/langtools/test/tools/javac/innerClassFile/Driver.sh /tmp/openjdk7/langtools/test/tools/javac/innerClassFile/Driver.sh
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2009-12-17 01:49:36.000000000 -0800
+--- ./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
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -30809,8 +31121,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/innerClassFile/Driver.sh /tmp/
FS="/"
;;
Windows* )
-diff -urN work/openjdk/langtools/test/tools/javac/javazip/Test.sh /tmp/openjdk7/langtools/test/tools/javac/javazip/Test.sh
---- ./langtools/test/tools/javac/javazip/Test.sh 2009-12-17 01:49:36.000000000 -0800
+--- ./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
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -30821,8 +31132,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/javazip/Test.sh /tmp/openjdk7/
FS="/"
SCR=`pwd`
;;
-diff -urN work/openjdk/langtools/test/tools/javac/links/links.sh /tmp/openjdk7/langtools/test/tools/javac/links/links.sh
---- ./langtools/test/tools/javac/links/links.sh 2009-12-17 01:49:36.000000000 -0800
+--- ./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
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -30833,8 +31143,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/links/links.sh /tmp/openjdk7/l
NULL=/dev/null
PS=":"
FS="/"
-diff -urN work/openjdk/langtools/test/tools/javac/newlines/Newlines.sh /tmp/openjdk7/langtools/test/tools/javac/newlines/Newlines.sh
---- ./langtools/test/tools/javac/newlines/Newlines.sh 2009-12-17 01:49:36.000000000 -0800
+--- ./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
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -30845,8 +31154,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/newlines/Newlines.sh /tmp/open
FS="/"
;;
Windows* )
-diff -urN work/openjdk/langtools/test/tools/javac/stackmap/T4955930.sh /tmp/openjdk7/langtools/test/tools/javac/stackmap/T4955930.sh
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2009-12-17 01:49:36.000000000 -0800
+--- ./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
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -30857,8 +31165,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/stackmap/T4955930.sh /tmp/open
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
-diff -urN work/openjdk/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh /tmp/openjdk7/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2009-12-17 01:49:37.000000000 -0800
+--- ./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
@@ -66,6 +66,17 @@
exit 0;
@@ -30878,8 +31185,7 @@ diff -urN work/openjdk/langtools/test/tools/javac/unicode/SupplementaryJavaID6.s
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;
-diff -urN work/openjdk/langtools/test/tools/javah/6257087/foo.sh /tmp/openjdk7/langtools/test/tools/javah/6257087/foo.sh
---- ./langtools/test/tools/javah/6257087/foo.sh 2009-12-17 01:49:37.000000000 -0800
+--- ./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
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -30890,8 +31196,7 @@ diff -urN work/openjdk/langtools/test/tools/javah/6257087/foo.sh /tmp/openjdk7/l
PS=":"
FS="/"
;;
-diff -urN work/openjdk/langtools/test/tools/javah/ConstMacroTest.sh /tmp/openjdk7/langtools/test/tools/javah/ConstMacroTest.sh
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2009-12-17 01:49:37.000000000 -0800
+--- ./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
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -30902,8 +31207,7 @@ diff -urN work/openjdk/langtools/test/tools/javah/ConstMacroTest.sh /tmp/openjdk
PS=":"
FS="/"
;;
-diff -urN work/openjdk/langtools/test/tools/javah/MissingParamClassTest.sh /tmp/openjdk7/langtools/test/tools/javah/MissingParamClassTest.sh
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2009-12-17 01:49:37.000000000 -0800
+--- ./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
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -30914,8 +31218,7 @@ diff -urN work/openjdk/langtools/test/tools/javah/MissingParamClassTest.sh /tmp/
PS=":"
FS="/"
;;
-diff -urN work/openjdk/langtools/test/tools/javah/ReadOldClass.sh /tmp/openjdk7/langtools/test/tools/javah/ReadOldClass.sh
---- ./langtools/test/tools/javah/ReadOldClass.sh 2009-12-17 01:49:37.000000000 -0800
+--- ./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
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -30926,8 +31229,7 @@ diff -urN work/openjdk/langtools/test/tools/javah/ReadOldClass.sh /tmp/openjdk7/
PS=":"
FS="/"
;;
-diff -urN work/openjdk/langtools/test/tools/javap/pathsep.sh /tmp/openjdk7/langtools/test/tools/javap/pathsep.sh
---- ./langtools/test/tools/javap/pathsep.sh 2009-12-17 01:49:38.000000000 -0800
+--- ./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
@@ -40,7 +40,7 @@
# set platform-dependent variables
generated by cgit (git 2.34.1) at 2024-11-30 10:40:55 +0800