aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2010-03-27 21:30:38 +0000
committerGreg Lewis <glewis@FreeBSD.org>2010-03-27 21:30:38 +0000
commit82ec68f6e6b67c7ca24d8495364553304a70b2ea (patch)
tree6c4de7fb55e6e9c9b20daaf3f5e350abbfe1955e /java
parent793aa502590780f3a76f36bae179dedbad481983 (diff)
downloadports-82ec68f6e6b67c7ca24d8495364553304a70b2ea.tar.gz
ports-82ec68f6e6b67c7ca24d8495364553304a70b2ea.zip
. Update to Build 86.
Notes
Notes: svn path=/head/; revision=251590
Diffstat (limited to 'java')
-rw-r--r--java/openjdk7/Makefile5
-rw-r--r--java/openjdk7/distinfo6
-rw-r--r--java/openjdk7/files/patch-set1578
3 files changed, 811 insertions, 778 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 33fad5b345e8..5c1c2fdfb959 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -7,7 +7,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER}
-PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk7/promoted/b${JDK_BUILD_NUMBER}/ \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,}
@@ -23,8 +22,8 @@ USE_ZIP= YES
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 0
-JDK_BUILD_NUMBER= 82
-JDK_BUILD_DATE= 04_feb_2010
+JDK_BUILD_NUMBER= 86
+JDK_BUILD_DATE= 18_mar_2010
JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}-ea-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
# Use our own version of ant to avoid circular dependencies
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index ec02692628cd..303158b64134 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,6 +1,6 @@
-MD5 (openjdk-7-ea-src-b82-04_feb_2010.zip) = c352bbcbf17aeedff9a2d5672c032df5
-SHA256 (openjdk-7-ea-src-b82-04_feb_2010.zip) = 1a34928bf7628f0aec9ba60642d6306625b2bda904cd74ab2354b1a7b92a9403
-SIZE (openjdk-7-ea-src-b82-04_feb_2010.zip) = 94640032
+MD5 (openjdk-7-ea-src-b86-18_mar_2010.zip) = c4c6eb552bffd2f6bfcef48aa237bf13
+SHA256 (openjdk-7-ea-src-b86-18_mar_2010.zip) = f769442f54cca429cc4bf3799fd2e6c75c3ef7d3e990d946290dae5ac51079bc
+SIZE (openjdk-7-ea-src-b86-18_mar_2010.zip) = 95002753
MD5 (apache-ant-1.7.1-bin.zip) = f64c979dd593324fd1e58eea4d991522
SHA256 (apache-ant-1.7.1-bin.zip) = 879a6ae22ae022a944a43f6dea21acfdec0acb30175e743664536f89626c0281
SIZE (apache-ant-1.7.1-bin.zip) = 11657986
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
index 207487966cb0..a0de16f36e93 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,86 +1,26 @@
---- ./.hgignore 2010-02-04 01:41:00.000000000 -0800
-+++ ./.hgignore 1969-12-31 16:00:00.000000000 -0800
-@@ -1,3 +0,0 @@
--^build/
--^dist/
--/nbproject/private/
---- ./.hgtags 2010-02-04 01:41:00.000000000 -0800
-+++ ./.hgtags 1969-12-31 16:00:00.000000000 -0800
-@@ -1,58 +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
--ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
--20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
--a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
--8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81
---- ./.jcheck/conf 2010-02-04 01:41:00.000000000 -0800
+--- ./.hgtags 2010-03-18 01:40:42.000000000 -0700
++++ ./.hgtags 2010-03-20 11:11:41.000000000 -0700
+@@ -60,3 +60,4 @@
+ 6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83
+ 2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84
+ cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
++433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
+--- ./.jcheck/conf 2010-03-18 01:40:42.000000000 -0700
+++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/.hgtags 2010-02-04 01:41:08.000000000 -0800
-+++ ./corba/.hgtags 2010-02-06 10:17:00.000000000 -0800
-@@ -56,3 +56,4 @@
- ec0421b5703b677e2226cf4bf7ae4eaafd8061c5 jdk7-b79
- 0336e70ca0aeabc783cc01658f36cb6e27ea7934 jdk7-b80
- e08a42a2a94d97ea8eedb187a94dbff822c8fbba jdk7-b81
-+1e8c1bfad1abb4b81407a0f2645e0fb85764ca48 jdk7-b82
---- ./corba/.jcheck/conf 2010-02-04 01:41:08.000000000 -0800
+--- ./corba/.hgtags 2010-03-18 01:40:50.000000000 -0700
++++ ./corba/.hgtags 2010-03-20 11:11:48.000000000 -0700
+@@ -60,3 +60,4 @@
+ fde0df7a2384f7fe33204a79678989807d9c2b98 jdk7-b83
+ 68c8961a82e4a3ad2a67991e5d834192a81eb4cd jdk7-b84
+ c67a9df7bc0ca291f08f9a9cc05cb78ea15d25e6 jdk7-b85
++6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86
+--- ./corba/.jcheck/conf 2010-03-18 01:40:50.000000000 -0700
+++ ./corba/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/make/common/Defs-bsd.gmk 2010-02-06 22:30:47.000000000 -0800
+--- ./corba/make/common/Defs-bsd.gmk 2010-03-27 11:09:14.000000000 -0700
+++ ./corba/make/common/Defs-bsd.gmk 2009-11-14 12:49:01.000000000 -0800
@@ -25,7 +25,7 @@
@@ -219,7 +159,7 @@
override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =
override THREADS_FLAG = native
---- ./corba/make/common/Defs-linux.gmk 2010-02-04 01:41:09.000000000 -0800
+--- ./corba/make/common/Defs-linux.gmk 2010-03-18 01:40:51.000000000 -0700
+++ ./corba/make/common/Defs-linux.gmk 2009-11-13 00:07:56.000000000 -0800
@@ -290,7 +290,7 @@
override LIBTHREAD =
@@ -230,7 +170,7 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./corba/make/common/Defs.gmk 2010-02-04 01:41:09.000000000 -0800
+--- ./corba/make/common/Defs.gmk 2010-03-18 01:40:51.000000000 -0700
+++ ./corba/make/common/Defs.gmk 2009-10-05 22:35:11.000000000 -0700
@@ -53,6 +53,28 @@
@@ -271,7 +211,7 @@
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./corba/make/common/Mapfile-vers.gmk 2010-02-04 01:41:09.000000000 -0800
+--- ./corba/make/common/Mapfile-vers.gmk 2010-03-18 01:40:51.000000000 -0700
+++ ./corba/make/common/Mapfile-vers.gmk 2009-06-06 16:47:35.000000000 -0700
@@ -77,7 +77,7 @@
endif # PLATFORM
@@ -282,7 +222,7 @@
ifeq ($(VARIANT), OPT)
# OPT build MUST have a mapfile?
---- ./corba/make/common/shared/Compiler-gcc.gmk 2010-02-04 01:41:09.000000000 -0800
+--- ./corba/make/common/shared/Compiler-gcc.gmk 2010-03-18 01:40:51.000000000 -0700
+++ ./corba/make/common/shared/Compiler-gcc.gmk 2009-11-13 00:07:56.000000000 -0800
@@ -100,6 +100,23 @@
@@ -308,7 +248,7 @@
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./corba/make/common/shared/Compiler.gmk 2010-02-04 01:41:09.000000000 -0800
+--- ./corba/make/common/shared/Compiler.gmk 2010-03-18 01:40:51.000000000 -0700
+++ ./corba/make/common/shared/Compiler.gmk 2009-06-06 16:47:35.000000000 -0700
@@ -42,6 +42,11 @@
override CC_VERSION = gcc
@@ -322,7 +262,7 @@
# Get the compiler specific settings
include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk
---- ./corba/make/common/shared/Defs-bsd.gmk 2010-02-06 22:30:47.000000000 -0800
+--- ./corba/make/common/shared/Defs-bsd.gmk 2010-03-27 11:09:14.000000000 -0700
+++ ./corba/make/common/shared/Defs-bsd.gmk 2009-06-06 16:47:35.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -342,7 +282,7 @@
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
---- ./corba/make/common/shared/Defs-utils.gmk 2010-02-04 01:41:09.000000000 -0800
+--- ./corba/make/common/shared/Defs-utils.gmk 2010-03-18 01:40:51.000000000 -0700
+++ ./corba/make/common/shared/Defs-utils.gmk 2009-10-05 22:35:11.000000000 -0700
@@ -53,6 +53,13 @@
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
@@ -391,7 +331,7 @@
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif
---- ./corba/make/common/shared/Platform.gmk 2010-02-04 01:41:09.000000000 -0800
+--- ./corba/make/common/shared/Platform.gmk 2010-03-18 01:40:51.000000000 -0700
+++ ./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)
@@ -514,7 +454,7 @@
REQUIRED_ZIP_VER = 2.2
REQUIRED_UNZIP_VER = 5.12
REQUIRED_MAKE_VER = 3.78
---- ./corba/make/sun/corba/core/Makefile 2010-02-04 01:41:09.000000000 -0800
+--- ./corba/make/sun/corba/core/Makefile 2010-03-18 01:40:51.000000000 -0700
+++ ./corba/make/sun/corba/core/Makefile 2009-06-06 16:47:35.000000000 -0700
@@ -53,11 +53,19 @@
ifdef STANDALONE_CORBA_WS
@@ -536,7 +476,7 @@
FILES_c = ioser.c
---- ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2010-02-04 01:41:12.000000000 -0800
+--- ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2010-03-18 01:40:54.000000000 -0700
+++ ./corba/src/share/native/com/sun/corba/se/internal/io/ioser.c 2009-06-06 16:47:41.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -715,18 +655,18 @@
- return (jlong)fieldID;
+ return (jlong)(intptr_t)fieldID;
}
---- ./hotspot/.hgtags 2010-02-04 01:41:48.000000000 -0800
-+++ ./hotspot/.hgtags 2010-02-06 10:17:07.000000000 -0800
-@@ -56,3 +56,4 @@
- a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
- 3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80
- 1f9b07674480c224828852ffe137beea36b3cab5 jdk7-b81
-+1999f5b12482d66c8b0daf6709daea4f51893a04 jdk7-b82
---- ./hotspot/.jcheck/conf 2010-02-04 01:41:48.000000000 -0800
+--- ./hotspot/.hgtags 2010-03-18 01:41:32.000000000 -0700
++++ ./hotspot/.hgtags 2010-03-20 11:11:57.000000000 -0700
+@@ -83,3 +83,4 @@
+ ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84
+ 6c9796468b91dcbb39e09dfa1baf9779ac45eb66 jdk7-b85
+ 418bc80ce13995149eadc9eecbba21d7a9fa02ae hs17-b10
++bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86
+--- ./hotspot/.jcheck/conf 2010-03-18 01:41:32.000000000 -0700
+++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./hotspot/agent/make/Makefile 2010-02-04 01:41:48.000000000 -0800
+--- ./hotspot/agent/make/Makefile 2010-03-18 01:41:32.000000000 -0700
+++ ./hotspot/agent/make/Makefile 2009-06-06 16:53:52.000000000 -0700
@@ -52,6 +52,9 @@
sun.jvm.hotspot.compiler \
@@ -757,7 +697,7 @@
sun/jvm/hotspot/debugger/cdbg/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-02-06 22:30:38.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2009-06-06 16:53:52.000000000 -0700
@@ -22,6 +22,7 @@
*
@@ -898,7 +838,7 @@
#endif /* amd64 */
---- ./hotspot/agent/src/os/bsd/Makefile 2010-02-06 22:30:38.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/Makefile 2010-03-27 11:09:09.000000000 -0700
+++ ./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,
@@ -1101,7 +1041,7 @@
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+ return 0;
+}
---- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-02-06 22:30:38.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2009-06-06 16:53:52.000000000 -0700
@@ -25,16 +25,19 @@
#ifndef _ELFMACROS_H_
@@ -1403,7 +1343,7 @@
+extern void hdestroy_r (struct hsearch_data *__htab);
+
+#endif /* _HSEARCH_R_H_ */
---- ./hotspot/agent/src/os/bsd/libproc.h 2010-02-06 22:30:38.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/libproc.h 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/libproc.h 2009-06-06 16:53:52.000000000 -0700
@@ -27,7 +27,8 @@
@@ -1465,7 +1405,7 @@
// get number of shared objects
int get_num_libs(struct ps_prochandle* ph);
---- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-02-06 22:30:38.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2009-06-06 16:53:52.000000000 -0700
@@ -178,6 +178,9 @@
if (newlib->symtab == NULL) {
@@ -1561,7 +1501,7 @@
+ print_debug("ps_pcontinue not implemented\n");
return PS_OK;
}
---- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2009-06-06 16:53:52.000000000 -0700
@@ -47,7 +47,7 @@
typedef struct thread_info {
@@ -1592,7 +1532,7 @@
// part of the class sharing workaround
int classes_jsa_fd; // file descriptor of class share archive
uintptr_t dynamic_addr; // address of dynamic section of a.out
---- ./hotspot/agent/src/os/bsd/mapfile 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/mapfile 2010-03-27 11:09:09.000000000 -0700
+++ ./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
@@ -1615,7 +1555,7 @@
# used by attach test program
init_libproc;
---- ./hotspot/agent/src/os/bsd/proc_service.h 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/proc_service.h 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,76 +0,0 @@
-/*
@@ -1694,7 +1634,7 @@
-ps_err_e ps_get_thread_area();
-
-#endif /* _PROC_SERVICE_H_ */
---- ./hotspot/agent/src/os/bsd/ps_core.c 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/ps_core.c 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/ps_core.c 2009-10-05 21:49:06.000000000 -0700
@@ -142,6 +142,7 @@
@@ -1993,7 +1933,7 @@
struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
if (ph == NULL) {
---- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2009-10-05 21:49:06.000000000 -0700
@@ -22,20 +22,22 @@
*
@@ -2558,7 +2498,7 @@
- }
return ph;
}
---- ./hotspot/agent/src/os/bsd/salibelf.c 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/salibelf.c 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/salibelf.c 2009-06-06 16:53:52.000000000 -0700
@@ -25,6 +25,7 @@
#include "salibelf.h"
@@ -2568,7 +2508,7 @@
extern void print_debug(const char*,...);
---- ./hotspot/agent/src/os/bsd/symtab.c 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/symtab.c 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/symtab.c 2009-06-06 16:53:52.000000000 -0700
@@ -23,10 +23,10 @@
*/
@@ -2634,7 +2574,7 @@
ELF_SYM *syms;
int j, n, rslt;
size_t size;
---- ./hotspot/agent/src/os/bsd/test.c 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/test.c 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/test.c 2009-06-06 16:53:52.000000000 -0700
@@ -44,7 +44,7 @@
}
@@ -2645,7 +2585,7 @@
return 1;
}
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-02-04 01:41:49.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-03-18 01:41:33.000000000 -0700
+++ ./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.*;
@@ -2716,7 +2656,7 @@
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-02-04 01:41:50.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-03-18 01:41:33.000000000 -0700
+++ ./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.*;
@@ -2789,7 +2729,7 @@
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-03-27 11:09:09.000000000 -0700
+++ ./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.*;
@@ -2816,7 +2756,7 @@
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2009-06-06 16:53:54.000000000 -0700
@@ -26,9 +26,7 @@
@@ -2839,7 +2779,7 @@
} else {
throw new RuntimeException("cpu " + cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -2888,7 +2828,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,81 +0,0 @@
-/*
@@ -2972,7 +2912,7 @@
- private Address sp;
- private BsdDebugger dbg;
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -3021,7 +2961,7 @@
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-02-04 01:41:52.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-03-18 01:41:35.000000000 -0700
+++ ./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;
@@ -3046,7 +2986,7 @@
}
if (access == null) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-03-27 11:09:09.000000000 -0700
+++ ./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 = {
@@ -3108,7 +3048,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,137 +0,0 @@
-/*
@@ -3248,7 +3188,7 @@
- return debugger.getThreadForIdentifierAddress(pthreadIdAddr);
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,165 +0,0 @@
-/*
@@ -3416,7 +3356,7 @@
-
-
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-03-27 11:09:09.000000000 -0700
+++ ./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 = {
@@ -3478,7 +3418,7 @@
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-02-04 01:41:52.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-03-18 01:41:36.000000000 -0700
+++ ./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";
@@ -3495,8 +3435,8 @@
} else if (os.startsWith("Windows")) {
return "win32";
} else {
---- ./hotspot/make/Makefile 2010-02-04 01:41:52.000000000 -0800
-+++ ./hotspot/make/Makefile 2009-11-02 22:42:17.000000000 -0800
+--- ./hotspot/make/Makefile 2010-03-18 01:41:36.000000000 -0700
++++ ./hotspot/make/Makefile 2010-02-15 08:08:22.000000000 -0800
@@ -290,20 +290,20 @@
# Shared Library
ifneq ($(OSNAME),windows)
@@ -3525,7 +3465,7 @@
$(install-file)
endif
endif
---- ./hotspot/make/bsd/Makefile 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/make/bsd/Makefile 2010-03-27 11:09:09.000000000 -0700
+++ ./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
@@ -3565,7 +3505,7 @@
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
---- ./hotspot/make/bsd/makefiles/buildtree.make 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/buildtree.make 2010-03-27 11:09:09.000000000 -0700
+++ ./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}}"; }; \
@@ -3580,7 +3520,7 @@
) > $@
env.csh: env.sh
---- ./hotspot/make/bsd/makefiles/cscope.make 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/cscope.make 2010-03-27 11:09:09.000000000 -0700
+++ ./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
@@ -3591,7 +3531,7 @@
CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
endif
---- ./hotspot/make/bsd/makefiles/defs.make 2010-02-06 22:30:39.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/defs.make 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/defs.make 2009-11-04 21:25:27.000000000 -0800
@@ -72,8 +72,8 @@
HS_ARCH = sparc
@@ -3680,7 +3620,7 @@
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
endif
endif
---- ./hotspot/make/bsd/makefiles/gcc.make 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/gcc.make 2010-03-27 11:09:09.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/gcc.make 2009-11-04 19:52:29.000000000 -0800
@@ -22,12 +22,15 @@
#
@@ -3793,7 +3733,7 @@
#------------------------------------------------------------------------
# Debug flags
---- ./hotspot/make/bsd/makefiles/jsig.make 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/jsig.make 2010-03-27 11:09:10.000000000 -0700
+++ ./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
@@ -3834,7 +3774,7 @@
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
install_jsig: $(LIBJSIG)
---- ./hotspot/make/bsd/makefiles/launcher.make 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/launcher.make 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/launcher.make 2010-01-16 14:12:37.000000000 -0800
@@ -46,7 +46,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
@@ -3845,7 +3785,7 @@
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
---- ./hotspot/make/bsd/makefiles/sa.make 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/sa.make 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/sa.make 2009-11-04 19:52:29.000000000 -0800
@@ -42,8 +42,8 @@
@@ -3858,7 +3798,7 @@
SA_CLASSDIR = $(GENERATED)/saclasses
---- ./hotspot/make/bsd/makefiles/saproc.make 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/saproc.make 2010-03-27 11:09:10.000000000 -0700
+++ ./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
@@ -3927,7 +3867,7 @@
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
install_saproc: checkAndBuildSA
---- ./hotspot/make/bsd/makefiles/vm.make 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/vm.make 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/vm.make 2010-01-30 19:00:06.000000000 -0800
@@ -99,7 +99,7 @@
# Extra flags from gnumake's invocation or environment
@@ -4029,7 +3969,7 @@
}
DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
---- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/makefiles/zeroshark.make 2009-12-20 19:41:23.000000000 -0800
@@ -40,4 +40,23 @@
CFLAGS += -D_LP64=1
@@ -4055,7 +3995,7 @@
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
OPT_CFLAGS/compactingPermGenGen.o = -O1
---- ./hotspot/make/bsd/platform_amd64 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/platform_amd64 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/platform_amd64 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4063,7 +4003,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_amd64.suncc 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/platform_amd64.suncc 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/platform_amd64.suncc 2010-01-17 15:46:11.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4071,7 +4011,7 @@
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_i486 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/platform_i486 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/platform_i486 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4079,7 +4019,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_i486.suncc 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/platform_i486.suncc 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/platform_i486.suncc 2010-01-17 15:46:11.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4087,7 +4027,7 @@
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_ia64 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/platform_ia64 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/platform_ia64 2010-01-17 15:46:11.000000000 -0800
@@ -10,6 +10,6 @@
@@ -4097,7 +4037,7 @@
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP
mark_style = alignment
---- ./hotspot/make/bsd/platform_sparc 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/platform_sparc 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/platform_sparc 2009-06-06 16:53:58.000000000 -0700
@@ -12,4 +12,4 @@
@@ -4105,7 +4045,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_sparcv9 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/platform_sparcv9 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/platform_sparcv9 2010-01-17 15:46:11.000000000 -0800
@@ -12,4 +12,4 @@
@@ -4113,7 +4053,7 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_zero.in 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/make/bsd/platform_zero.in 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/make/bsd/platform_zero.in 2009-11-04 19:52:29.000000000 -0800
@@ -14,4 +14,4 @@
@@ -4121,8 +4061,8 @@
-sysdefs = -DBSD -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
---- ./hotspot/make/defs.make 2010-02-04 01:41:52.000000000 -0800
-+++ ./hotspot/make/defs.make 2009-10-31 08:51:23.000000000 -0700
+--- ./hotspot/make/defs.make 2010-03-18 01:41:36.000000000 -0700
++++ ./hotspot/make/defs.make 2010-02-15 08:08:22.000000000 -0800
@@ -119,13 +119,23 @@
# Windows should have OS predefined
ifeq ($(OS),)
@@ -4149,7 +4089,7 @@
else
OSNAME=solaris
endif
---- ./hotspot/make/linux/makefiles/defs.make 2010-02-04 01:41:52.000000000 -0800
+--- ./hotspot/make/linux/makefiles/defs.make 2010-03-18 01:41:36.000000000 -0700
+++ ./hotspot/make/linux/makefiles/defs.make 2009-11-02 22:51:00.000000000 -0800
@@ -100,28 +100,31 @@
@@ -4188,7 +4128,7 @@
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
endif
endif
---- ./hotspot/make/sa.files 2010-02-04 01:41:53.000000000 -0800
+--- ./hotspot/make/sa.files 2010-03-18 01:41:37.000000000 -0700
+++ ./hotspot/make/sa.files 2009-06-06 16:53:58.000000000 -0700
@@ -50,6 +50,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
@@ -4210,7 +4150,7 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \
---- ./hotspot/make/solaris/makefiles/defs.make 2010-02-04 01:41:53.000000000 -0800
+--- ./hotspot/make/solaris/makefiles/defs.make 2010-03-18 01:41:37.000000000 -0700
+++ ./hotspot/make/solaris/makefiles/defs.make 2009-11-04 19:52:29.000000000 -0800
@@ -61,32 +61,35 @@
@@ -4260,7 +4200,7 @@
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/make/windows/makefiles/defs.make 2010-02-04 01:41:53.000000000 -0800
+--- ./hotspot/make/windows/makefiles/defs.make 2010-03-18 01:41:37.000000000 -0700
+++ ./hotspot/make/windows/makefiles/defs.make 2009-11-02 22:49:17.000000000 -0800
@@ -69,6 +69,9 @@
@@ -4303,8 +4243,8 @@
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-02-04 01:41:54.000000000 -0800
-+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-01-16 12:50:20.000000000 -0800
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-03-18 01:41:38.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-03-08 21:37:50.000000000 -0800
@@ -455,10 +455,10 @@
void InterpreterMacroAssembler::tag_local(frame::Tag tag, int n) {
if (TaggedStackInterpreter) {
@@ -4335,16 +4275,16 @@
}
}
}
-@@ -1321,7 +1321,7 @@
+@@ -1336,7 +1336,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));
- movptr(reg2, (int32_t)DataLayout::counter_increment);
+ movptr(reg2, (intptr_t)DataLayout::counter_increment);
set_mdp_data_at(mdp, count_offset, reg2);
- jmp(done);
- }
-@@ -1462,7 +1462,7 @@
+ if (start_row > 0) {
+ jmp(done);
+@@ -1479,7 +1479,7 @@
test_method_data_pointer(mdp, profile_continue);
// Build the base (index * per_case_size_in_bytes()) + case_array_offset_in_bytes()
@@ -4353,7 +4293,7 @@
// index is positive and so should have correct value if this code were
// used on 64bits
imulptr(index, reg2);
---- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-02-04 01:41:54.000000000 -0800
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-03-18 01:41:38.000000000 -0700
+++ ./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_
@@ -4364,7 +4304,7 @@
#define JNIEXPORT
#define JNIIMPORT
#define JNICALL
---- ./hotspot/src/os/bsd/launcher/java_md.c 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/launcher/java_md.c 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/launcher/java_md.c 2009-12-20 19:41:24.000000000 -0800
@@ -45,8 +45,15 @@
#include "version_comp.h"
@@ -4503,7 +4443,7 @@
result = bsd_i586_ServerClassMachine();
#else
if (_launcher_debug) {
---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
@@ -179,32 +179,19 @@
struct sockaddr_un addr;
@@ -4597,7 +4537,7 @@
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
---- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
@@ -28,6 +28,14 @@
# include <sys/param.h>
@@ -4628,7 +4568,7 @@
#endif
*(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */
---- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2009-06-28 17:53:14.000000000 -0700
@@ -36,7 +36,7 @@
// HPI_FileInterface
@@ -4680,7 +4620,7 @@
}
---- ./hotspot/src/os/bsd/vm/jsig.c 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/jsig.c 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/jsig.c 2009-06-06 16:54:01.000000000 -0700
@@ -143,7 +143,8 @@
}
@@ -4692,7 +4632,7 @@
}
static int call_os_sigaction(int sig, const struct sigaction *act,
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./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). */
@@ -4743,7 +4683,7 @@
};
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-03-27 11:09:10.000000000 -0700
+++ ./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"}
@@ -4778,7 +4718,7 @@
#endif /* JVM_MD_H */
// Reconciliation History
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
@@ -28,8 +28,8 @@
@@ -4791,7 +4731,7 @@
_siginfo = NULL;
_ucontext = NULL;
_expanding_stack = 0;
---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-02-06 22:30:40.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2009-06-28 17:53:14.000000000 -0700
@@ -36,6 +36,12 @@
@@ -4850,7 +4790,7 @@
pthread_t pthread_id() const {
return _pthread_id;
}
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-01-16 14:25:14.000000000 -0800
@@ -42,17 +42,39 @@
# include <sys/utsname.h>
@@ -6173,7 +6113,7 @@
// execve failed
_exit(-1);
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./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 */
@@ -6311,7 +6251,7 @@
// Stack repair handling
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2009-06-28 17:53:14.000000000 -0700
@@ -61,7 +61,15 @@
@@ -6329,7 +6269,7 @@
}
---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2009-06-06 16:54:01.000000000 -0700
@@ -241,7 +241,7 @@
@@ -6340,7 +6280,7 @@
struct passwd* p;
int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p);
---- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,45 +0,0 @@
-/*
@@ -6388,7 +6328,7 @@
-// Use software breakpoint trap until we figure out how to do this on Bsd
-void MacroAssembler::get_psr_trap() { trap(SP_TRAP_SBPT); }
-void MacroAssembler::set_psr_trap() { trap(SP_TRAP_SBPT); }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,206 +0,0 @@
-/*
@@ -6597,7 +6537,7 @@
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) {
- return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value);
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-//
@@ -6627,7 +6567,7 @@
-//
-
-// SPARC Bsd Architecture Description File
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800
@@ -1,105 +0,0 @@
-#
@@ -6735,7 +6675,7 @@
- ta 0x03
- retl
- mov %fp, %o0
---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,36 +0,0 @@
-/*
@@ -6774,7 +6714,7 @@
-define_pd_global(uintx, HeapBaseMinAddress, 4*G);
-// Only used on 64 bit Windows platforms
-define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,102 +0,0 @@
-/*
@@ -6879,7 +6819,7 @@
-
-inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); }
-inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,648 +0,0 @@
-/*
@@ -7530,7 +7470,7 @@
- // guard page, only enable glibc guard page for non-Java threads.
- return (thr_type == java_thread ? 0 : page_size());
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,44 +0,0 @@
-/*
@@ -7577,7 +7517,7 @@
- // Used to register dynamic code cache area with the OS
- // Note: Currently only used in 64 bit Windows implementations
- static bool register_code_area(char *low, char *high) { return true; }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,40 +0,0 @@
-/*
@@ -7620,7 +7560,7 @@
-inline void Prefetch::write(void *loc, intx interval) {}
-
-#endif
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,37 +0,0 @@
-/*
@@ -7660,7 +7600,7 @@
-void ThreadLocalStorage::pd_set_thread(Thread* thread) {
- os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,28 +0,0 @@
-/*
@@ -7691,7 +7631,7 @@
- static Thread* thread() {
- return (Thread*) os::thread_local_storage_at(thread_index());
- }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,107 +0,0 @@
-/*
@@ -7801,7 +7741,7 @@
- // nothing else to try
- return false;
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,98 +0,0 @@
-/*
@@ -7902,7 +7842,7 @@
- static bool register_stack_overflow() { return false; }
- static void enable_register_stack_guard() {}
- static void disable_register_stack_guard() {}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,69 +0,0 @@
-/*
@@ -7974,7 +7914,7 @@
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-03-27 11:09:10.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
@@ -1,61 +0,0 @@
-/*
@@ -8038,7 +7978,7 @@
-
- return features;
-}
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-03-27 11:09:11.000000000 -0700
+++ ./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,
@@ -8243,7 +8183,7 @@
# 8(%esp) : return PC
pushl %ebx # 4(%esp) : old %ebx
pushl %edi # 0(%esp) : old %edi
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-03-27 11:09:11.000000000 -0700
+++ ./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.
@@ -8392,7 +8332,7 @@
cmpq %rdi,%rsi
leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8
jbe acl_CopyRight
---- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-03-27 11:09:11.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2009-06-06 16:54:01.000000000 -0700
@@ -22,7 +22,33 @@
*
@@ -8428,7 +8368,7 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
---- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-03-27 11:09:11.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2009-10-05 21:49:06.000000000 -0700
@@ -22,9 +22,10 @@
*
@@ -8456,7 +8396,7 @@
+define_pd_global(uintx, HeapBaseMinAddress, 2*G);
// Only used on 64 bit Windows platforms
define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-03-27 11:09:11.000000000 -0700
+++ ./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>
@@ -8992,7 +8932,7 @@
#endif // AMD64
st->cr();
st->cr();
---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-03-27 11:09:11.000000000 -0700
+++ ./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
@@ -9005,7 +8945,7 @@
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
#endif // !AMD64
---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-03-27 11:09:11.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2009-06-06 16:54:01.000000000 -0700
@@ -31,7 +31,7 @@
/******************************/ \
@@ -9016,7 +8956,7 @@
nonstatic_field(OSThread, _pthread_id, pthread_t) \
/* This must be the last entry, and must be present */ \
last_entry()
---- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-03-27 11:09:11.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2009-12-20 19:41:24.000000000 -0800
@@ -23,136 +23,441 @@
*
@@ -9690,7 +9630,7 @@
- (intptr_t) compare_value);
+ return atomic_cas_ptr((volatile void *)dest, compare_value, exchange_value);
}
---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-03-27 11:09:11.000000000 -0700
+++ ./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
@@ -9720,7 +9660,7 @@
- return bswap_64(x);
+ return bswap64(x);
}
---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-03-27 11:09:11.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2009-12-20 19:41:24.000000000 -0800
@@ -40,7 +40,12 @@
@@ -9735,7 +9675,7 @@
#ifdef PPC
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-02-06 22:30:41.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-03-27 11:09:11.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-01-30 13:26:37.000000000 -0800
@@ -23,6 +23,10 @@
*
@@ -9852,7 +9792,7 @@
assert(os::current_stack_pointer() >= stack_bottom, "should do");
assert(os::current_stack_pointer() < stack_top, "should do");
---- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-02-04 01:41:56.000000000 -0800
+--- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-03-18 01:41:40.000000000 -0700
+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2009-09-07 10:57:21.000000000 -0700
@@ -69,9 +69,9 @@
#endif
@@ -9866,8 +9806,8 @@
// Macros
#define uint32 unsigned int
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-02-04 01:41:57.000000000 -0800
-+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-01-22 10:54:49.000000000 -0800
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-03-18 01:41:41.000000000 -0700
++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-03-08 21:37:50.000000000 -0800
@@ -952,7 +952,7 @@
}
nmethod* nm = method->code();
@@ -9877,7 +9817,7 @@
}
}
---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-02-04 01:41:58.000000000 -0800
+--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-03-18 01:41:42.000000000 -0700
+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-01-22 10:54:50.000000000 -0800
@@ -77,7 +77,7 @@
// the incoming method. We could lose a line of trace output.
@@ -9897,7 +9837,7 @@
if (Verbose) {
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
---- ./hotspot/src/share/vm/prims/forte.cpp 2010-02-04 01:41:59.000000000 -0800
+--- ./hotspot/src/share/vm/prims/forte.cpp 2010-03-18 01:41:43.000000000 -0700
+++ ./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.
@@ -9919,8 +9859,8 @@
#endif // !_WINDOWS
} // end extern "C"
---- ./hotspot/src/share/vm/runtime/globals.hpp 2010-02-04 01:41:59.000000000 -0800
-+++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-01-29 23:41:32.000000000 -0800
+--- ./hotspot/src/share/vm/runtime/globals.hpp 2010-03-18 01:41:44.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-02-15 08:08:24.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 \
@@ -9930,7 +9870,7 @@
"(Unstable) Issues membars on thread state transitions") \
\
diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug, \
---- ./hotspot/src/share/vm/runtime/os.cpp 2010-02-04 01:41:59.000000000 -0800
+--- ./hotspot/src/share/vm/runtime/os.cpp 2010-03-18 01:41:44.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/os.cpp 2010-01-22 10:54:51.000000000 -0800
@@ -79,7 +79,11 @@
assert(false, "Failed localtime_pd");
@@ -9944,7 +9884,7 @@
// If daylight savings time is in effect,
// we are 1 hour East of our time zone
---- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-02-04 01:42:00.000000000 -0800
+--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-03-18 01:41:44.000000000 -0700
+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2009-10-31 08:51:25.000000000 -0700
@@ -144,7 +144,8 @@
@@ -9956,7 +9896,7 @@
#ifdef ZERO
#define CPU ZERO_LIBARCH
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-02-04 01:42:00.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-03-18 01:41:44.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2009-06-06 16:54:10.000000000 -0700
@@ -71,12 +71,25 @@
# include <sys/procfs.h>
@@ -10024,7 +9964,7 @@
inline int g_isnan(float f) { return isnanf(f); }
inline int g_isnan(double f) { return isnan(f); }
#else
---- ./hotspot/src/share/vm/utilities/macros.hpp 2010-02-04 01:42:00.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/macros.hpp 2010-03-18 01:41:44.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/macros.hpp 2009-09-07 10:57:23.000000000 -0700
@@ -148,6 +148,14 @@
#define NOT_WINDOWS(code) code
@@ -10041,7 +9981,7 @@
#if defined(IA32) || defined(AMD64)
#define X86
#define X86_ONLY(code) code
---- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-02-04 01:42:00.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-03-18 01:41:44.000000000 -0700
+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2009-06-06 16:54:10.000000000 -0700
@@ -827,7 +827,7 @@
@@ -10052,7 +9992,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-02-04 01:42:00.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-03-18 01:41:44.000000000 -0700
+++ ./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",
@@ -10083,7 +10023,7 @@
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
---- ./hotspot/test/Makefile 2010-02-04 01:42:00.000000000 -0800
+--- ./hotspot/test/Makefile 2010-03-18 01:41:44.000000000 -0700
+++ ./hotspot/test/Makefile 2009-06-28 17:58:24.000000000 -0700
@@ -44,6 +44,22 @@
ARCH = i586
@@ -10126,7 +10066,7 @@
ifdef TESTDIRS
JTREG_TESTDIRS = $(TESTDIRS)
endif
---- ./hotspot/test/jprt.config 2010-02-04 01:42:00.000000000 -0800
+--- ./hotspot/test/jprt.config 2010-03-18 01:41:45.000000000 -0700
+++ ./hotspot/test/jprt.config 2009-06-06 16:54:10.000000000 -0700
@@ -75,8 +75,8 @@
@@ -10195,40 +10135,40 @@
# Export PATH setting
PATH="${path4sdk}"
---- ./jaxp/.hgtags 2010-02-04 01:42:14.000000000 -0800
-+++ ./jaxp/.hgtags 2010-02-06 10:17:15.000000000 -0800
-@@ -56,3 +56,4 @@
- b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79
- 9219574db5936367114b0f31469837f27d5a375a jdk7-b80
- 204e59d488cdaa9eafa8cb7164ea955b5a9d4a51 jdk7-b81
-+c876ad22e4bf9d3c6460080db7ace478e29a3ff9 jdk7-b82
---- ./jaxp/.jcheck/conf 2010-02-04 01:42:14.000000000 -0800
+--- ./jaxp/.hgtags 2010-03-18 01:41:59.000000000 -0700
++++ ./jaxp/.hgtags 2010-03-20 11:12:05.000000000 -0700
+@@ -60,3 +60,4 @@
+ 309a0a7fc6ceb1c9fc3a85b3608e97ef8f7b0dfd jdk7-b83
+ 32c0cf01d555747918529a6ff9e06b0090c7a474 jdk7-b84
+ 6c0ccabb430dacdcd4479f8b197980d5da4eeb66 jdk7-b85
++81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
+--- ./jaxp/.jcheck/conf 2010-03-18 01:41:59.000000000 -0700
+++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jaxws/.hgtags 2010-02-04 01:42:31.000000000 -0800
-+++ ./jaxws/.hgtags 2010-02-06 10:17:20.000000000 -0800
-@@ -56,3 +56,4 @@
- c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79
- 447767dee56a0f8cb89acc8bf7be5f9be7d84e8b jdk7-b80
- f051045fe94a48fae1097f90cbd9227e6aae6b7e jdk7-b81
-+31573ae8eed15a6c170f3f0d1abd0b9109c0e086 jdk7-b82
---- ./jaxws/.jcheck/conf 2010-02-04 01:42:31.000000000 -0800
+--- ./jaxws/.hgtags 2010-03-18 01:42:17.000000000 -0700
++++ ./jaxws/.hgtags 2010-03-20 11:12:13.000000000 -0700
+@@ -60,3 +60,4 @@
+ 371e3ded591d09112a9f231e37cb072781c486ac jdk7-b83
+ 8bc02839eee4ef02cd1b50e87638874368a26535 jdk7-b84
+ 8424512588ff95362c1f1e5f11c6efd4e7f7db6e jdk7-b85
++512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86
+--- ./jaxws/.jcheck/conf 2010-03-18 01:42:17.000000000 -0700
+++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/.hgtags 2010-02-04 01:45:08.000000000 -0800
-+++ ./jdk/.hgtags 2010-02-06 10:17:32.000000000 -0800
-@@ -56,3 +56,4 @@
- 918920710d65432a2d54fdf407c1524a5571c4ad jdk7-b79
- 049cfaaa9a7374e3768a79969a799e8b59ad52fa jdk7-b80
- 10b993d417fcdb40480dad7032ac241f4b87f1af jdk7-b81
-+69ef657320ad5c35cfa12e4d8322d877e778f8b3 jdk7-b82
---- ./jdk/.jcheck/conf 2010-02-04 01:45:08.000000000 -0800
+--- ./jdk/.hgtags 2010-03-18 01:44:55.000000000 -0700
++++ ./jdk/.hgtags 2010-03-20 11:12:37.000000000 -0700
+@@ -60,3 +60,4 @@
+ 9027c6b9d7e2c9ca04a1add691b5b50d0f22b1aa jdk7-b83
+ 7cb9388bb1a16365fa5118c5efa38b1cd58be40d jdk7-b84
+ b396584a3e64988839cca21ea1f7fbdcc9248783 jdk7-b85
++eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86
+--- ./jdk/.jcheck/conf 2010-03-18 01:44:55.000000000 -0700
+++ ./jdk/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/make/com/sun/java/pack/Makefile 2010-02-04 01:45:08.000000000 -0800
+--- ./jdk/make/com/sun/java/pack/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/com/sun/java/pack/Makefile 2010-01-30 09:39:59.000000000 -0800
@@ -62,6 +62,7 @@
@@ -10261,8 +10201,8 @@
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
---- ./jdk/make/com/sun/nio/Makefile 2010-02-04 01:45:08.000000000 -0800
-+++ ./jdk/make/com/sun/nio/Makefile 2010-01-30 09:27:22.000000000 -0800
+--- ./jdk/make/com/sun/nio/Makefile 2010-03-18 01:44:56.000000000 -0700
++++ ./jdk/make/com/sun/nio/Makefile 2010-03-14 21:36:30.000000000 -0700
@@ -30,7 +30,16 @@
BUILDDIR = ../../..
include $(BUILDDIR)/common/Defs.gmk
@@ -10277,10 +10217,10 @@
+endif
+endif
+endif
- all build clean clobber::
- $(SUBDIRS-loop)
+ include $(BUILDDIR)/common/Subdirs.gmk
---- ./jdk/make/com/sun/nio/sctp/Makefile 2010-02-04 01:45:08.000000000 -0800
+ all build clean clobber::
+--- ./jdk/make/com/sun/nio/sctp/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/com/sun/nio/sctp/Makefile 2010-01-30 09:39:59.000000000 -0800
@@ -69,6 +69,9 @@
#LIBSCTP = -lsctp
@@ -10292,7 +10232,7 @@
else # windows
include $(BUILDDIR)/common/Classes.gmk
---- ./jdk/make/com/sun/security/auth/module/Makefile 2010-02-04 01:45:08.000000000 -0800
+--- ./jdk/make/com/sun/security/auth/module/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-01-30 09:39:59.000000000 -0800
@@ -68,7 +68,7 @@
include FILES_c_solaris.gmk
@@ -10303,7 +10243,7 @@
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-02-04 01:45:08.000000000 -0800
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-01-30 09:27:22.000000000 -0800
@@ -43,5 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
@@ -10315,7 +10255,7 @@
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-02-04 01:45:08.000000000 -0800
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-01-30 09:27:22.000000000 -0800
@@ -39,4 +39,7 @@
LinuxVirtualMachine.c
@@ -10326,7 +10266,7 @@
+FILES_c = \
+ BsdVirtualMachine.c
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-02-04 01:45:08.000000000 -0800
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-01-30 09:27:22.000000000 -0800
@@ -43,6 +43,11 @@
sun/tools/attach/LinuxAttachProvider.java
@@ -10340,7 +10280,7 @@
#
# Files that need to be copied
#
---- ./jdk/make/com/sun/tools/attach/Makefile 2010-02-04 01:45:08.000000000 -0800
+--- ./jdk/make/com/sun/tools/attach/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/Makefile 2010-01-30 09:39:59.000000000 -0800
@@ -37,6 +37,9 @@
ifeq ($(PLATFORM), linux)
@@ -10352,7 +10292,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-01-30 09:27:22.000000000 -0800
@@ -30,14 +30,12 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
@@ -10370,7 +10310,7 @@
local:
*;
};
---- ./jdk/make/common/Defs-bsd.gmk 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/make/common/Defs-bsd.gmk 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/make/common/Defs-bsd.gmk 2010-01-30 19:08:28.000000000 -0800
@@ -25,7 +25,7 @@
@@ -10566,7 +10506,7 @@
ifeq ($(ARCH), ia64)
INCLUDE_SA = false
else
---- ./jdk/make/common/Defs-linux.gmk 2010-02-04 01:45:08.000000000 -0800
+--- ./jdk/make/common/Defs-linux.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/Defs-linux.gmk 2010-01-30 09:27:22.000000000 -0800
@@ -314,7 +314,7 @@
override LIBTHREAD =
@@ -10577,8 +10517,8 @@
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs.gmk 2010-02-04 01:45:08.000000000 -0800
-+++ ./jdk/make/common/Defs.gmk 2010-01-30 09:39:59.000000000 -0800
+--- ./jdk/make/common/Defs.gmk 2010-03-18 01:44:56.000000000 -0700
++++ ./jdk/make/common/Defs.gmk 2010-03-08 21:38:21.000000000 -0800
@@ -181,6 +181,36 @@
endif
endif # OPENJDK
@@ -10635,7 +10575,7 @@
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./jdk/make/common/Program.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/common/Program.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/Program.gmk 2010-01-30 09:39:59.000000000 -0800
@@ -65,11 +65,27 @@
# Create a dependency on libjli (Java Launcher Infrastructure)
@@ -10697,7 +10637,7 @@
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/common/Release.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/Release.gmk 2010-01-30 09:27:22.000000000 -0800
@@ -148,14 +148,13 @@
tnameserv.1 \
@@ -10758,7 +10698,7 @@
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-01-30 09:39:59.000000000 -0800
@@ -49,8 +49,6 @@
com/sun/jmx/snmp/SnmpDataTypeEnums.class \
@@ -10847,7 +10787,7 @@
import-binary-plug-jar \
import-binary-plugs-completed
---- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -72,6 +72,24 @@
@@ -10874,7 +10814,7 @@
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./jdk/make/common/shared/Defs-bsd.gmk 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/make/common/shared/Defs-bsd.gmk 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -54,7 +54,7 @@
endef
@@ -10914,7 +10854,7 @@
# Import JDK images allow for partial builds, components not built are
# imported (or copied from) these import areas when needed.
---- ./jdk/make/common/shared/Defs-utils.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/common/shared/Defs-utils.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/shared/Defs-utils.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -67,6 +67,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
@@ -10968,7 +10908,7 @@
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/common/shared/Defs.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/shared/Defs.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -589,8 +589,8 @@
override CC_VERSION = sun
@@ -10981,7 +10921,7 @@
override CC_VERSION = gcc
endif
---- ./jdk/make/common/shared/Platform.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/common/shared/Platform.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/shared/Platform.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -82,7 +82,7 @@
SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
@@ -11128,7 +11068,7 @@
# If blanks in the username, use the first 4 words and pack them together
_USER1:=$(subst ', ,$(_USER))
_USER2:=$(subst ", ,$(_USER1))
---- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -244,6 +244,7 @@
ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
@@ -11138,8 +11078,8 @@
ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS)
ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
---- ./jdk/make/common/shared/Sanity.gmk 2010-02-04 01:45:09.000000000 -0800
-+++ ./jdk/make/common/shared/Sanity.gmk 2010-01-30 09:39:59.000000000 -0800
+--- ./jdk/make/common/shared/Sanity.gmk 2010-03-18 01:44:56.000000000 -0700
++++ ./jdk/make/common/shared/Sanity.gmk 2010-03-20 11:12:37.000000000 -0700
@@ -142,6 +142,11 @@
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
endif
@@ -11152,7 +11092,7 @@
# Get the version numbers of what we are using
_MAKE_VER :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1)
_ZIP_VER :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
-@@ -862,8 +867,10 @@
+@@ -878,8 +883,10 @@
######################################################
# Check for existence of DEVTOOLS_PATH
@@ -11163,7 +11103,7 @@
@if [ "$(DEVTOOLS_PATH)" != "" -a ! -r "$(DEVTOOLS_PATH)" ]; then \
$(ECHO) "ERROR: You do not have a valid DEVTOOLS_PATH setting. \n" \
" Please check your access to \n" \
-@@ -871,6 +878,7 @@
+@@ -887,6 +894,7 @@
" and/or check your value of ALT_DEVTOOLS_PATH. \n" \
"" >> $(ERROR_FILE) ; \
fi
@@ -11171,7 +11111,7 @@
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
---- ./jdk/make/docs/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/docs/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/docs/Makefile 2010-02-06 10:17:32.000000000 -0800
@@ -214,7 +214,7 @@
# you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR)
@@ -11182,9 +11122,9 @@
JAAS_DOCDIR = $(DOCSDIR)/jre/api/security/jaas/spec
JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \
-encoding ascii \
---- ./jdk/make/java/Makefile 2010-02-04 01:45:09.000000000 -0800
-+++ ./jdk/make/java/Makefile 2010-01-30 09:27:23.000000000 -0800
-@@ -49,7 +49,7 @@
+--- ./jdk/make/java/Makefile 2010-03-18 01:44:56.000000000 -0700
++++ ./jdk/make/java/Makefile 2010-03-08 21:38:21.000000000 -0800
+@@ -53,7 +53,7 @@
endif
endif # PLATFORM
@@ -11193,7 +11133,7 @@
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/hpi/hpi_common.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/hpi/hpi_common.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/hpi/hpi_common.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -86,5 +86,9 @@
# Things that must be linked in.
@@ -11205,7 +11145,7 @@
OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
endif
+endif
---- ./jdk/make/java/hpi/native/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/hpi/native/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/hpi/native/Makefile 2010-01-30 09:39:59.000000000 -0800
@@ -73,16 +73,25 @@
ifeq ($(MOOT_PRIORITIES),true)
@@ -11233,7 +11173,7 @@
ifeq ($(HAVE_FILIOH),true)
OTHER_CPPFLAGS += -DHAVE_FILIOH
endif
---- ./jdk/make/java/instrument/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/instrument/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/instrument/Makefile 2010-01-30 09:39:59.000000000 -0800
@@ -103,6 +103,26 @@
# equivalent of strcasecmp is stricmp on Windows
@@ -11270,8 +11210,8 @@
#
# Library to compile.
---- ./jdk/make/java/java/Makefile 2010-02-04 01:45:09.000000000 -0800
-+++ ./jdk/make/java/java/Makefile 2010-01-30 09:40:00.000000000 -0800
+--- ./jdk/make/java/java/Makefile 2010-03-18 01:44:56.000000000 -0700
++++ ./jdk/make/java/java/Makefile 2010-03-08 21:38:21.000000000 -0800
@@ -166,8 +166,10 @@
# Is the altzone extern documented in ctime(3C) available?
#
@@ -11298,8 +11238,8 @@
#
# Rules.
---- ./jdk/make/java/java/genlocales.gmk 2010-02-04 01:45:09.000000000 -0800
-+++ ./jdk/make/java/java/genlocales.gmk 2010-01-30 09:27:23.000000000 -0800
+--- ./jdk/make/java/java/genlocales.gmk 2010-03-18 01:44:56.000000000 -0700
++++ ./jdk/make/java/java/genlocales.gmk 2010-03-08 21:38:21.000000000 -0800
@@ -76,10 +76,14 @@
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
@$(RM) $@.tmp.euro $@.tmp.noneuro;
@@ -11319,7 +11259,7 @@
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
---- ./jdk/make/java/java/localegen.sh 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/java/localegen.sh 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/java/localegen.sh 2010-01-30 09:27:23.000000000 -0800
@@ -55,9 +55,9 @@
for FILE in $RESOURCE_NAMES
@@ -11333,7 +11273,7 @@
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
---- ./jdk/make/java/java_hprof_demo/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/java_hprof_demo/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/java_hprof_demo/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -84,8 +84,10 @@
ifeq ($(PLATFORM), windows)
@@ -11346,7 +11286,7 @@
#
# Tell library.gmk to copy the txt file first
---- ./jdk/make/java/jli/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/jli/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/jli/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -45,7 +45,9 @@
@@ -11440,7 +11380,7 @@
+ vpath %.c $(ZIP_SRC)
+endif
+
---- ./jdk/make/java/management/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/management/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/management/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -86,6 +86,11 @@
OTHER_INCLUDES += \
@@ -11454,7 +11394,7 @@
ifeq ($(PLATFORM),windows)
OTHER_LDLIBS += $(JVMLIB)
endif
---- ./jdk/make/java/net/FILES_c.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/net/FILES_c.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/net/FILES_c.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -47,6 +47,10 @@
FILES_c += linux_close.c
@@ -11467,7 +11407,7 @@
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/net/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/net/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -93,6 +93,12 @@
@@ -11490,8 +11430,8 @@
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
---- ./jdk/make/java/nio/Makefile 2010-02-04 01:45:09.000000000 -0800
-+++ ./jdk/make/java/nio/Makefile 2010-01-30 09:40:00.000000000 -0800
+--- ./jdk/make/java/nio/Makefile 2010-03-18 01:44:56.000000000 -0700
++++ ./jdk/make/java/nio/Makefile 2010-03-08 21:38:21.000000000 -0800
@@ -261,6 +261,69 @@
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
@@ -11584,7 +11524,7 @@
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
-@@ -317,6 +388,9 @@
+@@ -321,6 +392,9 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
endif
@@ -11594,7 +11534,7 @@
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
---- ./jdk/make/java/nio/mapfile-bsd 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/make/java/nio/mapfile-bsd 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/make/java/nio/mapfile-bsd 2010-01-30 09:27:23.000000000 -0800
@@ -36,25 +36,6 @@
Java_sun_nio_ch_DatagramDispatcher_readv0;
@@ -11653,7 +11593,7 @@
Java_sun_nio_fs_UnixNativeDispatcher_init;
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
Java_sun_nio_fs_UnixNativeDispatcher_strerror;
---- ./jdk/make/java/npt/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/npt/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/npt/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -68,6 +68,18 @@
OTHER_LCF += -export:nptInitialize -export:nptTerminate
@@ -11674,7 +11614,7 @@
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/redist/fonts/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/redist/fonts/Makefile 2010-01-30 13:42:52.000000000 -0800
@@ -43,7 +43,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
@@ -11703,7 +11643,7 @@
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/java/security/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/security/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/security/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -50,7 +50,15 @@
ifneq ($(ARCH_DATA_MODEL), 64)
@@ -11721,7 +11661,7 @@
endif # PLATFORM
---- ./jdk/make/java/zip/FILES_c.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/zip/FILES_c.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/zip/FILES_c.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -29,7 +29,10 @@
Deflater.c \
@@ -11742,7 +11682,7 @@
- zutil.c
+ zutil.c
+endif
---- ./jdk/make/java/zip/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/java/zip/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/java/zip/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -72,16 +72,28 @@
CPPFLAGS += -UDEBUG
@@ -11774,7 +11714,7 @@
OTHER_LDLIBS = $(JVMLIB)
+endif
+
---- ./jdk/make/javax/sound/FILES_c.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/javax/sound/FILES_c.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/javax/sound/FILES_c.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -34,6 +34,8 @@
@@ -11785,8 +11725,8 @@
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
---- ./jdk/make/javax/sound/Makefile 2010-02-04 01:45:09.000000000 -0800
-+++ ./jdk/make/javax/sound/Makefile 2010-01-30 09:40:00.000000000 -0800
+--- ./jdk/make/javax/sound/Makefile 2010-03-18 01:44:56.000000000 -0700
++++ ./jdk/make/javax/sound/Makefile 2010-03-08 21:38:21.000000000 -0800
@@ -108,6 +108,16 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
@@ -11804,7 +11744,7 @@
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/javax/sound/SoundDefs.gmk 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-01-30 09:27:23.000000000 -0800
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
@@ -11817,7 +11757,7 @@
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
---- ./jdk/make/jpda/back/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/jpda/back/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/jpda/back/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -50,8 +50,10 @@
-I$(GENNATIVESRCDIR)/jdwp
@@ -11830,7 +11770,7 @@
#
# This controls the ability to do logging in the library.
---- ./jdk/make/jpda/transport/socket/Makefile 2010-02-04 01:45:09.000000000 -0800
+--- ./jdk/make/jpda/transport/socket/Makefile 2010-03-18 01:44:56.000000000 -0700
+++ ./jdk/make/jpda/transport/socket/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -41,6 +41,11 @@
OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
@@ -11844,8 +11784,8 @@
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += -lnsl $(LIBSOCKET)
endif
---- ./jdk/make/sun/awt/Makefile 2010-02-04 01:45:09.000000000 -0800
-+++ ./jdk/make/sun/awt/Makefile 2010-01-30 09:40:00.000000000 -0800
+--- ./jdk/make/sun/awt/Makefile 2010-03-18 01:44:57.000000000 -0700
++++ ./jdk/make/sun/awt/Makefile 2010-02-19 08:02:41.000000000 -0800
@@ -124,6 +124,13 @@
OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
endif
@@ -11869,7 +11809,7 @@
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
-@@ -391,6 +398,19 @@
+@@ -392,6 +399,19 @@
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
endif # PLATFORM
@@ -11889,7 +11829,7 @@
FONTCONFIGS = $(_FONTCONFIGS:%=$(LIBDIR)/%.src)
BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc)
-@@ -484,6 +504,9 @@
+@@ -485,6 +505,9 @@
-I$(OPENWIN_HOME)/include/X11/extensions \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/font
endif
@@ -11899,7 +11839,7 @@
CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-@@ -505,7 +528,13 @@
+@@ -506,7 +529,13 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)
@@ -11914,7 +11854,7 @@
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-01-30 09:27:25.000000000 -0800
@@ -532,11 +532,11 @@
@@ -11933,7 +11873,7 @@
# CDE private entry point
Java_sun_awt_motif_XsessionWMcommand;
---- ./jdk/make/sun/awt/mawt.gmk 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/awt/mawt.gmk 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/awt/mawt.gmk 2010-01-30 09:27:25.000000000 -0800
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
@@ -12001,7 +11941,7 @@
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
---- ./jdk/make/sun/font/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/font/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/font/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -174,6 +174,15 @@
# Libraries to link, and other C flags.
@@ -12027,7 +11967,7 @@
endif # PLATFORM
---- ./jdk/make/sun/image/generic/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/image/generic/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/image/generic/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -69,5 +69,9 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib
@@ -12040,7 +11980,7 @@
+endif
+
---- ./jdk/make/sun/jawt/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/jawt/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/jawt/Makefile 2010-01-30 09:40:00.000000000 -0800
@@ -93,8 +93,7 @@
#
@@ -12069,7 +12009,7 @@
OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
endif # PLATFORM
---- ./jdk/make/sun/security/ec/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/security/ec/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/security/ec/Makefile 2010-01-30 09:40:01.000000000 -0800
@@ -193,7 +193,11 @@
ifeq ($(PLATFORM), windows)
@@ -12084,7 +12024,7 @@
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-01-30 09:40:01.000000000 -0800
@@ -72,6 +72,10 @@
#
@@ -12098,7 +12038,7 @@
+ifeq ($(PLATFORM), bsd)
+ OTHER_LDLIBS = $(JVMLIB)
+endif
---- ./jdk/make/sun/security/pkcs11/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/security/pkcs11/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/security/pkcs11/Makefile 2010-01-30 09:40:01.000000000 -0800
@@ -156,7 +156,7 @@
#
@@ -12109,7 +12049,7 @@
OTHER_LDLIBS = $(JVMLIB)
else
OTHER_LDLIBS = -ldl $(JVMLIB)
---- ./jdk/make/sun/security/smartcardio/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/security/smartcardio/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/security/smartcardio/Makefile 2010-01-30 09:40:01.000000000 -0800
@@ -76,6 +76,10 @@
ifeq ($(PLATFORM), windows)
@@ -12123,7 +12063,7 @@
+ endif
OTHER_CFLAGS = -D__sun_jdk
endif
---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-01-30 09:27:26.000000000 -0800
@@ -49,18 +49,6 @@
dgif_lib.c \
@@ -12163,7 +12103,7 @@
+ zcrc32.c \
+ zutil.c
+endif
---- ./jdk/make/sun/splashscreen/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/splashscreen/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/splashscreen/Makefile 2010-01-30 09:40:01.000000000 -0800
@@ -64,8 +64,24 @@
@@ -12215,7 +12155,7 @@
# Shun the less than portable MMX assembly code in pnggccrd.c,
# and use alternative implementations in C.
---- ./jdk/make/sun/xawt/Makefile 2010-02-04 01:45:10.000000000 -0800
+--- ./jdk/make/sun/xawt/Makefile 2010-03-18 01:44:57.000000000 -0700
+++ ./jdk/make/sun/xawt/Makefile 2010-01-30 09:40:01.000000000 -0800
@@ -48,12 +48,20 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
@@ -12289,7 +12229,7 @@
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
---- ./jdk/make/tools/freetypecheck/Makefile 2010-02-04 01:45:11.000000000 -0800
+--- ./jdk/make/tools/freetypecheck/Makefile 2010-03-18 01:44:59.000000000 -0700
+++ ./jdk/make/tools/freetypecheck/Makefile 2010-01-30 09:27:28.000000000 -0800
@@ -49,8 +49,15 @@
# Add runtime lib search path to ensure test will be runnable
@@ -12308,7 +12248,7 @@
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
---- ./jdk/src/share/back/commonRef.c 2010-02-04 01:45:12.000000000 -0800
+--- ./jdk/src/share/back/commonRef.c 2010-03-18 01:45:00.000000000 -0700
+++ ./jdk/src/share/back/commonRef.c 2010-01-30 09:27:31.000000000 -0800
@@ -23,6 +23,10 @@
* have any questions.
@@ -12321,7 +12261,7 @@
#include "util.h"
#include "commonRef.h"
---- ./jdk/src/share/bin/java.c 2010-02-04 01:45:12.000000000 -0800
+--- ./jdk/src/share/bin/java.c 2010-03-18 01:45:00.000000000 -0700
+++ ./jdk/src/share/bin/java.c 2010-01-30 09:27:31.000000000 -0800
@@ -66,6 +66,10 @@
static jboolean printUsage = JNI_FALSE; /* print and exit*/
@@ -12422,7 +12362,7 @@
static void
DumpState()
{
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-02-04 01:45:13.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-03-18 01:45:01.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-01-30 09:27:33.000000000 -0800
@@ -477,6 +477,10 @@
String[] dirs = new String[] {
@@ -12435,7 +12375,7 @@
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
---- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-02-04 01:45:15.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-03-18 01:45:02.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-01-30 09:27:35.000000000 -0800
@@ -78,6 +78,9 @@
*/
@@ -12447,7 +12387,7 @@
/**
---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-02-06 22:30:43.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-03-27 11:09:12.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 1969-12-31 16:00:00.000000000 -0800
@@ -1,6 +0,0 @@
-# service provider file for Bsd: with DirectAudioDeviceProvider
@@ -12456,7 +12396,7 @@
-com.sun.media.sound.SimpleInputDeviceProvider
-com.sun.media.sound.DirectAudioDeviceProvider
-com.sun.media.sound.HeadspaceMixerProvider
---- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -12652,8 +12592,8 @@
- }
-
-}
---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-02-04 01:45:18.000000000 -0800
-+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-01-30 09:27:43.000000000 -0800
+--- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-03-18 01:45:06.000000000 -0700
++++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-02-19 08:02:41.000000000 -0800
@@ -172,7 +172,12 @@
} else {
String osName = System.getProperty("os.name");
@@ -12668,7 +12608,7 @@
(System.getenv("DISPLAY") == null));
}
} else if (nm.equals("true")) {
---- ./jdk/src/share/classes/java/util/TimeZone.java 2010-02-04 01:45:22.000000000 -0800
+--- ./jdk/src/share/classes/java/util/TimeZone.java 2010-03-18 01:45:11.000000000 -0700
+++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-01-30 09:27:51.000000000 -0800
@@ -776,15 +776,13 @@
}
@@ -12687,7 +12627,7 @@
}
return zi;
}
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-02-04 01:45:28.000000000 -0800
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-03-18 01:45:18.000000000 -0700
+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-01-30 09:28:04.000000000 -0800
@@ -1122,7 +1122,7 @@
*/
@@ -12707,7 +12647,7 @@
errors++;
}
}
---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-02-04 01:45:28.000000000 -0800
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-03-18 01:45:18.000000000 -0700
+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-01-30 09:28:04.000000000 -0800
@@ -39,6 +39,7 @@
WINDOWS,
@@ -12732,31 +12672,31 @@
// determine another OS here
}
---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-02-04 01:45:29.000000000 -0800
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-01-30 09:28:05.000000000 -0800
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-03-18 01:45:18.000000000 -0700
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-02-21 16:55:52.000000000 -0800
@@ -46,6 +46,8 @@
- public static final boolean isLinux;
+ public static boolean isLinux;
-+ public static final boolean isBSD;
++ public static boolean isBSD;
+
- public static final boolean isSolaris8;
+ public static boolean isSolaris8;
- public static final boolean isSolaris9;
-@@ -69,6 +71,11 @@
+ public static boolean isSolaris9;
+@@ -70,6 +72,11 @@
- isLinux = osName.startsWith("Linux");
+ isLinux = osName.startsWith("Linux");
-+ isBSD = (osName.startsWith("FreeBSD") ||
-+ osName.startsWith("NetBSD") ||
-+ osName.startsWith("OpenBSD") ||
-+ osName.startsWith("Darwin"));
++ isBSD = (osName.startsWith("FreeBSD") ||
++ osName.startsWith("NetBSD") ||
++ osName.startsWith("OpenBSD") ||
++ osName.startsWith("Darwin"));
+
- String t2kStr = AccessController.doPrivileged(
- new GetPropertyAction("sun.java2d.font.scaler"));
- if (t2kStr != null) {
---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-02-04 01:45:29.000000000 -0800
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-01-30 09:28:05.000000000 -0800
+ String t2kStr = System.getProperty("sun.java2d.font.scaler");
+ if (t2kStr != null) {
+ useT2K = "t2k".equals(t2kStr);
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-03-18 01:45:18.000000000 -0700
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-03-20 11:12:38.000000000 -0700
@@ -409,7 +409,7 @@
* registerFonts method as on-screen these JRE fonts
* always go through the T2K rasteriser.
@@ -12766,7 +12706,7 @@
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,190 +0,0 @@
-/*
@@ -12959,7 +12899,7 @@
- return charOff - outOff;
- }
-}
---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13155,7 +13095,7 @@
- return 2;
- }
-}
---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,374 +0,0 @@
-/*
@@ -13532,7 +13472,7 @@
- }
- }
-}
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-02-04 01:45:32.000000000 -0800
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-03-18 01:45:22.000000000 -0700
+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-01-30 09:28:12.000000000 -0800
@@ -1534,7 +1534,9 @@
pFlags |= NOSHEET;
@@ -13545,14 +13485,14 @@
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-02-04 01:45:35.000000000 -0800
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-03-18 01:45:27.000000000 -0700
+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-01-30 09:28:18.000000000 -0800
@@ -30,3 +30,4 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[bsd]sun.tools.attach.BsdAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-02-04 01:45:35.000000000 -0800
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-03-18 01:45:27.000000000 -0700
+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-01-30 09:28:18.000000000 -0800
@@ -50,6 +50,7 @@
String zname = "";
@@ -13624,7 +13564,7 @@
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-02-04 01:45:35.000000000 -0800
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-03-18 01:45:27.000000000 -0700
+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-01-30 09:28:18.000000000 -0800
@@ -44,6 +44,8 @@
{0} : could not create directory
@@ -13635,7 +13575,47 @@
out.added.manifest=\
added manifest
out.update.manifest=\
---- ./jdk/src/share/hpi/include/hpi_impl.h 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-03-18 01:45:29.000000000 -0700
++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-02-21 17:29:35.000000000 -0800
+@@ -38,6 +38,7 @@
+ # gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
+ # gnumake JDK=<java_home> OSNAME=linux [OPT=true]
+ # gnumake JDK=<java_home> OSNAME=win32 [OPT=true]
++# gnumake JDK=<java_home> OSNAME=bsd [OPT=true]
+ #
+ ########################################################################
+
+@@ -120,6 +121,29 @@
+ LINK_SHARED=link -dll -out:$@
+ endif
+
++# BSD GNU C Compiler
++ifeq ($(OSNAME), bsd)
++ # GNU Compiler options needed to build it
++ COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer
++ # Options that help find errors
++ COMMON_FLAGS+= -W -Wall -Wno-unused -Wno-parentheses
++ ifeq ($(OPT), true)
++ CFLAGS=-O2 $(COMMON_FLAGS)
++ else
++ CFLAGS=-g $(COMMON_FLAGS)
++ endif
++ # Object files needed to create library
++ OBJECTS=$(SOURCES:%.c=%.o)
++ # Library name and options needed to build it
++ # XXX: Needs to be fixed for MacOS X
++ LIBRARY=lib$(LIBNAME).so
++ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
++ # Libraries we are dependent on
++ LIBRARIES=-lc
++ # Building a shared library
++ LINK_SHARED=$(LINK.c) -shared -o $@
++endif
++
+ # Common -I options
+ CFLAGS += -I.
+ CFLAGS += -I../agent_util
+--- ./jdk/src/share/hpi/include/hpi_impl.h 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-01-30 09:28:24.000000000 -0800
@@ -138,7 +138,11 @@
int sysBind(int fd, struct sockaddr *him, int len);
@@ -13922,7 +13902,7 @@
+# Example,
+# ocsp.responderCertSerialNumber=2A:FF:00
+
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-01-30 09:28:24.000000000 -0800
@@ -32,6 +32,10 @@
#include <unistd.h>
@@ -13949,7 +13929,7 @@
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-01-30 09:28:24.000000000 -0800
@@ -22,6 +22,9 @@
* CA 95054 USA or visit www.sun.com if you need additional information or
@@ -13991,7 +13971,7 @@
true));
}
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-01-30 09:28:24.000000000 -0800
@@ -33,7 +33,11 @@
@@ -14005,7 +13985,7 @@
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-01-30 09:28:24.000000000 -0800
@@ -99,5 +99,17 @@
return com_sun_media_sound_Platform_LIB_ALSA;
@@ -14025,7 +14005,7 @@
+#endif
return 0;
}
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-01-30 09:28:24.000000000 -0800
@@ -31,6 +31,7 @@
#define X_WINDOWS 1
@@ -14054,7 +14034,7 @@
+
+
#endif // __SOUNDDEFS_INCLUDED__
---- ./jdk/src/share/native/common/check_code.c 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/common/check_code.c 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/common/check_code.c 2010-01-30 09:28:25.000000000 -0800
@@ -1065,7 +1065,7 @@
* Make sure that branches don't go into the middle of nowhere.
@@ -14117,7 +14097,7 @@
/* There can't be more than 64K labels because of the limit
* on per-method byte code length.
*/
---- ./jdk/src/share/native/java/io/io_util.h 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/java/io/io_util.h 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/java/io/io_util.h 2010-01-30 09:28:25.000000000 -0800
@@ -29,7 +29,15 @@
extern jfieldID IO_fd_fdID;
@@ -14136,7 +14116,7 @@
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-01-30 09:28:25.000000000 -0800
@@ -24,6 +24,15 @@
* have any questions.
@@ -14178,7 +14158,7 @@
/*
* ANSI/POSIX
---- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-01-30 09:28:25.000000000 -0800
@@ -61,7 +61,7 @@
#define log1p jlog1p
@@ -14189,7 +14169,7 @@
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_acosh __j__ieee754_acosh
---- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-01-30 09:28:25.000000000 -0800
@@ -67,6 +67,10 @@
return jlong_zero;
@@ -14213,7 +14193,7 @@
}
JNIEXPORT void JNICALL
---- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-02-04 01:45:38.000000000 -0800
+--- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-01-30 09:28:25.000000000 -0800
@@ -46,6 +46,10 @@
#include "zip_util.h"
@@ -14226,7 +14206,7 @@
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
#include <sys/mman.h>
---- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-01-30 09:28:25.000000000 -0800
@@ -50,7 +50,9 @@
#include <stdio.h>
@@ -14238,7 +14218,7 @@
#include <limits.h>
/* keep these after the other headers */
---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-01-30 09:28:26.000000000 -0800
@@ -24,7 +24,11 @@
*/
@@ -14252,7 +14232,7 @@
#include "sun_awt_image_BufImgSurfaceData.h"
---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-03-18 01:45:30.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-01-30 09:28:26.000000000 -0800
@@ -23,7 +23,11 @@
* have any questions.
@@ -14266,7 +14246,7 @@
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-01-30 09:28:26.000000000 -0800
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -14307,7 +14287,7 @@
#endif /* _NO_LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-01-30 09:28:26.000000000 -0800
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14348,7 +14328,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-01-30 09:28:26.000000000 -0800
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14389,7 +14369,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-01-30 09:28:26.000000000 -0800
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14430,7 +14410,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-01-30 09:28:26.000000000 -0800
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14471,7 +14451,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-01-30 09:28:26.000000000 -0800
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14512,7 +14492,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-01-30 09:28:26.000000000 -0800
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -14553,7 +14533,7 @@
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-01-30 09:28:26.000000000 -0800
@@ -95,7 +95,7 @@
dst = dp[0];
@@ -14774,7 +14754,7 @@
}
#else /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-01-30 09:28:27.000000000 -0800
@@ -168,7 +168,7 @@
}
@@ -15056,7 +15036,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-01-30 09:28:27.000000000 -0800
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -15209,7 +15189,7 @@
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-01-30 09:28:27.000000000 -0800
@@ -30,7 +30,7 @@
typedef union {
@@ -15220,7 +15200,7 @@
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-01-30 09:28:27.000000000 -0800
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
@@ -15320,7 +15300,7 @@
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-01-30 09:28:27.000000000 -0800
@@ -120,7 +120,7 @@
} \
@@ -16554,7 +16534,7 @@
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-01-30 09:28:27.000000000 -0800
@@ -27,6 +27,16 @@
#ifndef MLIB_IMAGE_H
@@ -16573,7 +16553,7 @@
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-01-30 09:28:27.000000000 -0800
@@ -26,9 +26,15 @@
@@ -16605,7 +16585,7 @@
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-01-30 09:28:27.000000000 -0800
@@ -59,7 +59,10 @@
@@ -16619,7 +16599,7 @@
#include <stdint.h> /* for uintptr_t */
#include <malloc.h> /* for ptrdiff_t */
#else
---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-01-30 09:28:27.000000000 -0800
@@ -23,7 +23,11 @@
* have any questions.
@@ -16633,7 +16613,7 @@
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-02-04 01:45:39.000000000 -0800
+--- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-03-18 01:45:31.000000000 -0700
+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-01-30 09:28:27.000000000 -0800
@@ -26,7 +26,11 @@
#include "jlong.h"
@@ -16647,7 +16627,7 @@
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
---- ./jdk/src/share/native/sun/font/sunFont.c 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/font/sunFont.c 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/font/sunFont.c 2010-01-30 09:28:28.000000000 -0800
@@ -24,7 +24,9 @@
*/
@@ -16659,7 +16639,7 @@
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-01-30 09:28:28.000000000 -0800
@@ -28,7 +28,11 @@
#include "jni_util.h"
@@ -16673,7 +16653,7 @@
#include "string.h"
/**
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-01-30 09:28:28.000000000 -0800
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
@@ -16685,7 +16665,7 @@
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-01-30 09:28:28.000000000 -0800
@@ -25,7 +25,11 @@
@@ -16699,7 +16679,7 @@
#include "sun_java2d_pipe_BufferedOpCodes.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-01-30 09:28:28.000000000 -0800
@@ -25,7 +25,11 @@
@@ -16713,7 +16693,7 @@
#include <math.h>
#include <jlong.h>
---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-01-30 09:28:29.000000000 -0800
@@ -28,6 +28,7 @@
#include <winsock2.h>
@@ -16723,7 +16703,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-01-30 09:28:29.000000000 -0800
@@ -78,6 +78,14 @@
typedef enum { B_FALSE, B_TRUE } boolean_t;
@@ -16740,7 +16720,7 @@
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-01-30 09:28:29.000000000 -0800
@@ -60,9 +60,9 @@
#include <sys/types.h>
@@ -16754,7 +16734,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-01-30 09:28:29.000000000 -0800
@@ -59,9 +59,9 @@
#include <sys/types.h>
@@ -16768,7 +16748,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-02-04 01:45:40.000000000 -0800
+--- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-03-18 01:45:32.000000000 -0700
+++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-01-30 09:28:29.000000000 -0800
@@ -64,9 +64,9 @@
#include <sys/types.h>
@@ -16782,7 +16762,7 @@
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/transport/socket/socketTransport.c 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/share/transport/socket/socketTransport.c 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/share/transport/socket/socketTransport.c 2010-01-30 09:28:30.000000000 -0800
@@ -65,6 +65,9 @@
#define HEADER_SIZE 11
@@ -16871,7 +16851,7 @@
return res;
} else if (res == 0) {
break; /* eof, return nbytes which is less than len */
---- ./jdk/src/solaris/back/exec_md.c 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/solaris/back/exec_md.c 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/solaris/back/exec_md.c 2010-01-30 09:28:30.000000000 -0800
@@ -30,7 +30,7 @@
#include "sys.h"
@@ -16882,7 +16862,7 @@
/* Linux */
#define FORK() fork()
#else
---- ./jdk/src/solaris/back/linker_md.c 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/solaris/back/linker_md.c 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/solaris/back/linker_md.c 2010-01-30 09:28:30.000000000 -0800
@@ -48,6 +48,12 @@
#include "threads_md.h"
@@ -16909,7 +16889,7 @@
}
}
---- ./jdk/src/solaris/back/util_md.h 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/solaris/back/util_md.h 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/solaris/back/util_md.h 2010-01-30 09:28:30.000000000 -0800
@@ -31,6 +31,11 @@
@@ -16932,7 +16912,7 @@
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo.c 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/solaris/bin/ergo.c 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/solaris/bin/ergo.c 2010-01-30 09:28:30.000000000 -0800
@@ -71,14 +71,39 @@
/* Compute physical memory by asking the OS */
@@ -16976,7 +16956,7 @@
return result;
+#endif /* _ALLBSD_SOURCE */
}
---- ./jdk/src/solaris/bin/ergo.h 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/solaris/bin/ergo.h 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/solaris/bin/ergo.h 2010-01-30 09:28:30.000000000 -0800
@@ -33,6 +33,10 @@
#include <sys/stat.h>
@@ -16989,7 +16969,7 @@
#include "java.h"
---- ./jdk/src/solaris/bin/ergo_i586.c 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/solaris/bin/ergo_i586.c 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/solaris/bin/ergo_i586.c 2010-01-30 09:28:30.000000000 -0800
@@ -106,7 +106,7 @@
@@ -17071,7 +17051,7 @@
JLI_TraceLauncher("physical processors: %lu\n", result);
return result;
}
---- ./jdk/src/solaris/bin/java_md.c 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/solaris/bin/java_md.c 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/solaris/bin/java_md.c 2010-01-30 09:28:30.000000000 -0800
@@ -24,6 +24,7 @@
*/
@@ -17181,7 +17161,7 @@
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./jdk/src/solaris/bin/java_md.h 2010-02-04 01:45:41.000000000 -0800
+--- ./jdk/src/solaris/bin/java_md.h 2010-03-18 01:45:33.000000000 -0700
+++ ./jdk/src/solaris/bin/java_md.h 2010-01-30 09:28:30.000000000 -0800
@@ -47,10 +47,14 @@
#include <sys/time.h>
@@ -17199,7 +17179,7 @@
/*
* Function prototypes.
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-03-18 01:45:34.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-01-30 09:28:31.000000000 -0800
@@ -213,7 +213,7 @@
if (fontID != null) {
@@ -17228,7 +17208,7 @@
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,189 +0,0 @@
-#
@@ -17420,7 +17400,7 @@
-filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf
-filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf
-filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,154 +0,0 @@
-#
@@ -17577,7 +17557,7 @@
-filename.UnDotum_Bold=/usr/share/fonts/truetype/UnDotumBold.ttf
-filename.UnBatang=/usr/share/fonts/truetype/UnBatang.ttf
-filename.UnBatang_Bold=/usr/share/fonts/truetype/UnBatangBold.ttf
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,151 +0,0 @@
-#
@@ -17731,7 +17711,7 @@
-filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf
-filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf
-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,99 +0,0 @@
-/*
@@ -17833,7 +17813,7 @@
- return new SimpleAsynchronousDatagramChannelImpl(family, toPort(group));
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,288 +0,0 @@
-/*
@@ -18124,7 +18104,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-01-30 09:28:32.000000000 -0800
@@ -36,10 +36,6 @@
class BsdFileStore
@@ -18204,7 +18184,7 @@
return super.supportsFileAttributeView(name);
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-01-30 09:28:32.000000000 -0800
@@ -31,49 +31,23 @@
import java.util.*;
@@ -18338,7 +18318,7 @@
@Override
FileStore getFileStore(UnixPath path) throws IOException {
return new BsdFileStore(path);
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-01-30 09:28:32.000000000 -0800
@@ -1,5 +1,5 @@
/*
@@ -18450,7 +18430,7 @@
+ initIDs();
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,350 +0,0 @@
-/*
@@ -18803,7 +18783,7 @@
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,466 +0,0 @@
-/*
@@ -19272,7 +19252,7 @@
- init();
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-03-18 01:45:34.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-01-30 09:28:32.000000000 -0800
@@ -68,6 +68,8 @@
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
@@ -19283,7 +19263,7 @@
throw new AssertionError("Platform not recognized");
}
}
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-03-18 01:45:34.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-01-30 09:28:32.000000000 -0800
@@ -119,7 +119,11 @@
}
@@ -19318,7 +19298,7 @@
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-01-30 09:28:32.000000000 -0800
@@ -38,9 +38,6 @@
*/
@@ -19423,7 +19403,7 @@
- isBsdThreads = isBsdThreads();
}
}
---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-03-18 01:45:34.000000000 -0700
+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-01-30 09:28:32.000000000 -0800
@@ -33,7 +33,7 @@
#include <sys/stat.h>
@@ -19490,7 +19470,7 @@
}
}
---- ./jdk/src/solaris/hpi/include/interrupt.h 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/include/interrupt.h 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-01-30 09:28:33.000000000 -0800
@@ -75,7 +75,7 @@
* N_INTERRUPTS - The number of interrupt channels. These
@@ -19512,7 +19492,7 @@
#ifdef SA_SIGINFO
/* Thread implementation dependent interrupt dispatcher. */
void intrDispatchMD(int sig, siginfo_t *info, void *uc);
---- ./jdk/src/solaris/hpi/include/largefile.h 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/include/largefile.h 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/include/largefile.h 2010-01-30 09:28:33.000000000 -0800
@@ -34,6 +34,10 @@
#include "largefile_linux.h"
@@ -19525,7 +19505,7 @@
/*
* Prototypes for wrappers that we define. These wrapper functions
* are low-level I/O routines that will use 64 bit versions if
---- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-01-30 09:28:33.000000000 -0800
@@ -26,11 +26,29 @@
#ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_
@@ -19561,7 +19541,7 @@
+#define pwrite64 pwrite
+
#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */
---- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-01-30 09:28:33.000000000 -0800
@@ -36,6 +36,8 @@
#define N_TRACED_REGS 12
@@ -19609,7 +19589,7 @@
#ifdef __linux__
extern thread_key_t intrJmpbufkey;
---- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -58,7 +58,7 @@
{
@@ -19620,7 +19600,7 @@
err = pthread_cond_destroy((cond_t *) &condvar->cond);
#else
err = cond_destroy((cond_t *) condvar);
---- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -147,7 +147,7 @@
mid->monitor_owner = self;
@@ -19631,7 +19611,7 @@
if (mid->monitor_owner == self) {
mid->entry_count++;
return SYS_OK;
---- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-03-27 11:09:14.000000000 -0700
+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-01-30 09:28:33.000000000 -0800
@@ -1,5 +1,5 @@
/*
@@ -20325,7 +20305,7 @@
+ pthread_attr_destroy(&attr);
+#endif
}
---- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -54,6 +54,10 @@
#error That can NOT possibly be right.
@@ -20408,7 +20388,7 @@
info.isMP = (cpus < 0) ? 1 : (cpus > 1);
info.name = "native threads";
---- ./jdk/src/solaris/hpi/src/linker_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/src/linker_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -44,11 +44,19 @@
#include "threads_md.h"
@@ -20476,7 +20456,7 @@
#endif
/*
* This is a bit of bulletproofing to catch the commonly occurring
---- ./jdk/src/solaris/hpi/src/memory_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/src/memory_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -50,12 +50,24 @@
#include <stdlib.h>
@@ -20567,7 +20547,7 @@
ret = committedAddr;
#else
ret = requestedAddr;
---- ./jdk/src/solaris/hpi/src/system_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/hpi/src/system_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/hpi/src/system_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -41,6 +41,7 @@
#include <dlfcn.h>
@@ -20622,7 +20602,7 @@
fd = open64_w(path, oflag, mode);
if (delete != 0) {
unlink(path);
---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -28,7 +28,10 @@
#include <string.h>
@@ -20653,7 +20633,7 @@
/* Open conversion descriptors */
iconvToPlatform = iconv_open(codeset, "UTF-8");
---- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-01-30 09:28:33.000000000 -0800
@@ -41,7 +41,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
@@ -20679,7 +20659,7 @@
/* Signals */
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-02-04 01:45:42.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -32,10 +32,16 @@
@@ -20843,7 +20823,7 @@
}
JNIEXPORT jlong JNICALL
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-03-27 11:09:14.000000000 -0700
+++ ./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 @@
-/*
@@ -21026,7 +21006,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-03-27 11:09:14.000000000 -0700
+++ ./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 @@
-/*
@@ -21111,7 +21091,7 @@
-
-
-#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-03-27 11:09:14.000000000 -0700
+++ ./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 @@
-/*
@@ -21436,7 +21416,7 @@
-}
-
-#endif /* USE_PLATFORM_MIDI_IN */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-03-27 11:09:14.000000000 -0700
+++ ./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 @@
-/*
@@ -21618,7 +21598,7 @@
-
-
-#endif /* USE_PLATFORM_MIDI_OUT */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-03-27 11:09:14.000000000 -0700
+++ ./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 @@
-/*
@@ -22101,7 +22081,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-03-27 11:09:14.000000000 -0700
+++ ./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 @@
-/*
@@ -22189,7 +22169,7 @@
-INT64 getMidiTimestamp(MidiDeviceHandle* handle);
-
-#endif // PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-03-27 11:09:14.000000000 -0700
+++ ./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 @@
-/*
@@ -23130,7 +23110,7 @@
-
-
-#endif // USE_DAUDIO
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-03-27 11:09:14.000000000 -0700
+++ ./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 @@
-/*
@@ -23424,7 +23404,7 @@
-
-
-/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-03-27 11:09:15.000000000 -0700
+++ ./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 @@
-/*
@@ -23499,7 +23479,7 @@
- int isSigned, int isBigEndian, int enc);
-
-#endif // PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-03-27 11:09:15.000000000 -0700
+++ ./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 @@
-/*
@@ -24225,9 +24205,9 @@
-
-
-#endif // USE_PORTS
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-01-30 09:28:33.000000000 -0800
-@@ -41,6 +41,11 @@
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-03-18 01:45:35.000000000 -0700
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-03-20 17:09:44.000000000 -0700
+@@ -41,6 +41,12 @@
#include "java_io_FileSystem.h"
#include "java_io_UnixFileSystem.h"
@@ -24235,11 +24215,12 @@
+#define dirent64 dirent
+#define readdir64_r readdir_r
+#define stat64 stat
++#define statvfs64 statvfs
+#endif
/* -- Field IDs -- */
-@@ -140,7 +145,6 @@
+@@ -140,7 +146,6 @@
return rv;
}
@@ -24247,7 +24228,7 @@
JNIEXPORT jboolean JNICALL
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -33,7 +33,9 @@
#include <sys/stat.h>
@@ -24259,7 +24240,7 @@
/* Note: The comments in this file use the terminology
---- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -36,7 +36,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
@@ -24270,7 +24251,7 @@
/* Remove trailing slashes, since the kernel won't */
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -28,6 +28,11 @@
#include "jni.h"
@@ -24312,7 +24293,7 @@
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -40,7 +40,11 @@
#include <stdlib.h>
@@ -24416,7 +24397,7 @@
if (envp == NULL || (char **) envp == environ) {
execvp(file, (char **) argv);
return;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-01-30 09:28:33.000000000 -0800
@@ -23,7 +23,7 @@
* have any questions.
@@ -24560,9 +24541,9 @@
return &sprops;
}
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-01-30 09:28:33.000000000 -0800
-@@ -36,17 +36,293 @@
+--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-03-18 01:45:35.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-02-21 16:57:14.000000000 -0800
+@@ -36,12 +36,288 @@
#include <stdlib.h>
#include <ctype.h>
@@ -24851,13 +24832,7 @@
/* the initial size of our hostent buffers */
#define HENT_BUF_SIZE 1024
#define BIG_HENT_BUF_SIZE 10240 /* a jumbo-sized one */
-
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) && !defined(_ALLBSD_SOURCE)
- /* gethostname() is in libc.so but I can't find a header file for it */
- extern int gethostname(char *buf, int buf_len);
- #endif
-@@ -86,13 +362,13 @@
+@@ -81,13 +357,13 @@
char buf2[HENT_BUF_SIZE];
int h_error=0;
@@ -24873,7 +24848,7 @@
gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
&res2, buf2, sizeof(buf2), &hp, &h_error);
#else
-@@ -180,7 +456,7 @@
+@@ -175,7 +451,7 @@
#endif
/* Try once, with our static buffer. */
@@ -24882,7 +24857,7 @@
gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
#else
hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
-@@ -193,7 +469,7 @@
+@@ -188,7 +464,7 @@
*/
if (hp == NULL && errno == ERANGE) {
if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
@@ -24891,7 +24866,7 @@
gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
&hp, &h_error);
#else
-@@ -276,7 +552,7 @@
+@@ -271,7 +547,7 @@
addr |= ((caddr[2] <<8) & 0xff00);
addr |= (caddr[3] & 0xff);
addr = htonl(addr);
@@ -24900,7 +24875,7 @@
gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
buf, sizeof(buf), &hp, &h_error);
#else
-@@ -290,7 +566,7 @@
+@@ -285,7 +561,7 @@
*/
if (hp == NULL && errno == ERANGE) {
if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
@@ -24909,7 +24884,7 @@
gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
&hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error);
#else
-@@ -312,6 +588,8 @@
+@@ -307,6 +583,8 @@
return ret;
}
@@ -24918,8 +24893,8 @@
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-01-30 09:28:33.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-03-18 01:45:35.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-02-21 16:57:25.000000000 -0800
@@ -33,6 +33,9 @@
#include <strings.h>
#include <stdlib.h>
@@ -24930,16 +24905,7 @@
#include "jvm.h"
#include "jni_util.h"
-@@ -49,7 +52,7 @@
- #define NI_MAXHOST 1025
- #endif
-
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) && !defined(_ALLBSD_SOURCE)
- /* gethostname() is in libc.so but I can't find a header file for it */
- extern int gethostname(char *buf, int buf_len);
- #endif
-@@ -72,10 +75,18 @@
+@@ -68,10 +71,18 @@
/* Something went wrong, maybe networking is not setup? */
strcpy(hostname, "localhost");
} else {
@@ -24960,7 +24926,7 @@
#else
/* Solaris doesn't want to give us a fully qualified domain name.
* We do a reverse lookup to try and get one. This works
-@@ -111,7 +122,7 @@
+@@ -107,7 +118,7 @@
}
}
#endif /* AF_INET6 */
@@ -24969,8 +24935,8 @@
}
return (*env)->NewStringUTF(env, hostname);
}
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-01-30 09:28:33.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-03-18 01:45:35.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-02-19 08:02:42.000000000 -0800
@@ -23,13 +23,13 @@
* have any questions.
*/
@@ -25009,7 +24975,7 @@
#ifdef __linux__
#define ifr_index ifr_ifindex
-@@ -583,6 +598,7 @@
+@@ -587,6 +602,7 @@
}
@@ -25017,7 +24983,7 @@
/*
* Enumerates and returns all IPv4 interfaces
*/
-@@ -693,6 +709,176 @@
+@@ -697,6 +713,176 @@
return ifs;
}
@@ -25194,7 +25160,7 @@
#if defined(__solaris__) && defined(AF_INET6)
/*
-@@ -1036,7 +1222,13 @@
+@@ -1040,7 +1226,13 @@
JNU_ThrowOutOfMemoryError(env, "heap allocation failed");
return ifs;
}
@@ -25208,7 +25174,7 @@
currif->addr = NULL;
currif->childs = NULL;
currif->virtual = isVirtual;
-@@ -1347,6 +1539,31 @@
+@@ -1351,6 +1543,31 @@
* All bytes to 0 means no hardware address.
*/
return -1;
@@ -25240,7 +25206,7 @@
#else
struct arpreq arpreq;
struct sockaddr_in* sin;
-@@ -1512,7 +1729,7 @@
+@@ -1516,7 +1733,7 @@
"Socket creation failed");
} else {
@@ -25249,8 +25215,8 @@
memset((char *) &if2, 0, sizeof(if2));
strcpy(if2.ifr_name, name_utf);
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-01-30 09:28:33.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-03-18 01:45:35.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-02-21 16:57:45.000000000 -0800
@@ -23,12 +23,12 @@
* have any questions.
*/
@@ -25323,16 +25289,7 @@
#else
JVM_Connect(fd, 0, 0);
#endif
-@@ -1838,7 +1852,7 @@
- if (opt == java_net_SocketOptions_SO_BINDADDR) {
- /* find out local IP address */
- SOCKADDR him;
-- int len = 0;
-+ socklen_t len;
- int port;
- jobject iaObj;
-
-@@ -2219,7 +2233,7 @@
+@@ -2247,7 +2261,7 @@
{
struct in_addr in;
struct in_addr *inP = &in;
@@ -25341,7 +25298,7 @@
#ifdef __linux__
struct ip_mreqn mreqn;
-@@ -2364,18 +2378,30 @@
+@@ -2392,18 +2406,30 @@
mname6.ipv6mr_interface = idx;
}
@@ -25375,7 +25332,7 @@
}
}
}
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-01-30 09:28:33.000000000 -0800
@@ -467,9 +467,11 @@
if (connect_rv == JVM_IO_INTR) {
@@ -25398,7 +25355,7 @@
int port;
jobject iaObj;
jclass iaCntrClass;
---- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-03-27 11:09:15.000000000 -0700
+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-01-30 09:28:33.000000000 -0800
@@ -57,7 +57,7 @@
/*
@@ -25435,8 +25392,8 @@
}
int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
---- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-01-30 09:28:33.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-03-18 01:45:35.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-02-19 08:02:42.000000000 -0800
@@ -34,6 +34,15 @@
#include <stdlib.h>
#include <dlfcn.h>
@@ -25468,15 +25425,15 @@
jint IPv6_supported()
{
#ifndef AF_INET6
-@@ -355,6 +372,7 @@
- close(fd);
+@@ -354,6 +371,7 @@
return JNI_TRUE;
+ #endif /* AF_INET6 */
}
+#endif /* DONT_ENABLE_IPV6 */
void
NET_AllocSockaddr(struct sockaddr **him, int *len) {
-@@ -688,6 +706,10 @@
+@@ -687,6 +705,10 @@
him6->sin6_family = AF_INET6;
*len = sizeof(struct sockaddr_in6) ;
@@ -25487,7 +25444,7 @@
/*
* On Linux if we are connecting to a link-local address
* we need to specify the interface in the scope_id (2.4 kernel only)
-@@ -1094,7 +1116,6 @@
+@@ -1093,7 +1115,6 @@
*len = socklen;
}
#endif
@@ -25495,7 +25452,7 @@
if (rv < 0) {
return rv;
}
-@@ -1141,6 +1162,24 @@
+@@ -1140,6 +1161,24 @@
#define IPTOS_PREC_MASK 0xe0
#endif
@@ -25520,7 +25477,7 @@
/*
* IPPROTO/IP_TOS :-
* 1. IPv6 on Solaris: no-op and will be set in flowinfo
-@@ -1173,6 +1212,10 @@
+@@ -1172,6 +1211,10 @@
*iptos &= (IPTOS_TOS_MASK | IPTOS_PREC_MASK);
}
@@ -25531,7 +25488,7 @@
/*
* SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On Solaris need to
* ensure that value is <= max_buf as otherwise we get
-@@ -1181,7 +1224,8 @@
+@@ -1180,7 +1223,8 @@
#ifdef __solaris__
if (level == SOL_SOCKET) {
if (opt == SO_SNDBUF || opt == SO_RCVBUF) {
@@ -25541,7 +25498,7 @@
int *bufsize, maxbuf;
if (!init_max_buf) {
-@@ -1220,6 +1264,84 @@
+@@ -1219,6 +1263,84 @@
}
#endif
@@ -25626,7 +25583,7 @@
return setsockopt(fd, level, opt, arg, len);
}
-@@ -1270,7 +1392,8 @@
+@@ -1269,7 +1391,8 @@
* corresponding IPv4 port is in use.
*/
if (ipv6_available()) {
@@ -25636,8 +25593,8 @@
len = sizeof(arg);
if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg,
---- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-01-30 09:28:33.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-03-18 01:45:35.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-02-19 08:02:42.000000000 -0800
@@ -37,7 +37,7 @@
#endif
@@ -25647,7 +25604,7 @@
extern int NET_Timeout(int s, long timeout);
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-01-30 09:28:34.000000000 -0800
@@ -38,7 +38,11 @@
jlong address, jlong len)
@@ -25673,7 +25630,7 @@
unsigned long lAddress = address;
jlong offset = lAddress % pageSize;
---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-01-30 09:28:34.000000000 -0800
@@ -47,8 +47,11 @@
return (jint) result;
@@ -25712,7 +25669,7 @@
if (rc < 0) {
close(fd);
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-01-30 09:28:34.000000000 -0800
@@ -31,7 +31,7 @@
#include <errno.h>
@@ -25850,7 +25807,7 @@
sprintf(buf, (const char *)"GMT%c%02d:%02d",
sign, (int)(offset/3600), (int)((offset%3600)/60));
return strdup(buf);
---- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-01-30 09:28:34.000000000 -0800
@@ -25,6 +25,7 @@
@@ -25874,7 +25831,7 @@
if (handle == NULL) {
return JNI_FALSE;
}
---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-01-30 09:28:34.000000000 -0800
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -25888,7 +25845,7 @@
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-01-30 09:28:34.000000000 -0800
@@ -33,7 +33,9 @@
#include <math.h>
@@ -25900,7 +25857,7 @@
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-01-30 09:28:34.000000000 -0800
@@ -31,7 +31,11 @@
#include <Xm/XmP.h>
@@ -25914,7 +25871,7 @@
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-01-30 09:28:34.000000000 -0800
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
@@ -25925,7 +25882,7 @@
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-01-30 09:28:34.000000000 -0800
@@ -40,6 +40,7 @@
#include <jni.h>
@@ -26054,7 +26011,7 @@
if (pLibRandR == NULL) {
J2dRlsTraceLn(J2D_TRACE_ERROR,
"X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-01-30 09:28:34.000000000 -0800
@@ -69,7 +69,7 @@
XIMPreeditDrawCallbackStruct *);
@@ -26295,7 +26252,7 @@
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-01-30 09:28:34.000000000 -0800
@@ -143,7 +143,11 @@
(*env)->DeleteLocalRef(env, propname);
@@ -26309,7 +26266,7 @@
JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
"(Ljava/lang/String;)V",
---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-01-30 09:28:34.000000000 -0800
@@ -63,8 +63,9 @@
extern JavaVM *jvm;
@@ -26331,7 +26288,7 @@
statusWindowEventHandler(xev);
#endif
xembed_eventHandler(&xev);
---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-01-30 09:28:34.000000000 -0800
@@ -32,6 +32,7 @@
#include <dlfcn.h>
@@ -26355,7 +26312,7 @@
}
if (handle == NULL) {
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-01-30 09:28:34.000000000 -0800
@@ -45,7 +45,7 @@
#include "wsutils.h"
@@ -26366,7 +26323,7 @@
#include <sys/socket.h>
#endif
---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-01-30 09:28:34.000000000 -0800
@@ -187,15 +187,20 @@
#ifdef __solaris__
@@ -26390,7 +26347,7 @@
typedef struct _XmImRefRec {
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-01-30 09:28:34.000000000 -0800
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -26489,7 +26446,7 @@
awt_wmgr = OPENLOOK_WM;
}
else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-01-30 09:28:34.000000000 -0800
@@ -45,7 +45,10 @@
KDE2_WM,
@@ -26503,7 +26460,7 @@
};
extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-01-30 09:28:34.000000000 -0800
@@ -58,7 +58,7 @@
*/
@@ -26520,7 +26477,7 @@
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-01-30 09:28:34.000000000 -0800
@@ -23,7 +23,7 @@
* have any questions.
@@ -26679,7 +26636,7 @@
if (libfontconfig == NULL) {
return NULL;
}
---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-01-30 09:28:34.000000000 -0800
@@ -30,8 +30,10 @@
#include <string.h>
@@ -26724,7 +26681,7 @@
if (setjmp(j) == 0)
{
---- ./jdk/src/solaris/native/sun/awt/list.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/list.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/list.c 2010-01-30 09:28:34.000000000 -0800
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -26738,7 +26695,7 @@
#include "list.h"
---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-01-30 09:28:35.000000000 -0800
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
@@ -26750,7 +26707,7 @@
#include "robot_common.h"
/*
---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-01-30 09:28:35.000000000 -0800
@@ -32,7 +32,11 @@
* into X11FontScaler_md.c, which is compiled into another library.
@@ -26764,7 +26721,7 @@
#include <ctype.h>
#include <sys/utsname.h>
---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-01-30 09:28:35.000000000 -0800
@@ -39,7 +39,11 @@
#include "GraphicsPrimitiveMgr.h"
@@ -26778,7 +26735,7 @@
JNIEXPORT void JNICALL AWTDrawGlyphList
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-01-30 09:28:35.000000000 -0800
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -26795,7 +26752,7 @@
typedef unsigned char jubyte;
typedef unsigned short jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-01-30 09:28:35.000000000 -0800
@@ -63,6 +63,10 @@
* MLIB_EDGE_SRC_PADDED
@@ -26902,7 +26859,7 @@
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-03-18 01:45:35.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-01-30 09:28:35.000000000 -0800
@@ -794,7 +794,7 @@
static int initialized;
@@ -26913,7 +26870,7 @@
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-01-30 09:28:35.000000000 -0800
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
@@ -26935,7 +26892,7 @@
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-01-30 09:28:35.000000000 -0800
@@ -32,6 +32,7 @@
#include "gdefs.h"
@@ -26954,7 +26911,7 @@
}
dgaAvailable = JNI_FALSE;
if (lib != NULL) {
---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-01-30 09:28:35.000000000 -0800
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
@@ -26978,7 +26935,7 @@
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-01-30 09:28:35.000000000 -0800
@@ -26,6 +26,10 @@
#include <sys/types.h>
@@ -26991,7 +26948,7 @@
#include "jni.h"
#include "jni_util.h"
#include "sun_management_FileSystemImpl.h"
---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-01-30 09:28:35.000000000 -0800
@@ -33,7 +33,7 @@
#include <strings.h>
@@ -27002,8 +26959,8 @@
#include <string.h>
#endif
---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-01-30 09:28:35.000000000 -0800
+--- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-03-18 01:45:36.000000000 -0700
++++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-03-08 21:38:22.000000000 -0800
@@ -26,11 +26,12 @@
#include "jni.h"
#include "jni_util.h"
@@ -27018,7 +26975,7 @@
#include <string.h>
#else
#include <strings.h>
-@@ -109,8 +110,9 @@
+@@ -110,8 +111,9 @@
/**
* Let's try to load le GConf-2 library
*/
@@ -27030,7 +26987,7 @@
gconf_ver = 2;
}
if (gconf_ver > 0) {
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-01-30 09:28:35.000000000 -0800
@@ -35,7 +35,7 @@
#include <string.h>
@@ -27081,7 +27038,7 @@
}
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-02-06 09:58:52.000000000 -0800
@@ -73,7 +73,7 @@
m.msg_accrightslen = 0;
@@ -27101,8 +27058,8 @@
m.msg_control = NULL;
m.msg_controllen = 0;
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-01-30 09:28:35.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-03-18 01:45:36.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-03-25 23:55:51.000000000 -0700
@@ -26,15 +26,21 @@
#include "jni.h"
#include "jni_util.h"
@@ -27125,18 +27082,32 @@
static jfieldID chan_fd; /* jobject 'fd' in sun.io.FileChannelImpl */
#ifdef __solaris__
-@@ -59,6 +65,10 @@
+@@ -59,6 +65,24 @@
typedef ssize_t sendfile64_func(int out_fd, int in_fd, off64_t *offset, size_t count);
sendfile64_func* my_sendfile64_func = NULL;
+#elif defined(_ALLBSD_SOURCE)
++#include <sys/types.h>
+#include <sys/socket.h>
++#include <sys/uio.h>
+#include <errno.h>
+#include <stdlib.h>
++
++#ifdef __APPLE__
++typedef int sendfile_func(int fd, int s, off_t offset, off_t *len,
++ struct sf_hdtr *hdtr, int flags);
++#elif defined(__FreeBSD__)
++typedef int sendfile_func(int fd, int s, off_t offset, size_t nbytes,
++ struct sf_hdtr *hdtr, off_t *sbytes, int flags);
++#endif
++
++#if defined(__APPLE__) || defined(__FreeBSD__)
++sendfile_func* my_sendfile_func = NULL;
++#endif
#endif
JNIEXPORT jlong JNICALL
-@@ -68,7 +78,8 @@
+@@ -68,7 +92,8 @@
chan_fd = (*env)->GetFieldID(env, clazz, "fd", "Ljava/io/FileDescriptor;");
#ifdef __solaris__
@@ -27146,64 +27117,65 @@
my_sendfile_func = (sendfile_func*) dlsym(RTLD_DEFAULT, "sendfilev64");
}
#endif
-@@ -243,4 +254,56 @@
+@@ -77,6 +102,10 @@
+ my_sendfile64_func = (sendfile64_func*) dlsym(RTLD_DEFAULT, "sendfile64");
+ #endif
+
++#if defined(__APPLE__) || defined(__FreeBSD__)
++ my_sendfile_func = (sendfile_func*) dlsym(RTLD_DEFAULT, "sendfile");
++#endif
++
+ return pageSize;
+ }
+
+@@ -243,4 +272,46 @@
return result;
}
#endif
+
+#ifdef _ALLBSD_SOURCE
-+ /*
-+ * XXXBSD: make sure that we're returning what java class may understand
-+ *
-+ * XXXBSD: I'd prefer to have it implemented with sendfile(), but since
-+ * FreeBSD's sendfile() is only supposed to be used in file->socket
-+ * schema we need to provide some kind of fall-back operation, if
-+ * sendfile() failed with ENOTSOCK error only.
-+ */
-+ void *buf;
-+ off_t offset = (off_t)position;
-+ int r, w = 0;
++#if defined(__APPLE__) || defined(__FreeBSD__)
++ if (my_sendfile_func == NULL)
++ return IOS_UNSUPPORTED;
+
-+ buf = malloc(4096);
-+ if (buf == NULL) {
-+ JNU_ThrowOutOfMemoryError(env, "heap allocation failed");
-+ return IOS_THROWN;
-+ }
-+
-+ while ((r = pread(srcFD, buf, 4096, offset)) > 0) {
-+ w = write(dstFD, buf, r);
-+ if (w == -1)
-+ break;
-+ offset += w;
-+ }
-+ free(buf);
++ off_t numBytes;
++ int result;
+
-+ /*
-+ * Similar to solaris if we've transferred any data return
-+ * the number of bytes and ignore any error
-+ */
-+ if (offset - (off_t)position > 0)
-+ return (offset - (off_t)position);
++ numBytes = count;
+
-+ /*
-+ * Deal with NBIO EAGAIN & EINTR the same as solaris.
-+ */
-+ if (r == -1 || w == -1) {
-+ switch (errno) {
-+ case EAGAIN:
-+ return IOS_UNAVAILABLE;
-+ case EINTR:
-+ return IOS_INTERRUPTED;
-+ default:
-+ JNU_ThrowIOExceptionWithLastError(env, "Transfer failed");
-+ return IOS_THROWN;
-+ }
++#ifdef __APPLE__
++ result = (*my_sendfile_func)(srcFD, dstFD, position,
++ &numBytes, NULL, 0);
++#elif defined(__FreeBSD__)
++ result = (*my_sendfile_func)(srcFD, dstFD, position,
++ count, NULL, &numBytes, 0);
++#else
++ Add an #elif for your BSD flavor
++#endif
++
++ if (numBytes > 0)
++ return numBytes;
++
++ if (result == -1) {
++ if (errno == EAGAIN)
++ return IOS_UNAVAILABLE;
++ if (errno == EOPNOTSUPP || errno == ENOTSOCK || errno == ENOTCONN)
++ return IOS_UNSUPPORTED_CASE;
++ if ((errno == EINVAL) && ((ssize_t)count >= 0))
++ return IOS_UNSUPPORTED_CASE;
++ if (errno == EINTR)
++ return IOS_INTERRUPTED;
++ JNU_ThrowIOExceptionWithLastError(env, "Transfer failed");
++ return IOS_THROWN;
+ }
+
-+ return (0);
++ return result;
++#else
++ return IOS_UNSUPPORTED;
++#endif
+#endif
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-01-30 09:28:35.000000000 -0800
@@ -33,9 +33,13 @@
#include <sys/socket.h>
@@ -27243,7 +27215,7 @@
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-01-30 09:28:35.000000000 -0800
@@ -30,6 +30,10 @@
#include "nio_util.h"
@@ -27256,8 +27228,8 @@
static jfieldID key_st_dev; /* id for FileKey.st_dev */
static jfieldID key_st_ino; /* id for FileKey.st_ino */
---- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-01-30 09:28:35.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-03-18 01:45:36.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-02-19 08:02:42.000000000 -0800
@@ -116,6 +116,47 @@
#endif /* __linux__ */
@@ -27306,7 +27278,7 @@
#define COPY_INET6_ADDRESS(env, source, target) \
(*env)->GetByteArrayRegion(env, source, 0, 16, target)
-@@ -250,8 +291,30 @@
+@@ -255,8 +296,30 @@
SOCKADDR sa;
socklen_t sa_len = SOCKADDR_LEN;
if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
@@ -27337,7 +27309,7 @@
}
return NET_GetPortFromSockaddr((struct sockaddr *)&sa);
}
-@@ -263,8 +326,30 @@
+@@ -268,8 +331,30 @@
socklen_t sa_len = SOCKADDR_LEN;
int port;
if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
@@ -27368,7 +27340,7 @@
}
return NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
}
-@@ -277,7 +362,8 @@
+@@ -282,7 +367,8 @@
struct linger linger;
u_char carg;
void *arg;
@@ -27378,7 +27350,7 @@
/* Option value is an int except for a few specific cases */
-@@ -327,7 +413,8 @@
+@@ -332,7 +418,8 @@
struct linger linger;
u_char carg;
void *parg;
@@ -27388,7 +27360,7 @@
/* Option value is an int except for a few specific cases */
-@@ -480,7 +567,7 @@
+@@ -495,7 +582,7 @@
Java_sun_nio_ch_Net_setInterface4(JNIEnv* env, jobject this, jobject fdo, jint interf)
{
struct in_addr in;
@@ -27397,7 +27369,7 @@
int n;
in.s_addr = htonl(interf);
-@@ -496,7 +583,7 @@
+@@ -511,7 +598,7 @@
Java_sun_nio_ch_Net_getInterface4(JNIEnv* env, jobject this, jobject fdo)
{
struct in_addr in;
@@ -27406,7 +27378,7 @@
int n;
n = getsockopt(fdval(env, fdo), IPPROTO_IP, IP_MULTICAST_IF, (void*)&in, &arglen);
-@@ -511,7 +598,7 @@
+@@ -526,7 +613,7 @@
Java_sun_nio_ch_Net_setInterface6(JNIEnv* env, jobject this, jobject fdo, jint index)
{
int value = (jint)index;
@@ -27415,7 +27387,7 @@
int n;
n = setsockopt(fdval(env, fdo), IPPROTO_IPV6, IPV6_MULTICAST_IF,
-@@ -525,7 +612,7 @@
+@@ -540,7 +627,7 @@
Java_sun_nio_ch_Net_getInterface6(JNIEnv* env, jobject this, jobject fdo)
{
int index;
@@ -27424,7 +27396,7 @@
int n;
n = getsockopt(fdval(env, fdo), IPPROTO_IPV6, IPV6_MULTICAST_IF, (void*)&index, &arglen);
-@@ -554,9 +641,11 @@
+@@ -569,9 +656,11 @@
switch (errorValue) {
case EINPROGRESS: /* Non-blocking connect */
return 0;
@@ -27436,7 +27408,7 @@
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-01-30 09:28:35.000000000 -0800
@@ -67,7 +67,7 @@
@@ -27486,7 +27458,7 @@
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-01-30 09:28:35.000000000 -0800
@@ -337,11 +337,11 @@
break;
@@ -27502,8 +27474,8 @@
}
addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-02-04 01:45:43.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-01-30 09:40:01.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-03-18 01:45:36.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-02-19 08:02:42.000000000 -0800
@@ -58,6 +58,7 @@
*/
jboolean loadSocketExtensionFuncs
@@ -27520,7 +27492,7 @@
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-03-27 11:09:15.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-01-30 09:28:35.000000000 -0800
@@ -1,5 +1,5 @@
/*
@@ -27809,7 +27781,7 @@
+ free(iter);
+ }
}
---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-03-27 11:09:15.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800
@@ -1,195 +0,0 @@
-/*
@@ -28007,7 +27979,7 @@
-
-
-}
---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-01-30 09:28:35.000000000 -0800
@@ -30,7 +30,9 @@
@@ -28019,7 +27991,7 @@
#ifdef __solaris__
#include <strings.h>
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-01-30 09:28:35.000000000 -0800
@@ -49,6 +49,11 @@
#include <mntent.h>
@@ -28079,7 +28051,7 @@
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-01-30 09:28:35.000000000 -0800
@@ -63,7 +63,12 @@
DEFX(O_EXCL);
@@ -28107,7 +28079,7 @@
DEF(ERANGE);
// flags used with openat/unlinkat/etc.
---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-01-30 09:28:35.000000000 -0800
@@ -26,7 +26,9 @@
#include <stdio.h>
@@ -28119,7 +28091,7 @@
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-01-30 09:28:35.000000000 -0800
@@ -28,12 +28,19 @@
#include <string.h>
@@ -28163,7 +28135,7 @@
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-01-30 09:28:35.000000000 -0800
@@ -64,7 +64,9 @@
#include <assert.h>
@@ -28175,7 +28147,7 @@
#include <jni.h>
---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-01-30 09:28:35.000000000 -0800
@@ -29,7 +29,9 @@
#include <assert.h>
@@ -28187,7 +28159,7 @@
#include <winscard.h>
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-03-27 11:09:15.000000000 -0700
+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-01-30 09:28:36.000000000 -0800
@@ -35,10 +35,10 @@
#include <dirent.h>
@@ -28493,7 +28465,7 @@
+ JNU_ReleaseStringPlatformChars(env, path, _path);
+ }
+}
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-01-30 09:28:36.000000000 -0800
@@ -228,10 +228,10 @@
{java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
@@ -28519,7 +28491,7 @@
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-01-30 09:28:36.000000000 -0800
@@ -24,6 +24,7 @@
*/
@@ -28567,7 +28539,7 @@
}
dlerror(); /* Clear errors */
gnome_url_show = dlsym(gnome_handle, "gnome_url_show");
---- ./jdk/src/solaris/npt/npt_md.h 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/npt/npt_md.h 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/npt/npt_md.h 2010-01-30 09:28:36.000000000 -0800
@@ -32,9 +32,10 @@
#include <string.h>
@@ -28591,7 +28563,7 @@
if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
_sym = dlsym(_handle, "nptInitialize"); \
if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
---- ./jdk/src/solaris/transport/socket/socket_md.c 2010-02-04 01:45:43.000000000 -0800
+--- ./jdk/src/solaris/transport/socket/socket_md.c 2010-03-18 01:45:36.000000000 -0700
+++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-01-30 09:28:36.000000000 -0800
@@ -36,7 +36,7 @@
#ifdef __solaris__
@@ -28611,9 +28583,9 @@
int
dbgsysTlsAlloc() {
pthread_key_t key;
---- ./jdk/test/Makefile 2010-02-04 01:45:45.000000000 -0800
-+++ ./jdk/test/Makefile 2010-01-30 09:28:39.000000000 -0800
-@@ -78,6 +78,16 @@
+--- ./jdk/test/Makefile 2010-03-18 01:45:38.000000000 -0700
++++ ./jdk/test/Makefile 2010-03-20 11:12:38.000000000 -0700
+@@ -72,6 +72,16 @@
OS_ARCH := $(shell $(UNAME) -m)
OS_VERSION := $(shell $(UNAME) -r)
endif
@@ -28630,7 +28602,7 @@
ifndef OS_NAME
ifneq ($(PROCESSOR_IDENTIFIER), )
OS_NAME = windows
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-03-18 01:45:38.000000000 -0700
+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-01-30 09:28:42.000000000 -0800
@@ -56,7 +56,7 @@
@@ -28641,7 +28613,7 @@
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-03-18 01:45:38.000000000 -0700
+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-01-30 09:28:42.000000000 -0800
@@ -63,7 +63,7 @@
OS=`uname -s`
@@ -28652,7 +28624,7 @@
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-03-18 01:45:38.000000000 -0700
+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-01-30 09:28:42.000000000 -0800
@@ -121,10 +121,14 @@
esac
@@ -28670,7 +28642,7 @@
Windows*)
libloc=${jreloc}/bin
sep=';'
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-03-18 01:45:39.000000000 -0700
+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-01-30 09:28:42.000000000 -0800
@@ -289,7 +289,7 @@
psCmd=ps
@@ -28681,7 +28653,7 @@
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-03-18 01:45:39.000000000 -0700
+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-01-30 09:28:42.000000000 -0800
@@ -112,7 +112,7 @@
fi
@@ -28692,7 +28664,7 @@
pass "This test always passes on $OS"
;;
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-03-18 01:45:39.000000000 -0700
+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-01-30 09:40:01.000000000 -0800
@@ -45,10 +45,7 @@
@@ -28706,7 +28678,7 @@
PS=":"
;;
Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-03-18 01:45:39.000000000 -0700
+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-01-30 09:28:43.000000000 -0800
@@ -83,6 +83,10 @@
total_swap=`free -b | grep -i swap | awk '{print $2}'`
@@ -28719,7 +28691,7 @@
* )
runOne GetTotalSwapSpaceSize "sanity-only"
;;
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-03-18 01:45:39.000000000 -0700
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-01-30 09:28:43.000000000 -0800
@@ -48,7 +48,7 @@
@@ -28730,7 +28702,7 @@
runOne GetMaxFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-02-04 01:45:46.000000000 -0800
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-03-18 01:45:39.000000000 -0700
+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-01-30 09:28:43.000000000 -0800
@@ -48,7 +48,7 @@
@@ -28741,7 +28713,7 @@
runOne GetOpenFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-02-04 01:45:47.000000000 -0800
+--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-03-18 01:45:39.000000000 -0700
+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-01-30 09:40:01.000000000 -0800
@@ -36,11 +36,7 @@
@@ -28756,7 +28728,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-02-04 01:45:47.000000000 -0800
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-03-18 01:45:40.000000000 -0700
+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-30 09:28:46.000000000 -0800
@@ -25,10 +25,11 @@
fi
@@ -28774,7 +28746,7 @@
# Windows
if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh 2010-02-04 01:45:48.000000000 -0800
+--- ./jdk/test/java/io/File/GetXSpace.sh 2010-03-18 01:45:41.000000000 -0700
+++ ./jdk/test/java/io/File/GetXSpace.sh 2010-01-30 09:28:48.000000000 -0800
@@ -26,7 +26,7 @@
# set platform-dependent variable
@@ -28785,7 +28757,7 @@
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-02-04 01:45:49.000000000 -0800
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-03-18 01:45:42.000000000 -0700
+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-01-30 09:40:01.000000000 -0800
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
@@ -28796,7 +28768,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-02-04 01:45:49.000000000 -0800
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-03-18 01:45:42.000000000 -0700
+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-01-30 09:40:01.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -28807,7 +28779,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-02-04 01:45:49.000000000 -0800
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-03-18 01:45:42.000000000 -0700
+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-01-30 09:40:01.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -28818,7 +28790,7 @@
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-02-04 01:45:49.000000000 -0800
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-03-18 01:45:43.000000000 -0700
+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-01-30 13:44:36.000000000 -0800
@@ -49,10 +49,7 @@
# set platform-specific variables
@@ -28832,7 +28804,7 @@
FS="/"
;;
Windows* | CYGWIN* )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-02-04 01:45:50.000000000 -0800
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-03-18 01:45:43.000000000 -0700
+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-01-30 12:39:25.000000000 -0800
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -28843,7 +28815,7 @@
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-02-04 01:45:50.000000000 -0800
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-03-18 01:45:43.000000000 -0700
+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-01-30 09:40:02.000000000 -0800
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -28854,7 +28826,7 @@
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-02-04 01:45:50.000000000 -0800
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-03-18 01:45:43.000000000 -0700
+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-01-30 09:28:51.000000000 -0800
@@ -49,7 +49,7 @@
@@ -28865,7 +28837,7 @@
PATHSEP=":"
;;
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-02-04 01:45:50.000000000 -0800
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-03-18 01:45:43.000000000 -0700
+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-01-30 09:40:02.000000000 -0800
@@ -35,11 +35,7 @@
@@ -28880,7 +28852,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-02-04 01:45:50.000000000 -0800
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-03-18 01:45:43.000000000 -0700
+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-01-30 09:28:52.000000000 -0800
@@ -61,10 +61,7 @@
while true; do
@@ -28894,7 +28866,7 @@
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-02-04 01:45:51.000000000 -0800
+--- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-03-18 01:45:44.000000000 -0700
+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-01-30 09:28:53.000000000 -0800
@@ -26,7 +26,7 @@
@@ -28905,7 +28877,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-02-04 01:45:51.000000000 -0800
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-03-18 01:45:44.000000000 -0700
+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-01-30 09:28:53.000000000 -0800
@@ -27,11 +27,7 @@
# set platform-dependent variables
@@ -28920,7 +28892,7 @@
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-02-04 01:45:51.000000000 -0800
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-03-18 01:45:44.000000000 -0700
+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-01-30 09:28:53.000000000 -0800
@@ -28,7 +28,7 @@
@@ -28931,7 +28903,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh 2010-02-04 01:45:51.000000000 -0800
+--- ./jdk/test/java/net/URL/B5086147.sh 2010-03-18 01:45:44.000000000 -0700
+++ ./jdk/test/java/net/URL/B5086147.sh 2010-01-30 09:28:53.000000000 -0800
@@ -26,7 +26,7 @@
@@ -28942,7 +28914,7 @@
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh 2010-02-04 01:45:51.000000000 -0800
+--- ./jdk/test/java/net/URL/runconstructor.sh 2010-03-18 01:45:44.000000000 -0700
+++ ./jdk/test/java/net/URL/runconstructor.sh 2010-01-30 09:28:53.000000000 -0800
@@ -27,7 +27,7 @@
#
@@ -28953,7 +28925,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-02-04 01:45:51.000000000 -0800
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-03-18 01:45:44.000000000 -0700
+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-01-30 09:28:53.000000000 -0800
@@ -34,11 +34,7 @@
@@ -28968,7 +28940,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-02-04 01:45:51.000000000 -0800
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-03-18 01:45:44.000000000 -0700
+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-01-30 09:28:54.000000000 -0800
@@ -27,11 +27,7 @@
@@ -28983,7 +28955,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-02-04 01:45:51.000000000 -0800
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-03-18 01:45:44.000000000 -0700
+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-01-30 09:28:54.000000000 -0800
@@ -33,11 +33,7 @@
@@ -28998,7 +28970,7 @@
PS=":"
FS="/"
;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-02-04 01:45:52.000000000 -0800
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-03-18 01:45:45.000000000 -0700
+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-01-30 09:28:55.000000000 -0800
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
@@ -29049,8 +29021,8 @@
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /tmp/openjdk_portdir/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-02-04 01:45:52.000000000 -0800
+Files /tmp/openjdk_srcdir.WNIZhUSX/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-03-18 01:45:45.000000000 -0700
+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-01-30 09:28:55.000000000 -0800
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -29120,7 +29092,69 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-02-04 01:45:52.000000000 -0800
+--- ./jdk/test/java/nio/charset/Charset/default.sh 2010-03-18 01:45:45.000000000 -0700
++++ ./jdk/test/java/nio/charset/Charset/default.sh 2010-02-21 17:36:42.000000000 -0800
+@@ -41,10 +41,14 @@
+ fi
+
+ s="`uname -s`"
+-if [ "$s" != Linux -a "$s" != SunOS ]; then
+- echo "$s: locale command not supported on this system, skipping..."
+- exit 0
+-fi
++case "$s" in
++ Linux|SunOS|*BSD|Darwin)
++ ;;
++ *)
++ echo "$s: locale command not supported on this system, skipping..."
++ exit 0
++ ;;
++esac
+
+ JAVA=$TESTJAVA/bin/java
+
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-03-18 01:45:45.000000000 -0700
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-02-21 17:37:41.000000000 -0800
+@@ -34,7 +34,7 @@
+
+ OS=`uname -s`
+ case "$OS" in
+- SunOS | Linux ) ;;
++ SunOS | Linux | *BSD | Darwin) ;;
+ # Skip locale test for Windows
+ Windows* )
+ echo "Passed"; exit 0 ;;
+--- ./jdk/test/java/nio/charset/spi/basic.sh 2010-03-18 01:45:45.000000000 -0700
++++ ./jdk/test/java/nio/charset/spi/basic.sh 2010-02-21 17:39:12.000000000 -0800
+@@ -70,10 +70,14 @@
+ L="$1"
+ shift
+ s=`uname -s`
+- if [ $s != Linux -a $s != SunOS ]; then
+- echo "$L: Locales not supported on this system, skipping..."
+- exit 0
+- fi
++ case "$s" in
++ Linux|SunOS|*BSD|Darwin)
++ ;;
++ *)
++ echo "$L: Locales not supported on this system, skipping..."
++ exit 0
++ ;;
++ esac
+ if [ "x`locale -a | grep $L`" != "x$L" ]; then
+ echo "$L: Locale not supported, skipping..."
+ exit 0
+@@ -85,7 +89,7 @@
+ cd $TMP
+
+ case `uname` in
+- SunOS | Linux ) CPS=':' ;;
++ SunOS | Linux | *BSD | Darwin) CPS=':' ;;
+ Windows* ) CPS=';' ;;
+ *) echo "Unknown platform: `uname`"; exit 1 ;;
+ esac
+--- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-03-18 01:45:45.000000000 -0700
+++ ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-01-30 13:47:40.000000000 -0800
@@ -147,7 +147,8 @@
@@ -29132,7 +29166,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
posixAttributes = Attributes.readPosixFileAttributes(source, NOFOLLOW_LINKS);
basicAttributes = posixAttributes;
}
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-02-04 01:45:53.000000000 -0800
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-03-18 01:45:46.000000000 -0700
+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-01-30 09:28:57.000000000 -0800
@@ -84,14 +84,12 @@
@@ -29153,7 +29187,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
export PATH_SEP
mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-02-04 01:45:53.000000000 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-03-18 01:45:46.000000000 -0700
+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-01-30 09:28:58.000000000 -0800
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -29168,7 +29202,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-02-04 01:45:53.000000000 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-03-18 01:45:47.000000000 -0700
+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-01-30 09:28:58.000000000 -0800
@@ -34,11 +34,7 @@
# set platform-dependent variables
@@ -29183,7 +29217,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-02-04 01:45:53.000000000 -0800
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-03-18 01:45:47.000000000 -0700
+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-01-30 09:28:58.000000000 -0800
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -29198,7 +29232,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-02-04 01:45:53.000000000 -0800
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-03-18 01:45:47.000000000 -0700
+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-01-30 09:28:58.000000000 -0800
@@ -46,11 +46,7 @@
# set platform-dependent variables
@@ -29213,7 +29247,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-02-04 01:45:54.000000000 -0800
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-03-18 01:45:47.000000000 -0700
+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-01-30 09:40:02.000000000 -0800
@@ -30,7 +30,7 @@
# set platform-dependent variables
@@ -29224,7 +29258,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-02-04 01:45:54.000000000 -0800
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-03-18 01:45:47.000000000 -0700
+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-01-30 09:40:02.000000000 -0800
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -29235,7 +29269,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-02-04 01:45:54.000000000 -0800
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-03-18 01:45:48.000000000 -0700
+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-01-30 09:40:02.000000000 -0800
@@ -31,7 +31,7 @@
# set platform-dependent variables
@@ -29246,7 +29280,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-02-04 01:45:54.000000000 -0800
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-03-18 01:45:48.000000000 -0700
+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-01-30 09:40:02.000000000 -0800
@@ -75,7 +75,7 @@
SunOS)
@@ -29257,7 +29291,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
DEL=":"
HAS_S=YES
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-02-04 01:45:54.000000000 -0800
+--- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-03-18 01:45:48.000000000 -0700
+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-01-30 09:40:02.000000000 -0800
@@ -42,9 +42,7 @@
@@ -29270,7 +29304,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-02-04 01:45:55.000000000 -0800
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-03-18 01:45:48.000000000 -0700
+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-01-30 09:29:03.000000000 -0800
@@ -51,7 +51,7 @@
# set platform-dependent variables
@@ -29281,7 +29315,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/script/CommonSetup.sh 2010-02-04 01:45:56.000000000 -0800
+--- ./jdk/test/javax/script/CommonSetup.sh 2010-03-18 01:45:49.000000000 -0700
+++ ./jdk/test/javax/script/CommonSetup.sh 2010-01-30 09:40:02.000000000 -0800
@@ -36,11 +36,7 @@
@@ -29296,7 +29330,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-02-04 01:45:56.000000000 -0800
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-03-18 01:45:49.000000000 -0700
+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-01-30 09:29:05.000000000 -0800
@@ -33,12 +33,7 @@
# set platform-dependent variables
@@ -29312,7 +29346,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/jprt.config 2010-02-04 01:45:57.000000000 -0800
+--- ./jdk/test/jprt.config 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/jprt.config 2010-01-30 09:29:08.000000000 -0800
@@ -71,8 +71,8 @@
@@ -29381,7 +29415,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
# Export PATH setting
PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-02-04 01:45:57.000000000 -0800
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-01-30 09:29:08.000000000 -0800
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -29392,7 +29426,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-01-30 09:29:08.000000000 -0800
@@ -45,37 +45,50 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
@@ -29470,7 +29504,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
#
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-01-30 09:40:02.000000000 -0800
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -29481,7 +29515,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-01-30 09:29:08.000000000 -0800
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -29500,7 +29534,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-01-30 09:29:08.000000000 -0800
@@ -70,10 +70,12 @@
# security the password file.
@@ -29519,7 +29553,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
# Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-01-30 09:29:08.000000000 -0800
@@ -69,10 +69,12 @@
# security the password file.
@@ -29538,8 +29572,8 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/java/nio/channels/spi/Select
# Create management and SSL configuration files
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /tmp/openjdk_portdir/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-02-04 01:45:58.000000000 -0800
+Files /tmp/openjdk_srcdir.WNIZhUSX/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-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-01-30 09:40:02.000000000 -0800
@@ -36,11 +36,7 @@
@@ -29554,7 +29588,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-01-30 09:29:09.000000000 -0800
@@ -28,7 +28,7 @@
@@ -29565,7 +29599,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-01-30 09:29:09.000000000 -0800
@@ -28,7 +28,7 @@
@@ -29576,7 +29610,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-01-30 09:29:09.000000000 -0800
@@ -28,7 +28,7 @@
@@ -29587,7 +29621,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-01-30 09:29:09.000000000 -0800
@@ -31,11 +31,7 @@
@@ -29602,7 +29636,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-02-04 01:45:58.000000000 -0800
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-03-18 01:45:51.000000000 -0700
+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-01-30 09:29:10.000000000 -0800
@@ -31,11 +31,7 @@
@@ -29617,7 +29651,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-03-27 11:09:15.000000000 -0700
+++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,79 +0,0 @@
-/*
@@ -29699,7 +29733,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
- System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
- if (failed > 0) throw new AssertionError("Some tests failed");}
-}
---- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-02-06 22:30:47.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-03-27 11:09:15.000000000 -0700
+++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,70 +0,0 @@
-/*
@@ -29772,7 +29806,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
- }
- }
-}
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-02-04 01:46:00.000000000 -0800
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-03-18 01:45:53.000000000 -0700
+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-01-30 09:29:12.000000000 -0800
@@ -131,6 +131,27 @@
;;
@@ -29802,7 +29836,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-02-04 01:46:00.000000000 -0800
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-03-18 01:45:53.000000000 -0700
+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-01-30 09:29:12.000000000 -0800
@@ -92,6 +92,27 @@
;;
@@ -29832,7 +29866,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-02-04 01:46:00.000000000 -0800
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-03-18 01:45:53.000000000 -0700
+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-01-30 09:29:13.000000000 -0800
@@ -50,13 +50,7 @@
@@ -29849,7 +29883,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-02-04 01:46:00.000000000 -0800
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-03-18 01:45:53.000000000 -0700
+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-01-30 09:29:13.000000000 -0800
@@ -51,13 +51,7 @@
@@ -29866,22 +29900,22 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
-Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /tmp/openjdk_portdir/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-02-04 01:46:01.000000000 -0800
+Files /tmp/openjdk_srcdir.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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.WNIZhUSX/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-03-18 01:45:54.000000000 -0700
+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-01-30 09:29:16.000000000 -0800
@@ -44,11 +44,7 @@
# set platform-dependent variables
@@ -29896,7 +29930,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-02-04 01:46:01.000000000 -0800
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-03-18 01:45:54.000000000 -0700
+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-01-30 09:29:16.000000000 -0800
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -29911,7 +29945,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-02-04 01:46:01.000000000 -0800
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-01-30 09:29:17.000000000 -0800
@@ -42,7 +42,7 @@
@@ -29922,7 +29956,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FILESEP="/"
PATHSEP=":"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-01-30 09:29:17.000000000 -0800
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -29933,7 +29967,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-01-30 09:29:17.000000000 -0800
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
@@ -29944,7 +29978,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-01-30 09:29:17.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -29955,7 +29989,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-01-30 09:29:17.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -29966,7 +30000,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-01-30 09:29:17.000000000 -0800
@@ -42,7 +42,7 @@
# set platform-dependent variables
@@ -29977,7 +30011,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-01-30 09:29:17.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -29988,7 +30022,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-01-30 09:29:17.000000000 -0800
@@ -47,11 +47,7 @@
# set platform-dependent variables
@@ -30003,7 +30037,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-01-30 09:29:17.000000000 -0800
@@ -45,7 +45,7 @@
# set platform-dependent variables
@@ -30014,7 +30048,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-01-30 09:29:17.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30025,7 +30059,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-01-30 09:29:18.000000000 -0800
@@ -72,6 +72,27 @@
;;
@@ -30055,7 +30089,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
* )
echo "Will not run test on: ${OS}"
exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-01-30 09:29:18.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30066,7 +30100,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-01-30 09:29:18.000000000 -0800
@@ -37,7 +37,7 @@
# set platform-dependent variables
@@ -30077,7 +30111,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2010-01-30 09:29:18.000000000 -0800
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -30088,7 +30122,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
FS="/"
TMP=/tmp
---- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2010-01-30 09:29:18.000000000 -0800
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -30099,7 +30133,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-01-30 09:29:18.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30110,7 +30144,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-01-30 09:29:18.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30121,7 +30155,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-01-30 09:29:18.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30132,7 +30166,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-01-30 09:29:18.000000000 -0800
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30143,7 +30177,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-01-30 09:29:18.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30154,7 +30188,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-01-30 09:29:18.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30165,7 +30199,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-01-30 09:29:18.000000000 -0800
@@ -46,7 +46,7 @@
# set platform-dependent variables
@@ -30176,7 +30210,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-01-30 09:29:18.000000000 -0800
@@ -53,7 +53,7 @@
@@ -30187,7 +30221,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-03-18 01:45:55.000000000 -0700
+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-01-30 09:29:18.000000000 -0800
@@ -54,7 +54,7 @@
@@ -30198,7 +30232,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-03-18 01:45:56.000000000 -0700
+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-01-30 12:39:04.000000000 -0800
@@ -33,7 +33,7 @@
@@ -30209,7 +30243,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
esac
N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-02-04 01:46:02.000000000 -0800
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-03-18 01:45:56.000000000 -0700
+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-01-30 09:29:19.000000000 -0800
@@ -56,7 +56,7 @@
@@ -30220,7 +30254,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/tools/pack200/Pack200Simple.sh 2010-02-04 01:46:03.000000000 -0800
+--- ./jdk/test/tools/pack200/Pack200Simple.sh 2010-03-18 01:45:56.000000000 -0700
+++ ./jdk/test/tools/pack200/Pack200Simple.sh 2010-01-30 09:29:19.000000000 -0800
@@ -85,7 +85,7 @@
break
@@ -30231,18 +30265,18 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PackOptions="-J-Xmx512m -J-ea"
break
;;
---- ./langtools/.hgtags 2010-02-04 01:46:21.000000000 -0800
-+++ ./langtools/.hgtags 2010-02-06 10:17:46.000000000 -0800
-@@ -56,3 +56,4 @@
- ac5b4c5644ce54585e5287563dde2b006fa664f4 jdk7-b79
- f0074aa48d4e2a4c03c92b9c4f880679fea0306c jdk7-b80
- cfabfcf9f110ef896cbdd382903d20eefbceefe0 jdk7-b81
-+47003a3622f6a17756ab0338bfa8a43e36549e99 jdk7-b82
---- ./langtools/.jcheck/conf 2010-02-04 01:46:21.000000000 -0800
+--- ./langtools/.hgtags 2010-03-18 01:46:16.000000000 -0700
++++ ./langtools/.hgtags 2010-03-20 11:13:06.000000000 -0700
+@@ -60,3 +60,4 @@
+ c9f4ae1f1480e89aaf7e72173184089d9cea397a jdk7-b83
+ d9cd5b8286e44f3baf90da290cd295433e21c05a jdk7-b84
+ 136bfc67946219fb02ee223984540a4a9c5b209f jdk7-b85
++ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
+--- ./langtools/.jcheck/conf 2010-03-18 01:46:16.000000000 -0700
+++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./langtools/test/Makefile 2010-02-04 01:46:24.000000000 -0800
+--- ./langtools/test/Makefile 2010-03-18 01:46:18.000000000 -0700
+++ ./langtools/test/Makefile 2009-09-23 21:29:29.000000000 -0700
@@ -20,6 +20,22 @@
ARCH=i586
@@ -30287,7 +30321,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Root of all test results
TEST_OUTPUT_DIR = $(TEST_ROOT)/o_$(PLATFORM)-$(ARCH)
---- ./langtools/test/jprt.config 2010-02-04 01:46:25.000000000 -0800
+--- ./langtools/test/jprt.config 2010-03-18 01:46:19.000000000 -0700
+++ ./langtools/test/jprt.config 2009-06-06 17:29:59.000000000 -0700
@@ -71,8 +71,8 @@
@@ -30356,7 +30390,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Export PATH setting
PATH="${path4sdk}"
---- ./langtools/test/tools/javac/4846262/Test.sh 2010-02-04 01:46:25.000000000 -0800
+--- ./langtools/test/tools/javac/4846262/Test.sh 2010-03-18 01:46:19.000000000 -0700
+++ ./langtools/test/tools/javac/4846262/Test.sh 2009-10-05 22:36:51.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
@@ -30367,7 +30401,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-02-04 01:46:25.000000000 -0800
+--- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-03-18 01:46:19.000000000 -0700
+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2009-10-05 22:36:51.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -30378,7 +30412,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-02-04 01:46:25.000000000 -0800
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-03-18 01:46:20.000000000 -0700
+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2009-10-05 22:36:51.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -30389,7 +30423,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-02-04 01:46:26.000000000 -0800
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-03-18 01:46:20.000000000 -0700
+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2009-10-05 22:36:51.000000000 -0700
@@ -54,7 +54,7 @@
# set platform-dependent variables
@@ -30400,7 +30434,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/MissingInclude.sh 2010-02-04 01:46:26.000000000 -0800
+--- ./langtools/test/tools/javac/MissingInclude.sh 2010-03-18 01:46:20.000000000 -0700
+++ ./langtools/test/tools/javac/MissingInclude.sh 2009-10-05 22:36:51.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30411,7 +30445,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-02-04 01:46:26.000000000 -0800
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-03-18 01:46:20.000000000 -0700
+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2009-10-05 22:36:51.000000000 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
@@ -30422,7 +30456,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-02-04 01:46:26.000000000 -0800
+--- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-03-18 01:46:21.000000000 -0700
+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2009-10-05 22:36:51.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30433,7 +30467,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/apt.sh 2010-02-04 01:46:27.000000000 -0800
+--- ./langtools/test/tools/javac/apt.sh 2010-03-18 01:46:21.000000000 -0700
+++ ./langtools/test/tools/javac/apt.sh 2009-06-06 17:30:04.000000000 -0700
@@ -38,7 +38,7 @@
# set platform-dependent variables
@@ -30444,7 +30478,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-02-04 01:46:27.000000000 -0800
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-03-18 01:46:21.000000000 -0700
+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2009-10-05 22:36:51.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
@@ -30455,7 +30489,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-02-04 01:46:27.000000000 -0800
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-03-18 01:46:22.000000000 -0700
+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2009-10-05 22:36:51.000000000 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
@@ -30466,7 +30500,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-02-04 01:46:28.000000000 -0800
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-03-18 01:46:23.000000000 -0700
+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2009-10-05 22:36:51.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -30477,7 +30511,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh 2010-02-04 01:46:28.000000000 -0800
+--- ./langtools/test/tools/javac/javazip/Test.sh 2010-03-18 01:46:23.000000000 -0700
+++ ./langtools/test/tools/javac/javazip/Test.sh 2009-10-05 22:36:51.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -30488,7 +30522,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
SCR=`pwd`
;;
---- ./langtools/test/tools/javac/links/links.sh 2010-02-04 01:46:28.000000000 -0800
+--- ./langtools/test/tools/javac/links/links.sh 2010-03-18 01:46:23.000000000 -0700
+++ ./langtools/test/tools/javac/links/links.sh 2009-06-06 17:30:08.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
@@ -30499,7 +30533,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-02-04 01:46:29.000000000 -0800
+--- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-03-18 01:46:23.000000000 -0700
+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2009-10-05 22:36:51.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
@@ -30510,7 +30544,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-02-04 01:46:29.000000000 -0800
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-03-18 01:46:24.000000000 -0700
+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2009-10-05 22:36:51.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -30521,7 +30555,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-02-04 01:46:29.000000000 -0800
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-03-18 01:46:24.000000000 -0700
+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2009-10-05 22:36:51.000000000 -0700
@@ -66,6 +66,17 @@
exit 0;
@@ -30541,7 +30575,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
Windows_98 | Windows_ME )
echo "As Windows 98/Me do not provide Unicode-aware file system, the compilation of the test case is expected to fail on these platforms. Ignoring this test."
exit 0;
---- ./langtools/test/tools/javah/6257087/foo.sh 2010-02-04 01:46:30.000000000 -0800
+--- ./langtools/test/tools/javah/6257087/foo.sh 2010-03-18 01:46:24.000000000 -0700
+++ ./langtools/test/tools/javah/6257087/foo.sh 2009-10-05 22:36:51.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
@@ -30552,7 +30586,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-02-04 01:46:30.000000000 -0800
+--- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-03-18 01:46:24.000000000 -0700
+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2009-10-05 22:36:51.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
@@ -30563,7 +30597,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-02-04 01:46:30.000000000 -0800
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-03-18 01:46:24.000000000 -0700
+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2009-10-18 15:07:54.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
@@ -30574,7 +30608,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ReadOldClass.sh 2010-02-04 01:46:30.000000000 -0800
+--- ./langtools/test/tools/javah/ReadOldClass.sh 2010-03-18 01:46:24.000000000 -0700
+++ ./langtools/test/tools/javah/ReadOldClass.sh 2009-10-05 22:36:51.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
@@ -30585,7 +30619,7 @@ Files /tmp/openjdk_srcdir.IC2SoRWN/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javap/pathsep.sh 2010-02-04 01:46:30.000000000 -0800
+--- ./langtools/test/tools/javap/pathsep.sh 2010-03-18 01:46:24.000000000 -0700
+++ ./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 v1.2.3 (git 2.25.1) at 2024-04-30 09:54:57 +0000