diff options
Diffstat (limited to 'java/openjdk7/files/patch-set')
| -rw-r--r-- | java/openjdk7/files/patch-set | 4441 |
1 files changed, 2515 insertions, 1926 deletions
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set index 5e640eea222b..c356dbc5a764 100644 --- a/java/openjdk7/files/patch-set +++ b/java/openjdk7/files/patch-set @@ -1,14 +1,28 @@ ---- ./.jcheck/conf 2010-07-09 01:47:50.000000000 -0700 +--- ./.hgtags 2010-11-04 16:11:55.000000000 -0700 ++++ ./.hgtags 2010-11-06 22:59:28.000000000 -0700 +@@ -91,3 +91,4 @@ + 27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114 + e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115 + 94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116 ++7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117 +--- ./.jcheck/conf 2010-11-04 16:11:55.000000000 -0700 +++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./corba/.jcheck/conf 2010-07-09 01:47:58.000000000 -0700 +--- ./corba/.hgtags 2010-11-04 16:11:58.000000000 -0700 ++++ ./corba/.hgtags 2010-11-06 22:59:32.000000000 -0700 +@@ -91,3 +91,4 @@ + 88fddb73c5c4a4b50c319cbae9380caf5172ab45 jdk7-b114 + da7561d479e0ddaa4650d8023ac0fc7294e014e3 jdk7-b115 + 98c028de4301106f2285ac0e128a1bb9b4c24f5c jdk7-b116 ++fa502e4834dac2176499cc1f44794d5dc32a11b9 jdk7-b117 +--- ./corba/.jcheck/conf 2010-11-04 16:11:58.000000000 -0700 +++ ./corba/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./corba/make/common/Defs-bsd.gmk 2010-07-11 09:19:15.000000000 -0700 -+++ ./corba/make/common/Defs-bsd.gmk 2010-07-11 09:11:16.000000000 -0700 -@@ -25,7 +25,7 @@ +--- ./corba/make/common/Defs-bsd.gmk 2010-11-07 17:21:38.000000000 -0800 ++++ ./corba/make/common/Defs-bsd.gmk 2010-10-31 14:11:33.000000000 -0700 +@@ -25,9 +25,18 @@ # # Makefile to specify compiler flags for programs and libraries @@ -16,148 +30,20 @@ +# targeted to BSD. Should not contain any rules. # - # Warning: the following variables are overriden by Defs.gmk. Set -@@ -51,7 +51,7 @@ - endif # PLATFORM_SRC - - # platform specific include files --PLATFORM_INCLUDE_NAME = $(PLATFORM) -+PLATFORM_INCLUDE_NAME = $(OS_NAME) - PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME) - - # suffix used for make dependencies files. -@@ -92,9 +92,12 @@ - # We need this frame pointer to make it easy to walk the stacks. - # This should be the default on X86, but ia64 and amd64 may not have this - # as the default. --CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN --CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN --CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_amd64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+LDFLAGS_COMMON_amd64 += -m64 -+CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+LDFLAGS_COMMON_i586 += -m32 -+CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+LDFLAGS_COMMON_ia64 += -m64 - CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 - LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 - CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 -@@ -109,6 +112,10 @@ - CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH)) - LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) - endif -+ifeq ($(OS_VENDOR),Apple) -+ # 16-byte stack re-alignment on 32-bit Darwin -+ CFLAGS_REQUIRED_i586 += -mstackrealign -+endif - - # Add in platform specific optimizations for all opt levels - CC_HIGHEST_OPT += $(_OPT_$(ARCH)) -@@ -153,7 +160,7 @@ - CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS) - endif - --# Bsd 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1 -+# BSD 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1 - DEBUG_FLAG = -g - ifeq ($(FASTDEBUG), true) - ifeq ($(ARCH_DATA_MODEL), 64) -@@ -185,7 +192,7 @@ - CPP_ARCH_FLAGS += -D_$(ARCH)_ - endif - --CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DBSD $(VERSION_DEFINES) \ -+CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D_ALLBSD_SOURCE $(VERSION_DEFINES) \ - -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT - - ifeq ($(ARCH_DATA_MODEL), 64) -@@ -195,33 +202,15 @@ - CPPFLAGS_OPT = - CPPFLAGS_DBG = -DDEBUG - --ifdef LIBRARY -- # Libraries need to locate other libraries at runtime, and you can tell -- # a library where to look by way of the dynamic runpaths (RPATH or RUNPATH) -- # buried inside the .so. The $ORIGIN says to look relative to where -- # the library itself is and it can be followed with relative paths from -- # that. By default we always look in $ORIGIN, optionally we add relative -- # paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths. -- # On Bsd we add a flag -z origin, not sure if this is necessary, but -- # doesn't seem to hurt. -- # The environment variable LD_LIBRARY_PATH will over-ride these runpaths. -- # Try: 'readelf -d lib*.so' to see these settings in a library. -- # -- LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN -- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%) --endif -- --EXTRA_LIBS += -lc -- --LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs --LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) -- - # - # -L paths for finding and -ljava - # --LDFLAGS_OPT = -Xlinker -O1 - LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) ++# Warning: the following variables are overriden by Defs.gmk. Set ++# values will be silently ignored: ++# CFLAGS (set $(OTHER_CFLAGS) instead) ++# CPPFLAGS (set $(OTHER_CPPFLAGS) instead) ++# CXXFLAGS (set $(OTHER_CXXFLAGS) instead) ++# LDFLAGS (set $(OTHER_LDFAGS) instead) ++# LDLIBS (set $(EXTRA_LIBS) instead) ++# LDLIBS_COMMON (set $(EXTRA_LIBS) instead) + -+ifneq ($(OS_VENDOR), Apple) -+LDFLAGS_OPT = -Xlinker -O1 - LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) -+endif + # Get shared JDK settings + include $(BUILDDIR)/common/shared/Defs.gmk - # - # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always -@@ -252,6 +241,11 @@ - # - LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker - -+# Darwin does not support linker map files. -+ifeq ($(OS_VENDOR), Apple) -+LDNOMAP=true -+endif -+ - # - # Support for Quantify. - # -@@ -287,7 +281,9 @@ - override HAVE_FILIOH = false - override HAVE_GETHRTIME = false - override HAVE_GETHRVTIME = false -+ifeq ($(OS_VENDOR),Apple) - override HAVE_SIGIGNORE = true -+endif - override LEX_LIBRARY = -lfl - ifeq ($(STATIC_CXX),true) - override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic -@@ -299,12 +295,8 @@ - override LIBTHREAD = - override MOOT_PRIORITIES = true - override NO_INTERRUPTIBLE_IO = true --override OPENWIN_HOME = /usr/X11R6 --ifeq ($(ARCH), amd64) --override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 --else -+override OPENWIN_HOME = $(X11_PATH) - override OPENWIN_LIB = $(OPENWIN_HOME)/lib --endif - override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER - override SUN_CMM_SUBDIR = - override THREADS_FLAG = native ---- ./corba/make/common/Defs-linux.gmk 2010-07-09 01:47:59.000000000 -0700 -+++ ./corba/make/common/Defs-linux.gmk 2010-07-11 09:11:16.000000000 -0700 -@@ -299,7 +299,7 @@ - override LIBTHREAD = - override MOOT_PRIORITIES = true - override NO_INTERRUPTIBLE_IO = true --override OPENWIN_HOME = /usr/X11R6 -+override OPENWIN_HOME = $(X11_PATH) - ifeq ($(ARCH), amd64) - override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 - else ---- ./corba/make/common/Defs.gmk 2010-07-09 01:47:59.000000000 -0700 -+++ ./corba/make/common/Defs.gmk 2010-07-11 09:11:16.000000000 -0700 +--- ./corba/make/common/Defs.gmk 2010-11-04 16:11:58.000000000 -0700 ++++ ./corba/make/common/Defs.gmk 2010-10-31 14:08:26.000000000 -0700 @@ -53,6 +53,28 @@ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) @@ -187,69 +73,8 @@ # # Get platform definitions # -@@ -97,6 +119,9 @@ - LDLIBS_COMMON = -ldl - endif - -+ ifeq ($(PLATFORM), bsd) -+ LDLIBS_COMMON = -pthread -+ endif - endif # PROGRAM - - LDLIBS_COMMON += $(EXTRA_LIBS) ---- ./corba/make/common/Mapfile-vers.gmk 2010-07-09 01:47:59.000000000 -0700 -+++ ./corba/make/common/Mapfile-vers.gmk 2010-07-11 09:11:16.000000000 -0700 -@@ -77,7 +77,7 @@ - endif # PLATFORM - - --ifeq ($(PLATFORM), linux) -+ifneq (,$(findstring $(PLATFORM), linux bsd)) - - ifeq ($(VARIANT), OPT) - # OPT build MUST have a mapfile? ---- ./corba/make/common/shared/Compiler-gcc.gmk 2010-07-09 01:47:59.000000000 -0700 -+++ ./corba/make/common/shared/Compiler-gcc.gmk 2010-07-11 09:11:16.000000000 -0700 -@@ -100,6 +100,23 @@ - - endif - -+ifeq ($(PLATFORM), bsd) -+ # Settings specific to BSD -+ CC = $(COMPILER_PATH)gcc -+ CPP = $(COMPILER_PATH)gcc -E -+ CXX = $(COMPILER_PATH)g++ -+ REQUIRED_CC_VER = 3.2 -+ -+# Option used to create a shared library -+ifeq ($(OS_VENDOR), Apple) -+ SHARED_LIBRARY_FLAG = -dynamiclib -+else -+ SHARED_LIBRARY_FLAG = -shared -+endif -+ -+ SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) -+endif -+ - ifeq ($(PLATFORM), solaris) - - # Settings specific to Solaris ---- ./corba/make/common/shared/Compiler.gmk 2010-07-09 01:47:59.000000000 -0700 -+++ ./corba/make/common/shared/Compiler.gmk 2010-07-11 09:11:16.000000000 -0700 -@@ -42,6 +42,11 @@ - override CC_VERSION = gcc - endif - -+# BSD uses GNU compilers by default -+ifeq ($(PLATFORM), bsd) -+ override CC_VERSION = gcc -+endif -+ - # Get the compiler specific settings - include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk - ---- ./corba/make/common/shared/Defs-bsd.gmk 2010-07-11 09:19:15.000000000 -0700 -+++ ./corba/make/common/shared/Defs-bsd.gmk 2010-07-11 09:11:16.000000000 -0700 +--- ./corba/make/common/shared/Defs-bsd.gmk 2010-11-07 17:21:38.000000000 -0800 ++++ ./corba/make/common/shared/Defs-bsd.gmk 2010-10-31 14:10:12.000000000 -0700 @@ -54,7 +54,7 @@ endef @@ -259,7 +84,7 @@ # UNIXCOMMAND_PATH: path to where the most common Unix commands are. # NOTE: Must end with / so that it could be empty, allowing PATH usage. -@@ -107,7 +107,7 @@ +@@ -99,7 +99,7 @@ ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined" DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH)) else @@ -268,8 +93,8 @@ endif # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK. ---- ./corba/make/common/shared/Defs-utils.gmk 2010-07-09 01:47:59.000000000 -0700 -+++ ./corba/make/common/shared/Defs-utils.gmk 2010-07-11 09:11:16.000000000 -0700 +--- ./corba/make/common/shared/Defs-utils.gmk 2010-11-04 16:11:58.000000000 -0700 ++++ ./corba/make/common/shared/Defs-utils.gmk 2010-10-31 13:48:36.000000000 -0700 @@ -53,6 +53,13 @@ UTILS_DEVTOOL_PATH=$(USRBIN_PATH) endif @@ -284,7 +109,7 @@ ifeq ($(PLATFORM),solaris) UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH) UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH) -@@ -198,3 +205,32 @@ +@@ -198,3 +205,34 @@ ECHO = /usr/bin/echo endif @@ -312,14 +137,16 @@ + else + UNZIP = $(UTILS_DEVTOOL_PATH)unzip + endif -+ ifneq ($(OS_VENDOR), OpenBSD) ++ ifeq ($(OS_VENDOR), OpenBSD) ++ NAWK = $(UTILS_USR_BIN_PATH)awk ++ else + CPIO = $(UTILS_USR_BIN_PATH)cpio + TAR = $(UTILS_USR_BIN_PATH)tar + endif +endif ---- ./corba/make/common/shared/Platform.gmk 2010-07-09 01:47:59.000000000 -0700 -+++ ./corba/make/common/shared/Platform.gmk 2010-07-11 09:11:16.000000000 -0700 -@@ -254,6 +254,101 @@ +--- ./corba/make/common/shared/Platform.gmk 2010-11-04 16:11:58.000000000 -0700 ++++ ./corba/make/common/shared/Platform.gmk 2010-10-31 14:05:41.000000000 -0700 +@@ -231,6 +231,101 @@ MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) endif @@ -421,7 +248,7 @@ # Windows with and without CYGWIN will be slightly different ifeq ($(SYSTEM_UNAME), Windows_NT) PLATFORM = windows -@@ -417,6 +512,18 @@ +@@ -381,6 +476,18 @@ export MAX_VM_MEMORY endif @@ -440,12 +267,19 @@ REQUIRED_ZIP_VER = 2.2 REQUIRED_UNZIP_VER = 5.12 REQUIRED_MAKE_VER = 3.78 ---- ./hotspot/.jcheck/conf 2010-07-09 01:48:39.000000000 -0700 +--- ./hotspot/.hgtags 2010-11-04 16:12:12.000000000 -0700 ++++ ./hotspot/.hgtags 2010-11-06 22:59:36.000000000 -0700 +@@ -127,3 +127,4 @@ + 5511edd5d719f3fc9fdd04879482026a3d2c8652 hs20-b01 + bdbc48857210a509b3c50a3291ecb9dd6a72e016 jdk7-b115 + 96b3f2a7add0b445b8aa421f6823cff5a2e2fe03 jdk7-b116 ++806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117 +--- ./hotspot/.jcheck/conf 2010-11-04 16:12:12.000000000 -0700 +++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./hotspot/agent/make/Makefile 2010-07-09 01:48:39.000000000 -0700 -+++ ./hotspot/agent/make/Makefile 2010-07-11 09:11:30.000000000 -0700 +--- ./hotspot/agent/make/Makefile 2010-11-04 16:12:12.000000000 -0700 ++++ ./hotspot/agent/make/Makefile 2010-06-15 22:03:11.000000000 -0700 @@ -52,6 +52,9 @@ sun.jvm.hotspot.compiler \ sun.jvm.hotspot.debugger \ @@ -475,8 +309,8 @@ sun/jvm/hotspot/debugger/cdbg/*.java \ sun/jvm/hotspot/debugger/cdbg/basic/*.java \ sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \ ---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-07-04 09:30:36.000000000 -0700 @@ -22,6 +22,7 @@ * */ @@ -616,8 +450,8 @@ #endif /* amd64 */ ---- ./hotspot/agent/src/os/bsd/Makefile 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/Makefile 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/Makefile 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/Makefile 2010-07-04 09:45:58.000000000 -0700 @@ -22,7 +22,7 @@ # # @@ -693,7 +527,7 @@ + -rmdir $(ARCH) --- ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2010-07-11 09:11:31.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2009-06-06 16:53:52.000000000 -0700 @@ -0,0 +1,120 @@ +/* + * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. @@ -815,8 +649,8 @@ + (JNIEnv *env, jobject this_obj, jint lwp_id) { + return 0; +} ---- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/elfmacros.h 2010-07-04 09:30:36.000000000 -0700 @@ -25,16 +25,19 @@ #ifndef _ELFMACROS_H_ #define _ELFMACROS_H_ @@ -853,7 +687,7 @@ #endif --- ./hotspot/agent/src/os/bsd/hsearch_r.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2010-07-11 09:11:31.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2009-06-06 16:53:52.000000000 -0700 @@ -0,0 +1,217 @@ +/* Copyright (C) 1993,1995-1997,2002,2005,2007,2008 + Free Software Foundation, Inc. @@ -1073,7 +907,7 @@ + return 0; +} --- ./hotspot/agent/src/os/bsd/hsearch_r.h 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2010-07-11 09:11:31.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2009-06-06 16:53:52.000000000 -0700 @@ -0,0 +1,42 @@ +/* Declarations for System V style searching functions. + Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. @@ -1117,8 +951,8 @@ +extern void hdestroy_r (struct hsearch_data *__htab); + +#endif /* _HSEARCH_R_H_ */ ---- ./hotspot/agent/src/os/bsd/libproc.h 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/libproc.h 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/libproc.h 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/libproc.h 2010-07-04 09:30:36.000000000 -0700 @@ -27,7 +27,8 @@ #include <unistd.h> @@ -1179,8 +1013,8 @@ // get number of shared objects int get_num_libs(struct ps_prochandle* ph); ---- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-07-04 09:30:37.000000000 -0700 @@ -174,10 +174,13 @@ return NULL; } @@ -1280,8 +1114,8 @@ + print_debug("ps_pcontinue not implemented\n"); return PS_OK; } ---- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-07-04 09:30:37.000000000 -0700 @@ -47,7 +47,7 @@ typedef struct thread_info { lwpid_t lwp_id; @@ -1311,8 +1145,8 @@ // part of the class sharing workaround int classes_jsa_fd; // file descriptor of class share archive uintptr_t dynamic_addr; // address of dynamic section of a.out ---- ./hotspot/agent/src/os/bsd/mapfile 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/mapfile 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/mapfile 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/mapfile 2010-07-04 09:30:37.000000000 -0700 @@ -43,13 +43,17 @@ # proc_service.h functions - to be used by libthread_db ps_getpid; @@ -1334,7 +1168,7 @@ # used by attach test program init_libproc; ---- ./hotspot/agent/src/os/bsd/proc_service.h 2010-07-11 09:19:10.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/proc_service.h 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,76 +0,0 @@ -/* @@ -1413,8 +1247,8 @@ -ps_err_e ps_get_thread_area(); - -#endif /* _PROC_SERVICE_H_ */ ---- ./hotspot/agent/src/os/bsd/ps_core.c 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/ps_core.c 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/ps_core.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/ps_core.c 2010-07-04 09:30:46.000000000 -0700 @@ -142,6 +142,7 @@ map->next = ph->core->class_share_maps; @@ -1726,8 +1560,8 @@ struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle)); if (ph == NULL) { ---- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/ps_proc.c 2010-10-31 14:26:55.000000000 -0700 @@ -22,20 +22,22 @@ * */ @@ -1759,7 +1593,7 @@ // This file has the libproc implementation specific to live process // For core files, refer to ps_core.c -@@ -50,251 +52,359 @@ +@@ -50,255 +52,359 @@ // read "size" bytes of data from "addr" within the target process. // unlike the standard ptrace() function, process_read_data() can handle @@ -2138,7 +1972,11 @@ - if (nwords > 5 && find_lib(ph, word[5]) == false) { - intptr_t base; - lib_info* lib; +-#ifdef _LP64 - sscanf(word[0], "%lx", &base); +-#else +- sscanf(word[0], "%x", &base); +-#endif - if ((lib = add_lib_info(ph, word[5], (uintptr_t)base)) == NULL) + for (i = 0; i < cnt; i++) { + kve = &freep[i]; @@ -2167,7 +2005,7 @@ + + free(freep); + - return true; ++ return true; +#else + char *l_name; + struct link_map *lmap; @@ -2223,7 +2061,7 @@ + free (l_name); + free (lmap); + -+ return true; + return true; +#endif } @@ -2263,7 +2101,7 @@ }; // attach to the process. One and only one exposed stuff -@@ -321,21 +431,14 @@ +@@ -325,21 +431,14 @@ // read library info and symbol tables, must do this before attaching threads, // as the symbols in the pthread library will be used to figure out // the list of threads within the same process. @@ -2291,8 +2129,8 @@ - } return ph; } ---- ./hotspot/agent/src/os/bsd/salibelf.c 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/salibelf.c 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/salibelf.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/salibelf.c 2010-07-04 09:30:46.000000000 -0700 @@ -25,6 +25,7 @@ #include "salibelf.h" #include <stdlib.h> @@ -2301,8 +2139,8 @@ extern void print_debug(const char*,...); ---- ./hotspot/agent/src/os/bsd/symtab.c 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/symtab.c 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/symtab.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/symtab.c 2010-07-04 09:30:46.000000000 -0700 @@ -23,10 +23,10 @@ */ @@ -2702,8 +2540,8 @@ void destroy_symtab(struct symtab* symtab) { if (!symtab) return; if (symtab->strs) free(symtab->strs); ---- ./hotspot/agent/src/os/bsd/symtab.h 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/symtab.h 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/symtab.h 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/symtab.h 2010-07-04 09:30:46.000000000 -0700 @@ -32,7 +32,7 @@ struct symtab; @@ -2713,8 +2551,8 @@ // destroy the symbol table void destroy_symtab(struct symtab* symtab); ---- ./hotspot/agent/src/os/bsd/test.c 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/test.c 2010-07-11 09:11:31.000000000 -0700 +--- ./hotspot/agent/src/os/bsd/test.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/os/bsd/test.c 2010-07-04 09:30:46.000000000 -0700 @@ -44,7 +44,7 @@ } @@ -2724,8 +2562,8 @@ return 1; } } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-07-09 01:48:40.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-07-11 09:11:32.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-11-04 16:12:12.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-06-15 22:03:12.000000000 -0700 @@ -28,6 +28,7 @@ import java.net.*; import java.rmi.*; @@ -2795,8 +2633,8 @@ /** Convenience routine which should be called by per-platform debugger setup. Should not be called when startupMode is REMOTE_MODE. */ ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-07-09 01:48:40.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-07-11 09:11:33.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-11-04 16:12:12.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-06-15 22:03:14.000000000 -0700 @@ -29,6 +29,7 @@ import java.rmi.*; import sun.jvm.hotspot.*; @@ -2868,8 +2706,8 @@ /** Convenience routine which should be called by per-platform debugger setup. Should not be called when startupMode is REMOTE_MODE. */ ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-07-11 09:11:34.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-07-04 09:30:46.000000000 -0700 @@ -30,10 +30,8 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -2895,8 +2733,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-07-11 09:11:34.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-07-04 09:30:46.000000000 -0700 @@ -26,9 +26,7 @@ import sun.jvm.hotspot.debugger.*; @@ -2918,7 +2756,7 @@ } else { throw new RuntimeException("cpu " + cpu + " is not yet supported"); } ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-07-11 09:19:10.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,46 +0,0 @@ -/* @@ -2967,7 +2805,7 @@ - return debugger.newAddress(getRegister(index)); - } -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-07-11 09:19:10.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,81 +0,0 @@ -/* @@ -3051,7 +2889,7 @@ - private Address sp; - private BsdDebugger dbg; -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-07-11 09:19:10.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,46 +0,0 @@ -/* @@ -3100,8 +2938,8 @@ - return debugger.newAddress(getRegister(index)); - } -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-07-09 01:48:42.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-07-11 09:11:37.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-06-15 22:03:17.000000000 -0700 @@ -37,6 +37,8 @@ import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess; import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess; @@ -3125,8 +2963,8 @@ } if (access == null) { ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-07-11 09:11:37.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-07-04 09:31:12.000000000 -0700 @@ -28,37 +28,36 @@ private static String[] signalNames = { "", /* No signal 0 */ @@ -3187,7 +3025,7 @@ }; public static String getSignalName(int sigNum) { ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-07-11 09:19:10.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,137 +0,0 @@ -/* @@ -3327,7 +3165,7 @@ - return debugger.getThreadForIdentifierAddress(pthreadIdAddr); - } -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-07-11 09:19:10.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,165 +0,0 @@ -/* @@ -3495,8 +3333,8 @@ - - -} ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-07-11 09:11:37.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-07-04 09:31:25.000000000 -0700 @@ -28,37 +28,36 @@ private static String[] signalNames = { "", /* No signal 0 */ @@ -3557,8 +3395,8 @@ }; public static String getSignalName(int sigNum) { ---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-07-09 01:48:43.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-07-11 09:11:38.000000000 -0700 +--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-06-15 22:03:18.000000000 -0700 @@ -37,6 +37,14 @@ return "solaris"; } else if (os.equals("Linux")) { @@ -3574,19 +3412,30 @@ } else if (os.startsWith("Windows")) { return "win32"; } else { ---- ./hotspot/make/Makefile 2010-07-09 01:48:43.000000000 -0700 -+++ ./hotspot/make/Makefile 2010-07-11 09:11:39.000000000 -0700 -@@ -290,20 +290,20 @@ - # Shared Library +--- ./hotspot/make/Makefile 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/make/Makefile 2010-10-31 14:22:38.000000000 -0700 +@@ -321,28 +321,28 @@ ifneq ($(OSNAME),windows) ifeq ($(ZERO_BUILD), true) + ifeq ($(SHARK_BUILD), true) +-$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so ++$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) + $(install-file) +-$(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so ++$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) + $(install-file) + else -$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) $(install-file) -$(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so +$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) $(install-file) + endif else +-$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C1_DIR)/%.so ++$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) + $(install-file) -$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so +$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) $(install-file) @@ -3604,8 +3453,8 @@ $(install-file) endif endif ---- ./hotspot/make/bsd/Makefile 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/make/bsd/Makefile 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/Makefile 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/Makefile 2010-10-31 14:26:55.000000000 -0700 @@ -39,11 +39,11 @@ # One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on # an architecture that differs from the target architecture, as long @@ -3618,9 +3467,9 @@ -# make REMOTE="rsh -l me myotherbsdbox" +# make REMOTE="rsh -l me myotherlinuxbox" - # Along with VM, Serviceability Agent (SA) is built for SA/JDI binding. - # JDI binding on SA produces two binaries: -@@ -94,7 +94,7 @@ + # Along with VM, Serviceability Agent (SA) is built for SA/JDI binding. + # JDI binding on SA produces two binaries: +@@ -92,7 +92,7 @@ # # We only do this on SunOS variants, for a couple of reasons: # * It is extremely rare that source trees exist on other systems @@ -3629,7 +3478,7 @@ # changing GAMMADIR in a way that exercises the automounter could # prove to be a source of unreliability in the build process. # Obviously, this Makefile is only relevant on SunOS boxes to begin -@@ -216,11 +216,12 @@ +@@ -224,11 +224,12 @@ checks: check_os_version check_j2se_version @@ -3644,8 +3493,8 @@ OS_VERSION := $(shell uname -r) EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) ---- ./hotspot/make/bsd/makefiles/buildtree.make 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/buildtree.make 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/buildtree.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/buildtree.make 2010-10-31 14:26:55.000000000 -0700 @@ -287,10 +287,11 @@ [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \ { \ @@ -3659,8 +3508,8 @@ ) > $@ env.csh: env.sh ---- ./hotspot/make/bsd/makefiles/cscope.make 2010-07-11 09:19:10.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/cscope.make 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/cscope.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/cscope.make 2010-07-04 09:31:25.000000000 -0700 @@ -71,7 +71,7 @@ # OS-specific files for other systems are excluded by default. Use CS_OS=yes # to include platform-specific files for other platforms. @@ -3670,8 +3519,8 @@ CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS})) endif ---- ./hotspot/make/bsd/makefiles/defs.make 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/defs.make 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/defs.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/defs.make 2010-10-31 14:48:17.000000000 -0700 @@ -72,8 +72,8 @@ HS_ARCH = sparc endif @@ -3683,7 +3532,7 @@ ifeq ($(ARCH_DATA_MODEL), 64) ARCH_DATA_MODEL = 64 MAKE_ARGS += LP64=1 -@@ -85,43 +85,61 @@ +@@ -85,17 +85,27 @@ PLATFORM = bsd-i586 VM_PLATFORM = bsd_i486 HS_ARCH = x86 @@ -3718,6 +3567,9 @@ + endif endif + # ARM +@@ -116,39 +126,45 @@ + JDK_INCLUDE_SUBDIR=bsd +# Library suffix @@ -3736,32 +3588,48 @@ # client and server subdirectories have symbolic links to ../libjsig.so -EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) - EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server + + ifndef BUILD_CLIENT_ONLY EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) + endif + ifneq ($(ZERO_BUILD), true) ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so -- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so -- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar - else - ifeq ($(ARCH),ia64) - else -- 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 - endif endif ---- ./hotspot/make/bsd/makefiles/gcc.make 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/gcc.make 2010-07-11 09:11:39.000000000 -0700 -@@ -22,12 +22,15 @@ + endif + + # Serviceability Binaries + # No SA Support for PPC, IA64, ARM or zero +-ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ +- $(EXPORT_LIB_DIR)/sa-jdi.jar +-ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ +- $(EXPORT_LIB_DIR)/sa-jdi.jar +-ADD_SA_BINARIES/ppc = +-ADD_SA_BINARIES/ia64 = +-ADD_SA_BINARIES/arm = +-ADD_SA_BINARIES/zero = ++ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ ++ $(EXPORT_LIB_DIR)/sa-jdi.jar ++ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ ++ $(EXPORT_LIB_DIR)/sa-jdi.jar ++ADD_SA_BINARIES/ppc = ++ADD_SA_BINARIES/ia64 = ++ADD_SA_BINARIES/arm = ++ADD_SA_BINARIES/zero = + + EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) +- +- +--- ./hotspot/make/bsd/makefiles/gcc.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/gcc.make 2010-10-31 15:24:40.000000000 -0700 +@@ -22,18 +22,22 @@ # # @@ -3770,17 +3638,24 @@ #------------------------------------------------------------------------ # CC, CPP & AS + ifdef ALT_COMPILER_PATH ++CXX = $(ALT_COMPILER_PATH)/g++ + CPP = $(ALT_COMPILER_PATH)/g++ + CC = $(ALT_COMPILER_PATH)/gcc + else -CPP = g++ -CC = gcc --AS = $(CC) -c +CXX ?= g++ -+CPP = $(CXX) ++CPP = $(CXX) +CC ?= gcc + endif + +-AS = $(CC) -c +AS = $(CC) -c -x assembler-with-cpp # -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only # prints the numbers (e.g. "2.95", "3.2.1") -@@ -58,7 +61,7 @@ +@@ -67,7 +71,7 @@ CFLAGS += $(VM_PICFLAG) CFLAGS += -fno-rtti CFLAGS += -fno-exceptions @@ -3789,20 +3664,23 @@ CFLAGS += -fcheck-new ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) -@@ -69,6 +72,12 @@ +@@ -76,10 +80,12 @@ + ARCHFLAG/ia64 = + ARCHFLAG/sparc = -m32 -mcpu=v9 ARCHFLAG/sparcv9 = -m64 -mcpu=v9 +-ARCHFLAG/arm = -fsigned-char ARCHFLAG/zero = $(ZERO_ARCHFLAG) - +-ifndef E500V2 +-ARCHFLAG/ppc = -mcpu=powerpc ++ +# Darwin-specific build flags +ifeq ($(OS_VENDOR), Darwin) + # Ineffecient 16-byte stack re-alignment on Darwin/IA32 + ARCHFLAG/i486 += -mstackrealign -+endif -+ + endif + CFLAGS += $(ARCHFLAG) - AOUT_FLAGS += $(ARCHFLAG) - LFLAGS += $(ARCHFLAG) -@@ -102,6 +111,11 @@ +@@ -124,6 +130,11 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) @@ -3814,7 +3692,7 @@ # The flags to use for an Optimized g++ build OPT_CFLAGS += -O3 -@@ -137,28 +151,40 @@ +@@ -159,28 +170,40 @@ LFLAGS += -Wl,-relax endif @@ -3872,8 +3750,8 @@ #------------------------------------------------------------------------ # Debug flags ---- ./hotspot/make/bsd/makefiles/jsig.make 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/jsig.make 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/jsig.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/jsig.make 2010-07-04 09:31:25.000000000 -0700 @@ -25,11 +25,16 @@ # Rules to build signal interposition library, used by vm.make @@ -3913,8 +3791,8 @@ $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } install_jsig: $(LIBJSIG) ---- ./hotspot/make/bsd/makefiles/launcher.make 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/launcher.make 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/launcher.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/launcher.make 2010-07-04 09:31:25.000000000 -0700 @@ -46,7 +46,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -3924,9 +3802,9 @@ LIBS_LAUNCHER += -l$(JVM) $(LIBS) endif ---- ./hotspot/make/bsd/makefiles/sa.make 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/sa.make 2010-07-11 09:11:39.000000000 -0700 -@@ -42,8 +42,8 @@ +--- ./hotspot/make/bsd/makefiles/sa.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/sa.make 2010-10-31 14:26:55.000000000 -0700 +@@ -45,8 +45,8 @@ # gnumake 3.78.1 does not accept the *s that # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them @@ -3935,10 +3813,10 @@ +AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) +AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) - SA_CLASSDIR = $(GENERATED)/saclasses - ---- ./hotspot/make/bsd/makefiles/saproc.make 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/saproc.make 2010-07-11 09:11:39.000000000 -0700 + AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list + AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list +--- ./hotspot/make/bsd/makefiles/saproc.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/saproc.make 2010-10-31 14:26:55.000000000 -0700 @@ -25,23 +25,34 @@ # Rules to build serviceability agent library, used by vm.make @@ -4006,18 +3884,29 @@ $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } install_saproc: checkAndBuildSA ---- ./hotspot/make/bsd/makefiles/vm.make 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/vm.make 2010-07-11 09:11:39.000000000 -0700 -@@ -99,7 +99,7 @@ - # Extra flags from gnumake's invocation or environment +--- ./hotspot/make/bsd/makefiles/vm.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/vm.make 2010-10-31 14:26:55.000000000 -0700 +@@ -90,6 +90,10 @@ + ${JRE_VERSION} \ + ${VM_DISTRO} + ++ifdef DEFAULT_LIBPATH ++CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" ++endif ++ + # CFLAGS_WARN holds compiler options to suppress/enable warnings. + CFLAGS += $(CFLAGS_WARN/BYFILE) + +@@ -100,7 +104,7 @@ CFLAGS += $(EXTRA_CFLAGS) + LFLAGS += $(EXTRA_CFLAGS) -LIBS += -lm -ldl -lpthread +LIBS += -lm -pthread # By default, link the *.o into the library, not the executable. LINK_INTO$(LINK_INTO) = LIBJVM -@@ -113,9 +113,15 @@ +@@ -114,9 +118,15 @@ #---------------------------------------------------------------------- # JVM @@ -4036,20 +3925,24 @@ JVM_OBJ_FILES = $(Obj_Files) -@@ -136,11 +142,7 @@ +@@ -137,15 +147,7 @@ vm.def: $(Res_Files) $(Obj_Files) sh $(GAMMADIR)/make/bsd/makefiles/build_vm_def.sh *.o > $@ --ifeq ($(ZERO_LIBARCH), ppc64) +-ifeq ($(SHARK_BUILD), true) - STATIC_CXX = false -else -- STATIC_CXX = true +- ifeq ($(ZERO_LIBARCH), ppc64) +- STATIC_CXX = false +- else +- STATIC_CXX = true +- endif -endif +STATIC_CXX = false ifeq ($(LINK_INTO),AOUT) LIBJVM.o = -@@ -152,14 +154,21 @@ +@@ -157,14 +159,21 @@ LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM)) @@ -4072,15 +3965,15 @@ endif LIBS_VM += $(LIBS) -@@ -168,7 +177,6 @@ - LIBS_VM += $(LIBFFI_LIBS) +@@ -177,7 +186,6 @@ + LIBS_VM += $(LLVM_LIBS) endif -LINK_VM = $(LINK_LIB.c) # rule for building precompiled header $(PRECOMPILED_HEADER): $(Precompiled_Files) -@@ -196,11 +204,6 @@ +@@ -205,11 +213,6 @@ LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT) endif @@ -4092,24 +3985,26 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) $(QUIETLY) { \ echo Linking vm...; \ -@@ -210,15 +213,6 @@ +@@ -219,17 +222,6 @@ $(LINK_LIB.CC/POST_HOOK) \ rm -f $@.1; ln -s $@ $@.1; \ [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ -- if [ -x /usr/sbin/sebsdenabled ] ; then \ -- /usr/sbin/sebsdenabled; \ -- if [ $$? = 0 ] ; then \ -- /usr/bin/chcon -t textrel_shlib_t $@; \ -- if [ $$? != 0 ]; then \ -- echo "ERROR: Cannot chcon $@"; \ -- fi \ -- fi \ -- fi \ +- if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \ +- if [ -x /usr/sbin/sebsdenabled ] ; then \ +- /usr/sbin/sebsdenabled; \ +- if [ $$? = 0 ] ; then \ +- /usr/bin/chcon -t textrel_shlib_t $@; \ +- if [ $$? != 0 ]; then \ +- echo "ERROR: Cannot chcon $@"; \ +- fi \ +- fi \ +- fi \ +- fi \ } DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) ---- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/zeroshark.make 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/makefiles/zeroshark.make 2010-07-04 09:31:26.000000000 -0700 @@ -40,4 +40,23 @@ CFLAGS += -D_LP64=1 endif @@ -4134,40 +4029,40 @@ +LIBS += -L$(PACKAGE_PATH)/lib -lffi + OPT_CFLAGS/compactingPermGenGen.o = -O1 ---- ./hotspot/make/bsd/platform_amd64 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/platform_amd64 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/platform_amd64 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/platform_amd64 2009-06-06 16:53:58.000000000 -0700 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DAMD64 +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64 ---- ./hotspot/make/bsd/platform_amd64.suncc 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/platform_amd64.suncc 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/platform_amd64.suncc 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/platform_amd64.suncc 2010-01-17 15:46:11.000000000 -0800 @@ -14,4 +14,4 @@ gnu_dis_arch = amd64 -sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64 +sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64 ---- ./hotspot/make/bsd/platform_i486 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/platform_i486 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/platform_i486 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/platform_i486 2009-06-06 16:53:58.000000000 -0700 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DIA32 +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32 ---- ./hotspot/make/bsd/platform_i486.suncc 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/platform_i486.suncc 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/platform_i486.suncc 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/platform_i486.suncc 2010-01-17 15:46:11.000000000 -0800 @@ -14,4 +14,4 @@ gnu_dis_arch = i386 -sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32 +sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32 ---- ./hotspot/make/bsd/platform_ia64 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/platform_ia64 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/platform_ia64 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/platform_ia64 2010-01-17 15:46:11.000000000 -0800 @@ -10,6 +10,6 @@ gnu_dis_arch = ia64 @@ -4176,32 +4071,32 @@ +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP mark_style = alignment ---- ./hotspot/make/bsd/platform_sparc 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/platform_sparc 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/platform_sparc 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/platform_sparc 2009-06-06 16:53:58.000000000 -0700 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DSPARC +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC ---- ./hotspot/make/bsd/platform_sparcv9 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/platform_sparcv9 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/platform_sparcv9 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/platform_sparcv9 2010-01-17 15:46:11.000000000 -0800 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DSPARC +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC ---- ./hotspot/make/bsd/platform_zero.in 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/make/bsd/platform_zero.in 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/bsd/platform_zero.in 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/make/bsd/platform_zero.in 2009-11-04 19:52:29.000000000 -0800 @@ -14,4 +14,4 @@ gnu_dis_arch = zero -sysdefs = -DBSD -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\" +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\" ---- ./hotspot/make/defs.make 2010-07-09 01:48:43.000000000 -0700 -+++ ./hotspot/make/defs.make 2010-07-11 09:11:39.000000000 -0700 +--- ./hotspot/make/defs.make 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/make/defs.make 2010-10-31 14:03:01.000000000 -0700 @@ -119,13 +119,23 @@ # Windows should have OS predefined ifeq ($(OS),) @@ -4228,9 +4123,9 @@ else OSNAME=solaris endif ---- ./hotspot/make/linux/makefiles/defs.make 2010-07-09 01:48:43.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/defs.make 2010-07-11 09:11:39.000000000 -0700 -@@ -100,28 +100,31 @@ +--- ./hotspot/make/linux/makefiles/defs.make 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/defs.make 2010-10-31 14:24:05.000000000 -0700 +@@ -116,33 +116,36 @@ JDK_INCLUDE_SUBDIR=linux @@ -4245,30 +4140,35 @@ # client and server subdirectories have symbolic links to ../libjsig.so -EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) - EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server + + ifndef BUILD_CLIENT_ONLY EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) + endif + ifneq ($(ZERO_BUILD), true) ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so -- EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so -+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) - EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar - else - ifeq ($(ARCH),ia64) - else -- 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 - endif ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) endif ---- ./hotspot/make/sa.files 2010-07-09 01:48:43.000000000 -0700 -+++ ./hotspot/make/sa.files 2010-07-11 09:11:40.000000000 -0700 + endif + + # Serviceability Binaries + # No SA Support for PPC, IA64, ARM or zero +-ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ ++ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ + $(EXPORT_LIB_DIR)/sa-jdi.jar +-ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ ++ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ + $(EXPORT_LIB_DIR)/sa-jdi.jar + ADD_SA_BINARIES/ppc = + ADD_SA_BINARIES/ia64 = +--- ./hotspot/make/sa.files 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/make/sa.files 2010-06-15 22:03:19.000000000 -0700 @@ -50,6 +50,9 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \ @@ -4289,9 +4189,9 @@ $(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-07-09 01:48:43.000000000 -0700 -+++ ./hotspot/make/solaris/makefiles/defs.make 2010-07-11 09:11:40.000000000 -0700 -@@ -61,30 +61,33 @@ +--- ./hotspot/make/solaris/makefiles/defs.make 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/make/solaris/makefiles/defs.make 2010-10-31 14:25:25.000000000 -0700 +@@ -61,34 +61,37 @@ JDK_INCLUDE_SUBDIR=solaris @@ -4303,11 +4203,13 @@ EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html - # client and server subdirectories have symbolic links to ../libjsig.so +-# client and server subdirectories have symbolic links to ../libjsig.so -EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so ++# client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX) +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server + ifneq ($(BUILD_CLIENT_ONLY),true) EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.so @@ -4315,30 +4217,33 @@ +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX) +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) + endif ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so -- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so -- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so +- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so -- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) + ifneq ($(BUILD_CLIENT_ONLY), true) +- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so +- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so ++ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) ++ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) + endif endif -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-07-09 01:48:44.000000000 -0700 -+++ ./hotspot/make/windows/makefiles/defs.make 2010-07-11 09:11:40.000000000 -0700 +--- ./hotspot/make/windows/makefiles/defs.make 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/make/windows/makefiles/defs.make 2010-07-10 12:30:12.000000000 -0700 @@ -109,6 +109,9 @@ JDK_INCLUDE_SUBDIR=win32 @@ -4380,8 +4285,21 @@ 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-07-09 01:48:44.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-07-11 09:11:41.000000000 -0700 +--- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-10-31 14:03:01.000000000 -0700 +@@ -469,8 +469,8 @@ + // Fetch the exception from TLS and clear out exception related thread state + __ get_thread(rsi); + __ movptr(rax, Address(rsi, JavaThread::exception_oop_offset())); +- __ movptr(Address(rsi, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD); +- __ movptr(Address(rsi, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD); ++ __ movptr(Address(rsi, JavaThread::exception_oop_offset()), (intptr_t)NULL_WORD); ++ __ movptr(Address(rsi, JavaThread::exception_pc_offset()), (intptr_t)NULL_WORD); + + __ bind(_unwind_handler_entry); + __ verify_not_null_oop(rax); +--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-10-31 14:03:01.000000000 -0700 @@ -1153,7 +1153,7 @@ int recvr_offset = in_bytes(VirtualCallData::receiver_offset(start_row)); set_mdp_data_at(mdp, recvr_offset, receiver); @@ -4400,8 +4318,8 @@ // index is positive and so should have correct value if this code were // used on 64bits imulptr(index, reg2); ---- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-07-09 01:48:45.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-07-11 09:11:41.000000000 -0700 +--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-11-04 16:12:13.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-06-15 22:03:21.000000000 -0700 @@ -26,7 +26,7 @@ #ifndef _JAVASOFT_JNI_MD_H_ #define _JAVASOFT_JNI_MD_H_ @@ -4411,8 +4329,8 @@ #define JNIEXPORT #define JNIIMPORT #define JNICALL ---- ./hotspot/src/os/bsd/launcher/java_md.c 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/launcher/java_md.c 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/launcher/java_md.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/launcher/java_md.c 2010-10-31 14:26:55.000000000 -0700 @@ -45,8 +45,15 @@ #include "version_comp.h" #endif @@ -4429,7 +4347,7 @@ #ifndef GAMMA /* launcher.make defines ARCH */ -@@ -112,7 +119,7 @@ +@@ -116,7 +123,7 @@ * A collection of useful strings. One should think of these as #define * entries, but actual strings can be more efficient (with many compilers). */ @@ -4438,7 +4356,7 @@ static const char *system_dir = "/usr/java"; static const char *user_dir = "/java"; #else /* Solaris */ -@@ -456,10 +463,10 @@ +@@ -460,10 +467,10 @@ * If not on Solaris, assume only a single LD_LIBRARY_PATH * variable. */ @@ -4451,7 +4369,7 @@ /* * On bsd, if a binary is running as sgid or suid, glibc sets * LD_LIBRARY_PATH to the empty string for security purposes. (In -@@ -472,7 +479,7 @@ +@@ -476,7 +483,7 @@ * return from the function now. Getting the right libraries to * be found must be handled through other mechanisms. */ @@ -4460,7 +4378,7 @@ return; } #endif -@@ -483,7 +490,7 @@ +@@ -487,7 +494,7 @@ new_runpath = MemAlloc( ((runpath!=NULL)?strlen(runpath):0) + 2*strlen(jrepath) + 2*strlen(arch) + strlen(jvmpath) + 52); @@ -4469,7 +4387,7 @@ /* -@@ -498,7 +505,7 @@ +@@ -502,7 +509,7 @@ /* jvmpath, ((running != wanted)?((wanted==64)?"/"BIG_ARCH:"/.."):""), */ @@ -4478,7 +4396,7 @@ "%s:" "%s/lib/%s:" "%s/../lib/%s", -@@ -836,7 +843,7 @@ +@@ -840,7 +847,7 @@ jboolean GetApplicationHome(char *buf, jint bufsize) { @@ -4487,7 +4405,7 @@ char *execname = GetExecname(); if (execname) { strncpy(buf, execname, bufsize-1); -@@ -1005,7 +1012,7 @@ +@@ -1009,7 +1016,7 @@ } } } @@ -4496,7 +4414,7 @@ { const char* self = "/proc/self/exe"; char buf[PATH_MAX+1]; -@@ -1015,7 +1022,7 @@ +@@ -1019,7 +1026,7 @@ exec_path = strdup(buf); } } @@ -4505,7 +4423,7 @@ { /* Not implemented */ } -@@ -1220,7 +1227,7 @@ +@@ -1224,7 +1231,7 @@ #endif /* __sun && i586 */ @@ -4514,7 +4432,7 @@ /* * A utility method for asking the CPU about itself. -@@ -1286,7 +1293,7 @@ +@@ -1290,7 +1297,7 @@ #endif } @@ -4523,7 +4441,7 @@ #ifdef i586 /* -@@ -1465,7 +1472,7 @@ +@@ -1469,7 +1476,7 @@ #endif /* __sun && i586 */ @@ -4532,7 +4450,7 @@ /* The definition of a server-class machine for bsd-i586 */ jboolean -@@ -1496,7 +1503,7 @@ +@@ -1500,7 +1507,7 @@ return result; } @@ -4541,7 +4459,7 @@ /* Dispatch to the platform-specific definition of "server-class" */ jboolean -@@ -1506,7 +1513,7 @@ +@@ -1510,7 +1517,7 @@ result = solaris_sparc_ServerClassMachine(); #elif defined(__sun) && defined(i586) result = solaris_i586_ServerClassMachine(); @@ -4550,51 +4468,9 @@ result = bsd_i586_ServerClassMachine(); #else if (_launcher_debug) { ---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 -@@ -179,33 +179,20 @@ - struct sockaddr_un addr; - addr.sun_family = AF_UNIX; - -- // FIXME: Prior to b39 the tool-side API expected to find the well -- // known file in the working directory. To allow this libjvm.so work with -- // a pre-b39 SDK we create it in the working directory if -- // +StartAttachListener is used is used. All unit tests for this feature -- // currently used this flag. Once b39 SDK has been promoted we can remove -- // this code. -- if (StartAttachListener) { -- sprintf(path, ".java_pid%d", os::current_process_id()); -- strcpy(addr.sun_path, path); -- ::unlink(path); -- res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr)); -- } -- if (res == -1) { -- snprintf(path, PATH_MAX+1, "%s/.java_pid%d", -- os::get_temp_directory(), os::current_process_id()); -- strcpy(addr.sun_path, path); -- ::unlink(path); -- res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr)); -- } -+ snprintf(path, PATH_MAX+1, "%s/.java_pid%d", -+ os::get_temp_directory(), os::current_process_id()); -+ strcpy(addr.sun_path, path); -+ ::unlink(path); -+ res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr)); - if (res == -1) { - RESTARTABLE(::close(listener), res); - return -1; - } - set_path(path); - -- // put in listen mode and set permission -- if ((::listen(listener, 5) == -1) || (::chmod(path, S_IREAD|S_IWRITE) == -1)) { -+ // put in listen mode and set permission and ownership -+ if ((::listen(listener, 5) == -1) || (::chmod(path, S_IREAD|S_IWRITE) == -1) || -+ (::chown(path, geteuid(), getegid()) == -1)) { - RESTARTABLE(::close(listener), res); - ::unlink(path); - set_path(NULL); -@@ -331,6 +318,15 @@ +--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-10-31 14:58:17.000000000 -0700 +@@ -334,6 +334,15 @@ // get the credentials of the peer and check the effective uid/guid // - check with jeff on this. @@ -4610,7 +4486,7 @@ struct ucred cred_info; socklen_t optlen = sizeof(cred_info); if (::getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void*)&cred_info, &optlen) == -1) { -@@ -338,10 +334,13 @@ +@@ -341,10 +350,13 @@ RESTARTABLE(::close(s), res); continue; } @@ -4625,7 +4501,7 @@ int res; RESTARTABLE(::close(s), res); continue; -@@ -461,16 +460,13 @@ +@@ -464,16 +476,13 @@ if (init_at_startup() || is_initialized()) { return false; // initialized at startup or already initialized } @@ -4648,8 +4524,8 @@ if (ret == 0) { // simple check to avoid starting the attach mechanism when // a bogus user creates the file ---- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-07-04 09:31:26.000000000 -0700 @@ -28,6 +28,14 @@ # include <sys/param.h> # include <dlfcn.h> @@ -4679,8 +4555,8 @@ #endif *(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */ ---- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-07-04 09:31:26.000000000 -0700 @@ -36,7 +36,7 @@ // HPI_FileInterface @@ -4731,8 +4607,8 @@ } ---- ./hotspot/src/os/bsd/vm/jsig.c 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/jsig.c 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/jsig.c 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/jsig.c 2010-07-04 09:31:26.000000000 -0700 @@ -143,7 +143,8 @@ } @@ -4743,8 +4619,8 @@ } static int call_os_sigaction(int sig, const struct sigaction *act, ---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-07-04 09:31:26.000000000 -0700 @@ -144,38 +144,31 @@ "ILL", SIGILL, /* Illegal instruction (ANSI). */ "TRAP", SIGTRAP, /* Trace trap (POSIX). */ @@ -4794,8 +4670,8 @@ }; JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name)) ---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-07-04 09:31:26.000000000 -0700 @@ -51,7 +51,11 @@ #define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"} @@ -4829,8 +4705,8 @@ #endif /* JVM_MD_H */ // Reconciliation History ---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-07-04 09:31:26.000000000 -0700 @@ -28,8 +28,8 @@ void OSThread::pd_initialize() { @@ -4842,8 +4718,8 @@ _siginfo = NULL; _ucontext = NULL; _expanding_stack = 0; ---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-07-04 09:31:26.000000000 -0700 @@ -36,6 +36,12 @@ private: @@ -4901,9 +4777,9 @@ pthread_t pthread_id() const { return _pthread_id; } ---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 -@@ -44,20 +44,42 @@ +--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-10-31 15:03:20.000000000 -0700 +@@ -46,20 +46,42 @@ # include <sys/utsname.h> # include <sys/socket.h> # include <sys/wait.h> @@ -4947,7 +4823,7 @@ #define MAX_PATH (2 * K) // for timer info max values which include all bits -@@ -68,19 +90,25 @@ +@@ -70,19 +92,25 @@ // global variables julong os::Bsd::_physical_memory = 0; @@ -4973,7 +4849,7 @@ static jlong initial_time_count=0; -@@ -98,8 +126,6 @@ +@@ -100,8 +128,6 @@ static int SR_signum = SIGUSR2; sigset_t SR_sigset; @@ -4982,7 +4858,7 @@ //////////////////////////////////////////////////////////////////////////////// // utility functions -@@ -112,11 +138,16 @@ +@@ -114,11 +140,16 @@ } julong os::Bsd::available_memory() { @@ -4999,7 +4875,7 @@ } julong os::physical_memory() { -@@ -164,6 +195,7 @@ +@@ -166,6 +197,7 @@ } @@ -5007,7 +4883,7 @@ #ifndef SYS_gettid // i386: 224, ia64: 1105, amd64: 186, sparc 143 #ifdef __ia64__ -@@ -178,6 +210,7 @@ +@@ -180,6 +212,7 @@ #error define gettid for the arch #endif #endif @@ -5015,7 +4891,7 @@ // Cpu architecture string #if defined(ZERO) -@@ -199,6 +232,7 @@ +@@ -205,6 +238,7 @@ #endif @@ -5023,12 +4899,12 @@ // pid_t gettid() // // Returns the kernel thread id of the currently running thread. Kernel -@@ -225,7 +259,48 @@ +@@ -231,7 +265,48 @@ static const char *unstable_chroot_error = "/proc file system not found.\n" "Java may be unstable running multithreaded in a chroot " "environment on Bsd when /proc filesystem is not mounted."; +#endif -+ + +#ifdef _ALLBSD_SOURCE +void os::Bsd::initialize_system_info() { + int mib[2]; @@ -5057,7 +4933,7 @@ + _physical_memory = mem_val; + else + _physical_memory = 256*1024*1024; // fallback (XXXBSD?) - ++ +#ifdef __OpenBSD__ + { + // limit _physical_memory memory view on OpenBSD since @@ -5072,7 +4948,7 @@ void os::Bsd::initialize_system_info() { set_processor_count(sysconf(_SC_NPROCESSORS_CONF)); if (processor_count() == 1) { -@@ -242,6 +317,7 @@ +@@ -248,6 +323,7 @@ _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE); assert(processor_count() > 0, "bsd error"); } @@ -5080,7 +4956,7 @@ void os::init_system_properties_values() { // char arch[12]; -@@ -285,9 +361,7 @@ +@@ -291,9 +367,7 @@ * ... * 7: The default directories, normally /lib and /usr/lib. */ @@ -5091,7 +4967,7 @@ #define DEFAULT_LIBPATH "/lib:/usr/lib" #endif -@@ -366,7 +440,11 @@ +@@ -372,7 +446,11 @@ * should always exist (until the legacy problem cited above is * addressed). */ @@ -5103,7 +4979,7 @@ if (v != NULL) { char *t = ld_library_path; /* That's +1 for the colon and +1 for the trailing '\0' */ -@@ -525,6 +603,7 @@ +@@ -531,6 +609,7 @@ } } @@ -5111,7 +4987,7 @@ ////////////////////////////////////////////////////////////////////////////// // detecting pthread library -@@ -688,6 +767,7 @@ +@@ -694,6 +773,7 @@ } return false; } @@ -5119,7 +4995,7 @@ ////////////////////////////////////////////////////////////////////////////// // create new thread -@@ -696,6 +776,9 @@ +@@ -702,6 +782,9 @@ // check if it's safe to start a new thread static bool _thread_safety_check(Thread* thread) { @@ -5129,7 +5005,7 @@ if (os::Bsd::is_BsdThreads() && !os::Bsd::is_floating_stack()) { // Fixed stack BsdThreads (SuSE Bsd/x86, and some versions of Redhat) // Heap is mmap'ed at lower end of memory space. Thread stacks are -@@ -729,6 +812,7 @@ +@@ -735,6 +818,7 @@ // here, that means enough space has been reserved for stack. return true; } @@ -5137,7 +5013,7 @@ } // Thread start routine for all newly created threads -@@ -756,6 +840,10 @@ +@@ -762,6 +846,10 @@ return NULL; } @@ -5148,7 +5024,7 @@ // thread_id is kernel thread id (similar to Solaris LWP id) osthread->set_thread_id(os::Bsd::gettid()); -@@ -765,6 +853,7 @@ +@@ -771,6 +859,7 @@ thread->set_lgrp_id(lgrp_id); } } @@ -5156,7 +5032,7 @@ // initialize signal mask for this thread os::Bsd::hotspot_sigmask(thread); -@@ -845,17 +934,22 @@ +@@ -851,17 +940,22 @@ // let pthread_create() pick the default value. } @@ -5179,7 +5055,7 @@ pthread_t tid; int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread); -@@ -869,7 +963,9 @@ +@@ -875,7 +969,9 @@ // Need to clean up stuff we've allocated so far thread->set_osthread(NULL); delete osthread; @@ -5189,7 +5065,7 @@ return false; } -@@ -885,9 +981,11 @@ +@@ -891,9 +987,11 @@ } } @@ -5201,7 +5077,7 @@ } // Aborted due to thread limit being reached -@@ -925,7 +1023,11 @@ +@@ -931,7 +1029,11 @@ } // Store pthread info into the OSThread @@ -5213,7 +5089,7 @@ osthread->set_pthread_id(::pthread_self()); // initialize floating point control register -@@ -936,6 +1038,7 @@ +@@ -942,6 +1044,7 @@ thread->set_osthread(osthread); @@ -5221,7 +5097,7 @@ if (UseNUMA) { int lgrp_id = os::numa_get_group_id(); if (lgrp_id != -1) { -@@ -962,6 +1065,7 @@ +@@ -968,6 +1071,7 @@ os::Bsd::manually_expand_stack(jt, addr); osthread->clear_expanding_stack(); } @@ -5229,7 +5105,7 @@ // initialize signal mask for this thread // and save the caller's signal mask -@@ -1020,6 +1124,7 @@ +@@ -1026,6 +1130,7 @@ ////////////////////////////////////////////////////////////////////////////// // initial thread @@ -5237,7 +5113,7 @@ // Check if current thread is the initial thread, similar to Solaris thr_main. bool os::Bsd::is_initial_thread(void) { char dummy; -@@ -1253,6 +1358,7 @@ +@@ -1262,6 +1367,7 @@ _initial_thread_stack_size = align_size_down(_initial_thread_stack_size, page_size()); _initial_thread_stack_bottom = (address)stack_top - _initial_thread_stack_size; } @@ -5245,7 +5121,7 @@ //////////////////////////////////////////////////////////////////////////////// // time support -@@ -1274,9 +1380,7 @@ +@@ -1283,9 +1389,7 @@ return (1000 * 1000); } @@ -5256,7 +5132,7 @@ bool os::supports_vtime() { return false; } bool os::enable_vtime() { return false; } bool os::vtime_enabled() { return false; } -@@ -1296,6 +1400,21 @@ +@@ -1305,6 +1409,21 @@ #define CLOCK_MONOTONIC (1) #endif @@ -5278,7 +5154,7 @@ void os::Bsd::clock_init() { // we do dlopen's in this particular order due to bug in bsd // dynamical loader (see 6348968) leading to crash on exit -@@ -1331,7 +1450,9 @@ +@@ -1340,7 +1459,9 @@ } } } @@ -5288,7 +5164,7 @@ #ifndef SYS_clock_getres #if defined(IA32) || defined(AMD64) -@@ -1370,6 +1491,7 @@ +@@ -1381,6 +1502,7 @@ _pthread_getcpuclockid = pthread_getcpuclockid_func; } } @@ -5296,7 +5172,7 @@ jlong os::javaTimeNanos() { if (Bsd::supports_monotonic_clock()) { -@@ -1520,7 +1642,14 @@ +@@ -1531,7 +1653,14 @@ // DLL functions @@ -5312,7 +5188,7 @@ const char* os::get_temp_directory() { const char *prop = Arguments::get_property("java.io.tmpdir"); -@@ -1541,13 +1670,13 @@ +@@ -1552,13 +1681,13 @@ const size_t pnamelen = pname ? strlen(pname) : 0; // Quietly truncate on buffer overflow. Should be an error. @@ -5328,7 +5204,7 @@ } else if (strchr(pname, *os::path_separator()) != NULL) { int n; char** pelements = split_path(pname, &n); -@@ -1556,7 +1685,8 @@ +@@ -1567,7 +1696,8 @@ if (pelements[i] == NULL || strlen(pelements[i]) == 0) { continue; // skip the empty path values } @@ -5338,7 +5214,7 @@ if (file_exists(buffer)) { break; } -@@ -1571,7 +1701,7 @@ +@@ -1582,7 +1712,7 @@ FREE_C_HEAP_ARRAY(char*, pelements); } } else { @@ -5347,7 +5223,7 @@ } } -@@ -1612,6 +1742,23 @@ +@@ -1623,6 +1753,23 @@ } } @@ -5371,7 +5247,7 @@ struct _address_to_library_name { address addr; // input : memory address size_t buflen; // size of fname -@@ -1686,11 +1833,27 @@ +@@ -1697,11 +1844,27 @@ return false; } } @@ -5399,7 +5275,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { void * result= ::dlopen(filename, RTLD_LAZY); -@@ -1743,6 +1906,26 @@ +@@ -1754,6 +1917,26 @@ #define EM_486 6 /* Intel 80486 */ #endif @@ -5426,7 +5302,7 @@ static const arch_t arch_array[]={ {EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"}, {EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"}, -@@ -1846,17 +2029,11 @@ +@@ -1857,17 +2040,11 @@ return NULL; } @@ -5447,7 +5323,7 @@ } -@@ -1879,7 +2056,51 @@ +@@ -1890,7 +2067,51 @@ void os::print_dll_info(outputStream *st) { st->print_cr("Dynamic libraries:"); @@ -5500,7 +5376,7 @@ char fname[32]; pid_t pid = os::Bsd::gettid(); -@@ -1888,6 +2109,7 @@ +@@ -1899,6 +2120,7 @@ if (!_print_ascii_file(fname, st)) { st->print("Can not get library information for pid = %d\n", pid); } @@ -5508,7 +5384,7 @@ } -@@ -1920,6 +2142,7 @@ +@@ -1933,6 +2155,7 @@ st->print(name.machine); st->cr(); @@ -5516,7 +5392,7 @@ // Print warning if unsafe chroot environment detected if (unsafe_chroot_detected) { st->print("WARNING!! "); -@@ -1934,6 +2157,7 @@ +@@ -1947,6 +2170,7 @@ st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed"); } st->cr(); @@ -5524,7 +5400,7 @@ // rlimit st->print("rlimit:"); -@@ -1959,6 +2183,7 @@ +@@ -1972,6 +2196,7 @@ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); else st->print("%d", rlim.rlim_cur); @@ -5532,15 +5408,20 @@ st->print(", AS "); getrlimit(RLIMIT_AS, &rlim); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); -@@ -1971,6 +2196,7 @@ +@@ -1984,11 +2209,7 @@ os::loadavg(loadavg, 3); st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]); st->cr(); +- +- // meminfo +- st->print("\n/proc/meminfo:\n"); +- _print_ascii_file("/proc/meminfo", st); +- st->cr(); +#endif } void os::print_memory_info(outputStream* st) { -@@ -1978,18 +2204,22 @@ +@@ -1996,18 +2217,27 @@ st->print("Memory:"); st->print(" %dk page", os::vm_page_size()>>10); @@ -5560,10 +5441,15 @@ st->print("(" UINT64_FORMAT "k free)", ((jlong)si.freeswap * si.mem_unit) >> 10); +#endif ++ st->cr(); ++ ++ // meminfo ++ st->print("\n/proc/meminfo:\n"); ++ _print_ascii_file("/proc/meminfo", st); st->cr(); } -@@ -2216,19 +2446,29 @@ +@@ -2250,19 +2480,29 @@ static volatile jint pending_signals[NSIG+1] = { 0 }; // Bsd(POSIX) specific hand shaking semaphore. @@ -5595,7 +5481,7 @@ } static int check_pending_signals(bool wait) { -@@ -2250,7 +2490,7 @@ +@@ -2284,7 +2524,7 @@ do { thread->set_suspend_equivalent(); // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self() @@ -5604,7 +5490,7 @@ // were we externally suspended while we were waiting? threadIsSuspended = thread->handle_special_suspend_equivalent_condition(); -@@ -2261,7 +2501,7 @@ +@@ -2295,7 +2535,7 @@ // while suspended because that would surprise the thread that // suspended us. // @@ -5613,7 +5499,7 @@ thread->java_suspend_self(); } -@@ -2305,10 +2545,10 @@ +@@ -2339,10 +2579,10 @@ return; } @@ -5626,7 +5512,7 @@ os::get_temp_directory(), os::current_process_id(), num); unlink(buf); -@@ -2334,9 +2574,14 @@ +@@ -2368,9 +2608,14 @@ // problem. bool os::commit_memory(char* addr, size_t size, bool exec) { int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; @@ -5641,7 +5527,7 @@ } bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, -@@ -2352,36 +2597,27 @@ +@@ -2386,36 +2631,27 @@ } void os::numa_make_global(char *addr, size_t bytes) { @@ -5683,7 +5569,7 @@ } bool os::get_page_info(char *start, page_info* info) { -@@ -2392,6 +2628,7 @@ +@@ -2426,6 +2662,7 @@ return end; } @@ -5691,22 +5577,20 @@ extern "C" void numa_warn(int number, char *where, ...) { } extern "C" void numa_error(char *where) { } -@@ -2493,95 +2730,27 @@ +@@ -2527,104 +2764,26 @@ os::Bsd::numa_tonode_memory_func_t os::Bsd::_numa_tonode_memory; os::Bsd::numa_interleave_memory_func_t os::Bsd::_numa_interleave_memory; unsigned long* os::Bsd::_numa_all_nodes; +#endif bool os::uncommit_memory(char* addr, size_t size) { -- return ::mmap(addr, size, PROT_NONE, +#ifdef __OpenBSD__ + // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD + return ::mprotect(addr, size, PROT_NONE) == 0; +#else -+ return ::mmap(addr, size, -+ PROT_READ|PROT_WRITE|PROT_EXEC, - MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0) - != MAP_FAILED; + uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE, + MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0); + return res != (uintptr_t) MAP_FAILED; +#endif } @@ -5773,10 +5657,14 @@ -// where we're going to put our guard pages, truncate the mapping at -// that point by munmap()ping it. This ensures that when we later -// munmap() the guard pages we don't leave a hole in the stack --// mapping. +-// mapping. This only affects the main/initial thread, but guard +-// against future OS changes bool os::create_stack_guard_pages(char* addr, size_t size) { - uintptr_t stack_extent, stack_base; -- if (get_stack_bounds(&stack_extent, &stack_base)) { +- bool chk_bounds = NOT_DEBUG(os::Bsd::is_initial_thread()) DEBUG_ONLY(true); +- if (chk_bounds && get_stack_bounds(&stack_extent, &stack_base)) { +- assert(os::Bsd::is_initial_thread(), +- "growable stack in non-initial thread"); - if (stack_extent < (uintptr_t)addr) - ::munmap((void*)stack_extent, (uintptr_t)addr - stack_extent); - } @@ -5785,17 +5673,23 @@ } // If this is a growable mapping, remove the guard pages entirely by - // munmap()ping them. If not, just call uncommit_memory(). +-// munmap()ping them. If not, just call uncommit_memory(). This only +-// affects the main/initial thread, but guard against future OS changes ++// munmap()ping them. If not, just call uncommit_memory(). bool os::remove_stack_guard_pages(char* addr, size_t size) { - uintptr_t stack_extent, stack_base; -- if (get_stack_bounds(&stack_extent, &stack_base)) { +- bool chk_bounds = NOT_DEBUG(os::Bsd::is_initial_thread()) DEBUG_ONLY(true); +- if (chk_bounds && get_stack_bounds(&stack_extent, &stack_base)) { +- assert(os::Bsd::is_initial_thread(), +- "growable stack in non-initial thread"); +- - return ::munmap(addr, size) == 0; - } - return os::uncommit_memory(addr, size); } -@@ -2686,6 +2855,9 @@ +@@ -2729,6 +2888,9 @@ static size_t _large_page_size = 0; bool os::large_page_init() { @@ -5805,7 +5699,7 @@ if (!UseLargePages) return false; if (LargePageSizeInBytes) { -@@ -2742,6 +2914,7 @@ +@@ -2786,6 +2948,7 @@ // We optimistically assume the support is available. If later it turns out // not true, VM will automatically switch to use regular page size. return true; @@ -5813,7 +5707,7 @@ } #ifndef SHM_HUGETLB -@@ -2918,7 +3091,7 @@ +@@ -2962,7 +3125,7 @@ } size_t os::read(int fd, void *buf, unsigned int nBytes) { @@ -5822,7 +5716,7 @@ } // TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation. -@@ -3054,6 +3227,44 @@ +@@ -3098,6 +3261,44 @@ // this reason, the code should not be used as default (ThreadPriorityPolicy=0). // It is only used when ThreadPriorityPolicy=1 and requires root privilege. @@ -5867,7 +5761,7 @@ int os::java_to_os_priority[MaxPriority + 1] = { 19, // 0 Entry should never be used -@@ -3071,6 +3282,7 @@ +@@ -3115,6 +3316,7 @@ -5 // 10 MaxPriority }; @@ -5875,7 +5769,7 @@ static int prio_init() { if (ThreadPriorityPolicy == 1) { -@@ -3090,8 +3302,28 @@ +@@ -3134,8 +3336,28 @@ OSReturn os::set_native_priority(Thread* thread, int newpri) { if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK; @@ -5904,7 +5798,7 @@ } OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) { -@@ -3101,7 +3333,17 @@ +@@ -3145,7 +3367,17 @@ } errno = 0; @@ -5922,7 +5816,7 @@ return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR); } -@@ -3211,7 +3453,7 @@ +@@ -3255,7 +3487,7 @@ /* Get signal number to use for suspend/resume */ if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) { int sig = ::strtol(s, 0, 10); @@ -5931,7 +5825,7 @@ SR_signum = sig; } } -@@ -3555,6 +3797,28 @@ +@@ -3599,6 +3831,28 @@ set_signal_handler(SIGFPE, true); set_signal_handler(SIGXFSZ, true); @@ -5960,7 +5854,7 @@ if (libjsig_is_loaded) { // Tell libjsig jvm finishes setting signal handlers (*end_signal_setting)(); -@@ -3575,6 +3839,7 @@ +@@ -3619,6 +3873,7 @@ } } @@ -5968,7 +5862,7 @@ // This is the fastest way to get thread cpu time on Bsd. // Returns cpu time (user+sys) for any thread, not only for current. // POSIX compliant clocks are implemented in the kernels 2.6.16+. -@@ -3589,6 +3854,7 @@ +@@ -3633,6 +3888,7 @@ return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec; } @@ -5976,7 +5870,7 @@ ///// // glibc on Bsd platform uses non-documented flag -@@ -3810,13 +4076,13 @@ +@@ -3854,13 +4110,13 @@ _initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid(); @@ -5992,7 +5886,7 @@ if (Bsd::page_size() == -1) { fatal(err_msg("os_bsd.cpp: os::init: sysconf failed (%s)", strerror(errno))); -@@ -3830,7 +4096,16 @@ +@@ -3874,7 +4130,16 @@ Bsd::clock_init(); initial_time_count = os::elapsed_counter(); @@ -6010,7 +5904,7 @@ } // To install functions for atexit system call -@@ -3843,7 +4118,9 @@ +@@ -3887,7 +4152,9 @@ // this is called _after_ the global arguments have been parsed jint os::init_2(void) { @@ -6020,7 +5914,7 @@ // Allocate a single page and mark it as readable for safepoint polling address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); -@@ -3892,6 +4169,7 @@ +@@ -3936,6 +4203,7 @@ JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes, vm_page_size())); @@ -6028,7 +5922,7 @@ Bsd::capture_initial_stack(JavaThread::stack_size_at_create()); Bsd::libpthread_init(); -@@ -3914,6 +4192,7 @@ +@@ -3958,6 +4226,7 @@ UseNUMA = true; } } @@ -6036,7 +5930,7 @@ if (MaxFDLimit) { // set the number of file descriptors to max. print out error -@@ -3925,6 +4204,14 @@ +@@ -3969,6 +4238,14 @@ perror("os::init_2 getrlimit failed"); } else { nbr_files.rlim_cur = nbr_files.rlim_max; @@ -6051,7 +5945,7 @@ status = setrlimit(RLIMIT_NOFILE, &nbr_files); if (status != 0) { if (PrintMiscellaneous && (Verbose || WizardMode)) -@@ -3933,8 +4220,10 @@ +@@ -3977,8 +4254,10 @@ } } @@ -6062,7 +5956,7 @@ // Initialize HPI. jint hpi_result = hpi::initialize(); -@@ -3982,11 +4271,15 @@ +@@ -4029,11 +4308,15 @@ }; int os::active_processor_count() { @@ -6078,7 +5972,7 @@ } bool os::distribute_processes(uint length, uint* distribution) { -@@ -4028,6 +4321,9 @@ +@@ -4075,6 +4358,9 @@ int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime) { @@ -6088,7 +5982,7 @@ if (is_NPTL()) { return pthread_cond_timedwait(_cond, _mutex, _abstime); } else { -@@ -4043,6 +4339,7 @@ +@@ -4090,6 +4376,7 @@ #endif // IA64 return status; } @@ -6096,7 +5990,7 @@ } //////////////////////////////////////////////////////////////////////////////// -@@ -4178,17 +4475,17 @@ +@@ -4222,17 +4509,17 @@ if (!rewrite_existing) { oflags |= O_EXCL; } @@ -6117,7 +6011,7 @@ } // Map a block of memory. -@@ -4238,6 +4535,7 @@ +@@ -4282,6 +4569,7 @@ return munmap(addr, bytes) == 0; } @@ -6125,7 +6019,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time); static clockid_t thread_cpu_clockid(Thread* thread) { -@@ -4249,6 +4547,7 @@ +@@ -4293,6 +4581,7 @@ assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code"); return clockid; } @@ -6133,7 +6027,7 @@ // current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool) // are used by JVM M&M and JVMTI to get user+sys or user CPU time -@@ -4258,39 +4557,71 @@ +@@ -4302,39 +4591,71 @@ // the fast estimate available on the platform. jlong os::current_thread_cpu_time() { @@ -6205,7 +6099,7 @@ // // -1 on error. // -@@ -4379,6 +4710,7 @@ +@@ -4424,6 +4745,7 @@ return (jlong)user_time * (1000000000 / clock_tics_per_sec); } } @@ -6213,7 +6107,7 @@ void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) { info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits -@@ -4395,7 +4727,13 @@ +@@ -4440,7 +4762,13 @@ } bool os::is_thread_cpu_time_supported() { @@ -6227,7 +6121,7 @@ } // System loadavg support. Returns -1 if load average cannot be obtained. -@@ -4528,7 +4866,7 @@ +@@ -4573,7 +4901,7 @@ // abstime will be the absolute timeout time // TODO: replace compute_abstime() with unpackTime() @@ -6236,7 +6130,7 @@ if (millis < 0) millis = 0; struct timeval now; int status = gettimeofday(&now, NULL); -@@ -4580,7 +4918,7 @@ +@@ -4625,7 +4953,7 @@ status = pthread_cond_wait(_cond, _mutex); // for some reason, under 2.7 lwp_cond_wait() may return ETIME ... // Treat this the same as if the wait was interrupted @@ -6245,7 +6139,7 @@ assert_status(status == 0 || status == EINTR, status, "cond_wait"); } -- _nParked ; -@@ -4638,10 +4976,10 @@ +@@ -4683,10 +5011,10 @@ pthread_cond_init (_cond, NULL) ; } assert_status(status == 0 || status == EINTR || @@ -6258,7 +6152,7 @@ // We consume and ignore EINTR and spurious wakeups. } --_nParked ; -@@ -4733,7 +5071,7 @@ +@@ -4778,7 +5106,7 @@ * years from "now". */ @@ -6267,7 +6161,7 @@ assert (time > 0, "convertTime"); struct timeval now; -@@ -4793,7 +5131,7 @@ +@@ -4838,7 +5166,7 @@ } // Next, demultiplex/decode time arguments @@ -6276,7 +6170,7 @@ if (time < 0) { // don't wait at all return; } -@@ -4847,7 +5185,7 @@ +@@ -4892,7 +5220,7 @@ } } assert_status(status == 0 || status == EINTR || @@ -6285,7 +6179,7 @@ status, "cond_timedwait"); #ifdef ASSERT -@@ -4890,14 +5228,12 @@ +@@ -4935,14 +5263,12 @@ } @@ -6305,7 +6199,7 @@ #endif // Run the specified command in a separate process. Return its exit value, -@@ -4912,8 +5248,7 @@ +@@ -4957,8 +5283,7 @@ // separate process to execve. Make a direct syscall to fork process. // On IA64 there's no fork syscall, we have to use fork() and hope for // the best... @@ -6315,7 +6209,7 @@ if (pid < 0) { // fork failed -@@ -4929,8 +5264,7 @@ +@@ -4974,8 +5299,7 @@ // in the new process, so make a system call directly. // IA64 should use normal execve() from glibc to match the glibc fork() // above. @@ -6325,8 +6219,8 @@ // execve failed _exit(-1); ---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-07-04 09:31:26.000000000 -0700 @@ -27,6 +27,12 @@ /* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */ typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *); @@ -6463,8 +6357,8 @@ // Stack repair handling ---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-07-04 09:31:26.000000000 -0700 @@ -61,7 +61,15 @@ inline bool os::allocate_stack_guard_pages() { @@ -6481,8 +6375,8 @@ } ---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-07-11 09:11:42.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-07-04 09:31:26.000000000 -0700 @@ -241,7 +241,7 @@ char* pwbuf = NEW_C_HEAP_ARRAY(char, bufsize); @@ -6492,7 +6386,55 @@ 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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os/bsd/vm/vtune_bsd.cpp 1969-12-31 16:00:00.000000000 -0800 ++++ ./hotspot/src/os/bsd/vm/vtune_bsd.cpp 2010-07-04 09:31:26.000000000 -0700 +@@ -0,0 +1,45 @@ ++/* ++ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++#include "incls/_precompiled.incl" ++#include "incls/_vtune_bsd.cpp.incl" ++ ++// empty implementation ++ ++void VTune::start_GC() {} ++void VTune::end_GC() {} ++void VTune::start_class_load() {} ++void VTune::end_class_load() {} ++void VTune::exit() {} ++void VTune::register_stub(const char* name, address start, address end) {} ++ ++void VTune::create_nmethod(nmethod* nm) {} ++void VTune::delete_nmethod(nmethod* nm) {} ++ ++void vtune_init() {} ++ ++ ++// Reconciliation History ++// vtune_solaris.cpp 1.8 99/07/12 23:54:21 ++// End +--- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,45 +0,0 @@ -/* @@ -6540,7 +6482,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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,206 +0,0 @@ -/* @@ -6749,7 +6691,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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800 @@ -1,27 +0,0 @@ -// @@ -6779,7 +6721,7 @@ -// - -// SPARC Bsd Architecture Description File ---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800 @@ -1,105 +0,0 @@ -# @@ -6887,7 +6829,7 @@ - ta 0x03 - retl - mov %fp, %o0 ---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,36 +0,0 @@ -/* @@ -6926,11 +6868,11 @@ -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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,102 +0,0 @@ -/* -- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -6967,8 +6909,8 @@ -} - -inline void OrderAccess::release() { -- jint* dummy = (jint*)&dummy; -- __asm__ volatile("stw %%g0, [%0]" : : "r" (dummy) : "memory"); +- jint* local_dummy = (jint*)&local_dummy; +- __asm__ volatile("stw %%g0, [%0]" : : "r" (local_dummy) : "memory"); -} - -inline void OrderAccess::fence() { @@ -7031,7 +6973,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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,648 +0,0 @@ -/* @@ -7682,7 +7624,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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,44 +0,0 @@ -/* @@ -7729,7 +7671,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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,40 +0,0 @@ -/* @@ -7772,7 +7714,7 @@ -inline void Prefetch::write(void *loc, intx interval) {} - -#endif ---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,37 +0,0 @@ -/* @@ -7812,7 +7754,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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,28 +0,0 @@ -/* @@ -7843,9 +7785,9 @@ - static Thread* thread() { - return (Thread*) os::thread_local_storage_at(thread_index()); - } ---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 -@@ -1,107 +0,0 @@ +@@ -1,110 +0,0 @@ -/* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -7953,7 +7895,10 @@ - // nothing else to try - return false; -} ---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-07-11 09:19:11.000000000 -0700 +- +-void JavaThread::cache_global_variables() { } +- +--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,98 +0,0 @@ -/* @@ -8054,7 +7999,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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,69 +0,0 @@ -/* @@ -8126,7 +8071,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-07-11 09:19:11.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-11-07 17:21:37.000000000 -0800 +++ ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800 @@ -1,61 +0,0 @@ -/* @@ -8190,8 +8135,8 @@ - - return features; -} ---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-07-24 14:30:52.000000000 -0700 @@ -21,6 +21,17 @@ # questions. # @@ -8324,7 +8269,7 @@ pushl %esi movl 4+12(%esp),%ecx # count pushl %edi -@@ -354,8 +385,8 @@ +@@ -355,8 +386,8 @@ # void* to, # size_t count) .p2align 4,,15 @@ -8335,7 +8280,7 @@ pushl %esi movl 4+12(%esp),%ecx # count pushl %edi -@@ -431,10 +462,10 @@ +@@ -432,10 +463,10 @@ # Equivalent to # arrayof_conjoint_jints .p2align 4,,15 @@ -8350,7 +8295,7 @@ pushl %esi movl 4+12(%esp),%ecx # count pushl %edi -@@ -494,7 +525,7 @@ +@@ -497,7 +528,7 @@ # # count treated as signed # @@ -8359,7 +8304,7 @@ # while (--count >= 0) { # *to++ = *from++; # } -@@ -504,8 +535,8 @@ +@@ -507,8 +538,8 @@ # } # } .p2align 4,,15 @@ -8370,7 +8315,7 @@ movl 4+8(%esp),%ecx # count movl 4+0(%esp),%eax # from movl 4+4(%esp),%edx # to -@@ -533,8 +564,8 @@ +@@ -536,8 +567,8 @@ # void* to, # size_t count) .p2align 4,,15 @@ -8381,7 +8326,7 @@ pushl %esi movl 4+12(%esp),%ecx pushl %edi -@@ -632,8 +663,8 @@ +@@ -635,8 +666,8 @@ # bool is_MP) # .p2align 4,,15 @@ -8392,8 +8337,8 @@ # 8(%esp) : return PC pushl %ebx # 4(%esp) : old %ebx pushl %edi # 0(%esp) : old %edi ---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-07-04 09:32:22.000000000 -0700 @@ -21,6 +21,14 @@ # questions. # @@ -8541,8 +8486,8 @@ cmpq %rdi,%rsi leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8 jbe acl_CopyRight ---- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-07-04 09:32:22.000000000 -0700 @@ -22,7 +22,33 @@ * */ @@ -8577,8 +8522,8 @@ // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. ---- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-07-11 09:19:11.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700 @@ -22,9 +22,10 @@ * */ @@ -8605,8 +8550,8 @@ +define_pd_global(uintx, HeapBaseMinAddress, 2*G); // Only used on 64 bit Windows platforms define_pd_global(bool, UseVectoredExceptions, false); ---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-07-11 09:19:12.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-10-31 15:11:36.000000000 -0700 @@ -44,23 +44,202 @@ # include <sys/wait.h> # include <pwd.h> @@ -9064,70 +9009,165 @@ assert(os::current_stack_pointer() >= *bottom && os::current_stack_pointer() < *bottom + *size, "just checking"); } -@@ -719,46 +981,44 @@ - ucontext_t *uc = (ucontext_t*)context; - st->print_cr("Registers:"); +@@ -724,34 +986,32 @@ + // we can't just iterate through the gregs area + #ifdef AMD64 - st->print( "RAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RAX]); - st->print(", RBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RBX]); - st->print(", RCX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RCX]); - st->print(", RDX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RDX]); -+ st->print( "RAX=" INTPTR_FORMAT, uc->context_rax); -+ st->print(", RBX=" INTPTR_FORMAT, uc->context_rbx); -+ st->print(", RCX=" INTPTR_FORMAT, uc->context_rcx); -+ st->print(", RDX=" INTPTR_FORMAT, uc->context_rdx); - st->cr(); +- st->cr(); - st->print( "RSP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RSP]); - st->print(", RBP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RBP]); - st->print(", RSI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RSI]); - st->print(", RDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RDI]); -+ st->print( "RSP=" INTPTR_FORMAT, uc->context_rsp); -+ st->print(", RBP=" INTPTR_FORMAT, uc->context_rbp); -+ st->print(", RSI=" INTPTR_FORMAT, uc->context_rsi); -+ st->print(", RDI=" INTPTR_FORMAT, uc->context_rdi); - st->cr(); +- st->cr(); - st->print( "R8 =" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R8]); - st->print(", R9 =" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R9]); - st->print(", R10=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R10]); - st->print(", R11=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R11]); -+ st->print( "R8 =" INTPTR_FORMAT, uc->context_r8); -+ st->print(", R9 =" INTPTR_FORMAT, uc->context_r9); -+ st->print(", R10=" INTPTR_FORMAT, uc->context_r10); -+ st->print(", R11=" INTPTR_FORMAT, uc->context_r11); - st->cr(); +- st->cr(); - st->print( "R12=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R12]); - st->print(", R13=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R13]); - st->print(", R14=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R14]); - st->print(", R15=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R15]); -+ st->print( "R12=" INTPTR_FORMAT, uc->context_r12); -+ st->print(", R13=" INTPTR_FORMAT, uc->context_r13); -+ st->print(", R14=" INTPTR_FORMAT, uc->context_r14); -+ st->print(", R15=" INTPTR_FORMAT, uc->context_r15); - st->cr(); +- st->cr(); - st->print( "RIP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RIP]); - st->print(", EFL=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EFL]); - st->print(", CSGSFS=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_CSGSFS]); - st->print(", ERR=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ERR]); +- st->cr(); +- st->print(" TRAPNO=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_TRAPNO]); +- ++ st->print( "RAX=" INTPTR_FORMAT, uc->context_rax); ++ st->print(", RBX=" INTPTR_FORMAT, uc->context_rbx); ++ st->print(", RCX=" INTPTR_FORMAT, uc->context_rcx); ++ st->print(", RDX=" INTPTR_FORMAT, uc->context_rdx); ++ st->cr(); ++ st->print( "RSP=" INTPTR_FORMAT, uc->context_rsp); ++ st->print(", RBP=" INTPTR_FORMAT, uc->context_rbp); ++ st->print(", RSI=" INTPTR_FORMAT, uc->context_rsi); ++ st->print(", RDI=" INTPTR_FORMAT, uc->context_rdi); ++ st->cr(); ++ st->print( "R8 =" INTPTR_FORMAT, uc->context_r8); ++ st->print(", R9 =" INTPTR_FORMAT, uc->context_r9); ++ st->print(", R10=" INTPTR_FORMAT, uc->context_r10); ++ st->print(", R11=" INTPTR_FORMAT, uc->context_r11); ++ st->cr(); ++ st->print( "R12=" INTPTR_FORMAT, uc->context_r12); ++ st->print(", R13=" INTPTR_FORMAT, uc->context_r13); ++ st->print(", R14=" INTPTR_FORMAT, uc->context_r14); ++ st->print(", R15=" INTPTR_FORMAT, uc->context_r15); ++ st->cr(); + st->print( "RIP=" INTPTR_FORMAT, uc->context_rip); + st->print(", EFL=" INTPTR_FORMAT, uc->context_flags); + st->print(", ERR=" INTPTR_FORMAT, uc->context_err); st->cr(); -- st->print(" TRAPNO=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_TRAPNO]); + st->print(" TRAPNO=" INTPTR_FORMAT, uc->context_trapno); ++ st->cr(); + st->cr(); + + st->print_cr("Register to memory mapping:"); +@@ -759,68 +1019,67 @@ + + // this is only for the "general purpose" registers + +- st->print_cr("RAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RAX]); +- print_location(st, uc->uc_mcontext.gregs[REG_RAX]); ++ st->print_cr("RAX=" INTPTR_FORMAT, uc->context_rax); ++ print_location(st, uc->context_rax); + st->cr(); +- st->print_cr("RBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RBX]); +- print_location(st, uc->uc_mcontext.gregs[REG_RBX]); ++ st->print_cr("RBX=" INTPTR_FORMAT, uc->context_rbx); ++ print_location(st, uc->context_rbx); + st->cr(); +- st->print_cr("RCX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RCX]); +- print_location(st, uc->uc_mcontext.gregs[REG_RCX]); ++ st->print_cr("RCX=" INTPTR_FORMAT, uc->context_rcx); ++ print_location(st, uc->context_rcx); + st->cr(); +- st->print_cr("RDX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RDX]); +- print_location(st, uc->uc_mcontext.gregs[REG_RDX]); ++ st->print_cr("RDX=" INTPTR_FORMAT, uc->context_rdx); ++ print_location(st, uc->context_rdx); + st->cr(); +- st->print_cr("RSP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RSP]); +- print_location(st, uc->uc_mcontext.gregs[REG_RSP]); ++ st->print_cr("RSP=" INTPTR_FORMAT, uc->context_rsp); ++ print_location(st, uc->context_rsp); + st->cr(); +- st->print_cr("RBP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RBP]); +- print_location(st, uc->uc_mcontext.gregs[REG_RBP]); ++ st->print_cr("RBP=" INTPTR_FORMAT, uc->context_rbp); ++ print_location(st, uc->context_rbp); + st->cr(); +- st->print_cr("RSI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RSI]); +- print_location(st, uc->uc_mcontext.gregs[REG_RSI]); ++ st->print_cr("RSI=" INTPTR_FORMAT, uc->context_rsi); ++ print_location(st, uc->context_rsi); + st->cr(); +- st->print_cr("RDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_RDI]); +- print_location(st, uc->uc_mcontext.gregs[REG_RDI]); ++ st->print_cr("RDI=" INTPTR_FORMAT, uc->context_rdi); ++ print_location(st, uc->context_rdi); + st->cr(); +- st->print_cr("R8 =" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R8]); +- print_location(st, uc->uc_mcontext.gregs[REG_R8]); ++ st->print_cr("R8 =" INTPTR_FORMAT, uc->context_r8); ++ print_location(st, uc->context_r8); + st->cr(); +- st->print_cr("R9 =" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R9]); +- print_location(st, uc->uc_mcontext.gregs[REG_R9]); ++ st->print_cr("R9 =" INTPTR_FORMAT, uc->context_r9); ++ print_location(st, uc->context_r9); + st->cr(); +- st->print_cr("R10=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R10]); +- print_location(st, uc->uc_mcontext.gregs[REG_R10]); ++ st->print_cr("R10=" INTPTR_FORMAT, uc->context_r10); ++ print_location(st, uc->context_r10); + st->cr(); +- st->print_cr("R11=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R11]); +- print_location(st, uc->uc_mcontext.gregs[REG_R11]); ++ st->print_cr("R11=" INTPTR_FORMAT, uc->context_r11); ++ print_location(st, uc->context_r11); + st->cr(); +- st->print_cr("R12=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R12]); +- print_location(st, uc->uc_mcontext.gregs[REG_R12]); ++ st->print_cr("R12=" INTPTR_FORMAT, uc->context_r12); ++ print_location(st, uc->context_r12); + st->cr(); +- st->print_cr("R13=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R13]); +- print_location(st, uc->uc_mcontext.gregs[REG_R13]); ++ st->print_cr("R13=" INTPTR_FORMAT, uc->context_r13); ++ print_location(st, uc->context_r13); + st->cr(); +- st->print_cr("R14=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R14]); +- print_location(st, uc->uc_mcontext.gregs[REG_R14]); ++ st->print_cr("R14=" INTPTR_FORMAT, uc->context_r14); ++ print_location(st, uc->context_r14); + st->cr(); +- st->print_cr("R15=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_R15]); +- print_location(st, uc->uc_mcontext.gregs[REG_R15]); ++ st->print_cr("R15=" INTPTR_FORMAT, uc->context_r15); ++ print_location(st, uc->context_r15); + #else - st->print( "EAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EAX]); - st->print(", EBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBX]); - st->print(", ECX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ECX]); - st->print(", EDX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDX]); -+ st->print( "EAX=" INTPTR_FORMAT, uc->context_eax); -+ st->print(", EBX=" INTPTR_FORMAT, uc->context_ebx); -+ st->print(", ECX=" INTPTR_FORMAT, uc->context_ecx); -+ st->print(", EDX=" INTPTR_FORMAT, uc->context_edx); - st->cr(); +- st->cr(); - st->print( "ESP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_UESP]); - st->print(", EBP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBP]); - st->print(", ESI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ESI]); - st->print(", EDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDI]); ++ st->print( "EAX=" INTPTR_FORMAT, uc->context_eax); ++ st->print(", EBX=" INTPTR_FORMAT, uc->context_ebx); ++ st->print(", ECX=" INTPTR_FORMAT, uc->context_ecx); ++ st->print(", EDX=" INTPTR_FORMAT, uc->context_edx); ++ st->cr(); + st->print( "ESP=" INTPTR_FORMAT, uc->context_esp); + st->print(", EBP=" INTPTR_FORMAT, uc->context_ebp); + st->print(", ESI=" INTPTR_FORMAT, uc->context_esi); @@ -9138,11 +9178,57 @@ - st->print(", EFLAGS=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EFL]); + st->print( "EIP=" INTPTR_FORMAT, uc->context_eip); + st->print(", EFLAGS=" INTPTR_FORMAT, uc->context_eflags); - #endif // AMD64 + + st->cr(); st->cr(); +@@ -830,29 +1089,29 @@ + + // this is only for the "general purpose" registers + +- st->print_cr("EAX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EAX]); +- print_location(st, uc->uc_mcontext.gregs[REG_EAX]); ++ st->print_cr("EAX=" INTPTR_FORMAT, uc->context_eax); ++ print_location(st, uc->context_eax); + st->cr(); +- st->print_cr("EBX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBX]); +- print_location(st, uc->uc_mcontext.gregs[REG_EBX]); ++ st->print_cr("EBX=" INTPTR_FORMAT, uc->context_ebx); ++ print_location(st, uc->context_ebx); + st->cr(); +- st->print_cr("ECX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ECX]); +- print_location(st, uc->uc_mcontext.gregs[REG_ECX]); ++ st->print_cr("ECX=" INTPTR_FORMAT, uc->context_ecx); ++ print_location(st, uc->context_ecx); + st->cr(); +- st->print_cr("EDX=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDX]); +- print_location(st, uc->uc_mcontext.gregs[REG_EDX]); ++ st->print_cr("EDX=" INTPTR_FORMAT, uc->context_edx); ++ print_location(st, uc->context_edx); + st->cr(); +- st->print_cr("ESP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ESP]); +- print_location(st, uc->uc_mcontext.gregs[REG_ESP]); ++ st->print_cr("ESP=" INTPTR_FORMAT, uc->context_esp); ++ print_location(st, uc->context_esp); + st->cr(); +- st->print_cr("EBP=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EBP]); +- print_location(st, uc->uc_mcontext.gregs[REG_EBP]); ++ st->print_cr("EBP=" INTPTR_FORMAT, uc->context_ebp); ++ print_location(st, uc->context_ebp); + st->cr(); +- st->print_cr("ESI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_ESI]); +- print_location(st, uc->uc_mcontext.gregs[REG_ESI]); ++ st->print_cr("ESI=" INTPTR_FORMAT, uc->context_esi); ++ print_location(st, uc->context_esi); + st->cr(); +- st->print_cr("EDI=" INTPTR_FORMAT, uc->uc_mcontext.gregs[REG_EDI]); +- print_location(st, uc->uc_mcontext.gregs[REG_EDI]); ++ st->print_cr("EDI=" INTPTR_FORMAT, uc->context_edi); ++ print_location(st, uc->context_edi); + + #endif // AMD64 st->cr(); ---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-07-11 09:19:12.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700 @@ -27,8 +27,10 @@ #ifndef AMD64 // map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp @@ -9154,8 +9240,8 @@ static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)]; #endif // !AMD64 ---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-07-11 09:19:12.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-11-07 17:21:37.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700 @@ -31,7 +31,7 @@ /******************************/ \ /* Threads (NOTE: incomplete) */ \ @@ -9165,8 +9251,8 @@ nonstatic_field(OSThread, _pthread_id, pthread_t) \ /* This must be the last entry, and must be present */ \ last_entry() ---- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-07-11 09:19:12.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-11-07 17:21:38.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700 @@ -23,136 +23,441 @@ * */ @@ -9839,8 +9925,8 @@ - (intptr_t) compare_value); + return atomic_cas_ptr((volatile void *)dest, compare_value, exchange_value); } ---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-07-11 09:19:12.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-11-07 17:21:38.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700 @@ -25,16 +25,23 @@ // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. @@ -9869,8 +9955,8 @@ - return bswap_64(x); + return bswap64(x); } ---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-07-11 09:19:12.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-11-07 17:21:38.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700 @@ -40,7 +40,12 @@ #else // ARM @@ -9884,8 +9970,8 @@ #ifdef PPC ---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-07-11 09:19:12.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-07-11 09:11:43.000000000 -0700 +--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-11-07 17:21:38.000000000 -0800 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-10-31 14:26:55.000000000 -0700 @@ -23,6 +23,10 @@ * */ @@ -10001,8 +10087,8 @@ assert(os::current_stack_pointer() >= stack_bottom, "should do"); assert(os::current_stack_pointer() < stack_top, "should do"); ---- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-07-09 01:48:48.000000000 -0700 -+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2010-07-11 09:11:47.000000000 -0700 +--- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-11-04 16:12:14.000000000 -0700 ++++ ./hotspot/src/share/vm/adlc/adlc.hpp 2010-06-15 22:03:24.000000000 -0700 @@ -69,9 +69,9 @@ #endif #endif // _WIN32 @@ -10015,8 +10101,8 @@ // Macros #define uint32 unsigned int ---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-07-09 01:48:48.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-07-11 09:11:48.000000000 -0700 +--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-11-04 16:12:14.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-10-31 14:03:01.000000000 -0700 @@ -952,7 +952,7 @@ } nmethod* nm = method->code(); @@ -10026,9 +10112,9 @@ } } ---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-07-09 01:48:50.000000000 -0700 -+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-07-11 09:11:51.000000000 -0700 -@@ -81,7 +81,7 @@ +--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-11-04 16:12:14.000000000 -0700 ++++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-08-06 22:02:53.000000000 -0700 +@@ -83,7 +83,7 @@ // the incoming method. We could lose a line of trace output. // This is acceptable in a debug-only feature. st->cr(); @@ -10037,7 +10123,7 @@ method->print_name(st); st->cr(); _current_method = method(); -@@ -95,7 +95,7 @@ +@@ -97,7 +97,7 @@ } _code = code; int bci = bcp - method->code_base(); @@ -10046,8 +10132,8 @@ if (Verbose) { st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s", BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code)); ---- ./hotspot/src/share/vm/prims/forte.cpp 2010-07-09 01:48:51.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/forte.cpp 2010-07-11 09:11:55.000000000 -0700 +--- ./hotspot/src/share/vm/prims/forte.cpp 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/forte.cpp 2010-06-15 22:03:31.000000000 -0700 @@ -629,6 +629,11 @@ // Method to let libcollector know about a dynamically loaded function. // Because it is weakly bound, the calls become NOP's when the library @@ -10068,8 +10154,8 @@ #endif // !_WINDOWS } // end extern "C" ---- ./hotspot/src/share/vm/runtime/globals.hpp 2010-07-09 01:48:52.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-07-11 09:11:56.000000000 -0700 +--- ./hotspot/src/share/vm/runtime/globals.hpp 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-10-31 14:03:02.000000000 -0700 @@ -327,7 +327,7 @@ /* UseMembar is theoretically a temp flag used for memory barrier \ * removal testing. It was supposed to be removed before FCS but has \ @@ -10079,8 +10165,8 @@ "(Unstable) Issues membars on thread state transitions") \ \ /* Temporary: See 6948537 */ \ ---- ./hotspot/src/share/vm/runtime/os.cpp 2010-07-09 01:48:52.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/os.cpp 2010-07-11 09:11:56.000000000 -0700 +--- ./hotspot/src/share/vm/runtime/os.cpp 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/os.cpp 2010-10-31 14:03:02.000000000 -0700 @@ -79,7 +79,11 @@ assert(false, "Failed localtime_pd"); return NULL; @@ -10093,9 +10179,9 @@ // 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-07-09 01:48:52.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-07-11 09:11:57.000000000 -0700 -@@ -144,7 +144,8 @@ +--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-10-31 14:03:02.000000000 -0700 +@@ -149,7 +149,8 @@ #define OS LINUX_ONLY("linux") \ WINDOWS_ONLY("windows") \ @@ -10105,8 +10191,8 @@ #ifdef ZERO #define CPU ZERO_LIBARCH ---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-07-09 01:48:53.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-07-11 09:11:58.000000000 -0700 +--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-10-31 14:03:02.000000000 -0700 @@ -71,12 +71,25 @@ # include <sys/procfs.h> # endif @@ -10162,7 +10248,7 @@ // Additional Java basic types -@@ -228,7 +241,9 @@ +@@ -236,7 +249,9 @@ inline int g_isnan(float f) { return isnand(f); } #endif inline int g_isnan(double f) { return isnand(f); } @@ -10173,9 +10259,9 @@ 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-07-09 01:48:53.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/macros.hpp 2010-07-11 09:11:58.000000000 -0700 -@@ -148,6 +148,14 @@ +--- ./hotspot/src/share/vm/utilities/macros.hpp 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/macros.hpp 2010-10-31 14:03:02.000000000 -0700 +@@ -158,6 +158,14 @@ #define NOT_WINDOWS(code) code #endif @@ -10190,8 +10276,8 @@ #if defined(IA32) || defined(AMD64) #define X86 #define X86_ONLY(code) code ---- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-07-09 01:48:53.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2010-07-11 09:11:58.000000000 -0700 +--- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/ostream.cpp 2010-06-15 22:03:33.000000000 -0700 @@ -848,7 +848,7 @@ #ifndef PRODUCT @@ -10201,8 +10287,8 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> ---- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-07-09 01:48:53.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-07-11 09:11:58.000000000 -0700 +--- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-10-31 14:03:03.000000000 -0700 @@ -31,13 +31,18 @@ "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH", "JAVA_COMPILER", "PATH", "USERNAME", @@ -10223,7 +10309,7 @@ // defined on Windows "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR", -@@ -862,7 +867,7 @@ +@@ -859,7 +864,7 @@ const char* ptr = OnError; while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){ out.print_raw ("# Executing "); @@ -10232,8 +10318,8 @@ out.print_raw ("/bin/sh -c "); #elif defined(SOLARIS) out.print_raw ("/usr/bin/sh -c "); ---- ./hotspot/test/Makefile 2010-07-09 01:48:53.000000000 -0700 -+++ ./hotspot/test/Makefile 2010-07-11 09:11:58.000000000 -0700 +--- ./hotspot/test/Makefile 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/test/Makefile 2010-06-15 22:03:33.000000000 -0700 @@ -44,6 +44,22 @@ ARCH = i586 endif @@ -10275,8 +10361,8 @@ ifdef TESTDIRS JTREG_TESTDIRS = $(TESTDIRS) endif ---- ./hotspot/test/jprt.config 2010-07-09 01:48:53.000000000 -0700 -+++ ./hotspot/test/jprt.config 2010-07-11 09:11:59.000000000 -0700 +--- ./hotspot/test/jprt.config 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/test/jprt.config 2010-06-15 22:03:33.000000000 -0700 @@ -75,8 +75,8 @@ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. @@ -10344,8 +10430,8 @@ # Export PATH setting PATH="${path4sdk}" ---- ./hotspot/test/runtime/6929067/Test6929067.sh 2010-07-09 01:48:53.000000000 -0700 -+++ ./hotspot/test/runtime/6929067/Test6929067.sh 2010-07-11 09:11:59.000000000 -0700 +--- ./hotspot/test/runtime/6929067/Test6929067.sh 2010-11-04 16:12:15.000000000 -0700 ++++ ./hotspot/test/runtime/6929067/Test6929067.sh 2010-04-20 20:10:00.000000000 -0700 @@ -29,7 +29,7 @@ PS=":" FS="/" @@ -10355,31 +10441,41 @@ NULL=NUL PS=";" FS="\\" ---- ./jaxp/.jcheck/conf 2010-07-09 01:49:05.000000000 -0700 +--- ./jaxp/.hgtags 2010-11-04 16:12:20.000000000 -0700 ++++ ./jaxp/.hgtags 2010-11-06 22:59:40.000000000 -0700 +@@ -91,3 +91,4 @@ + d57197d22c2bfc39d1a860040f655b466ab46f52 jdk7-b114 + dc1612e1d3ac08eb8fcad764daff21c9247d33c9 jdk7-b115 + f8d4e6c6cfce1cda23fcbd144628a9791a9e1a63 jdk7-b116 ++9ee4d96e893436a48607924227dadd2d93b9b00d jdk7-b117 +--- ./jaxp/.jcheck/conf 2010-11-04 16:12:20.000000000 -0700 +++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./jaxp/jaxp.properties 2010-07-09 01:49:05.000000000 -0700 -+++ ./jaxp/jaxp.properties 2010-07-11 09:12:02.000000000 -0700 -@@ -28,7 +28,7 @@ - jaxp_src.bundle.name=jdk7-jaxp-m7.zip - jaxp_src.bundle.md5.checksum=22e95fbdb9fb7d8b6b6fc0a1d76d1fbd - jaxp_src.master.bundle.dir=${drops.master.copy.base} --jaxp_src.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/147490 -+jaxp_src.master.bundle.url.base=https://jaxp.dev.java.net/files/documents/913/150785 - - #jaxp_tests.bundle.name=jdk7-jaxp-tests-2009_08_28.zip - #jaxp_tests.master.bundle.dir=${drops.master.copy.base} ---- ./jaxws/.jcheck/conf 2010-07-09 01:49:21.000000000 -0700 +--- ./jaxws/.hgtags 2010-11-04 16:12:25.000000000 -0700 ++++ ./jaxws/.hgtags 2010-11-06 22:59:44.000000000 -0700 +@@ -91,3 +91,4 @@ + 400f494c81c5ec87714b705648afbb3cb680bf73 jdk7-b114 + 824cc44bd6eba9abae07cc420f7fe3926c1adbd9 jdk7-b115 + 376ac153078dd3b5f6d4a0981feee092c1492c96 jdk7-b116 ++1320fb3bb588298c79716bd2d10b5b4afacb9370 jdk7-b117 +--- ./jaxws/.jcheck/conf 2010-11-04 16:12:25.000000000 -0700 +++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./jdk/.jcheck/conf 2010-07-09 01:51:49.000000000 -0700 +--- ./jdk/.hgtags 2010-11-04 16:13:15.000000000 -0700 ++++ ./jdk/.hgtags 2010-11-06 22:59:50.000000000 -0700 +@@ -91,3 +91,4 @@ + e250cef36ea05e627e7e6f7d75e5e19f529e2ba3 jdk7-b114 + 449bad8d67b5808ecf0f927683acc0a5940f8c85 jdk7-b115 + 1657ed4e1d86c8aa2028ab5a41f9da1ac4a369f8 jdk7-b116 ++3e6726bbf80a4254ecd01051c8ed77ee19325e46 jdk7-b117 +--- ./jdk/.jcheck/conf 2010-11-04 16:13:15.000000000 -0700 +++ ./jdk/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./jdk/make/com/sun/java/pack/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/com/sun/java/pack/Makefile 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/com/sun/java/pack/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/com/sun/java/pack/Makefile 2010-06-15 22:06:15.000000000 -0700 @@ -62,6 +62,7 @@ @@ -10411,8 +10507,8 @@ OTHER_LDLIBS += $(LIBCXX) # setup the list of libraries to link in... ifeq ($(PLATFORM), linux) ---- ./jdk/make/com/sun/nio/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/com/sun/nio/Makefile 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/com/sun/nio/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/com/sun/nio/Makefile 2010-06-15 22:06:16.000000000 -0700 @@ -30,7 +30,16 @@ BUILDDIR = ../../.. include $(BUILDDIR)/common/Defs.gmk @@ -10430,20 +10526,28 @@ include $(BUILDDIR)/common/Subdirs.gmk all build clean clobber:: ---- ./jdk/make/com/sun/nio/sctp/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/com/sun/nio/sctp/Makefile 2010-07-11 09:12:40.000000000 -0700 -@@ -69,6 +69,9 @@ - #LIBSCTP = -lsctp - OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio - endif # PLATFORM -+ifeq ($(PLATFORM), bsd) +--- ./jdk/make/com/sun/nio/sctp/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/com/sun/nio/sctp/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -60,15 +60,11 @@ + -I$(PLATFORM_SRC)/native/java/net \ + -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders + +OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio -+endif + ifeq ($(PLATFORM), linux) + COMPILER_WARNINGS_FATAL=true +-#OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl +-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -lnio -lnet -lpthread -ldl ++OTHER_LDLIBS += -lpthread $(LIBDL) + endif +-ifeq ($(PLATFORM), solaris) +-#LIBSCTP = -lsctp +-OTHER_LDLIBS += $(LIBSOCKET) -L$(LIBDIR)/$(LIBARCH) -lnet -lnio +-endif # PLATFORM else # windows include $(BUILDDIR)/common/Classes.gmk ---- ./jdk/make/com/sun/security/auth/module/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/com/sun/security/auth/module/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-06-15 22:06:16.000000000 -0700 @@ -68,7 +68,7 @@ include FILES_c_solaris.gmk endif # solaris @@ -10453,8 +10557,8 @@ LIBRARY = jaas_unix include FILES_export_unix.gmk include FILES_c_unix.gmk ---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-06-15 22:06:16.000000000 -0700 @@ -43,5 +43,7 @@ sun/tools/attach/LinuxVirtualMachine.java endif @@ -10465,8 +10569,8 @@ +FILES_export = \ + sun/tools/attach/BsdVirtualMachine.java +endif ---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-06-15 22:06:16.000000000 -0700 @@ -39,4 +39,7 @@ LinuxVirtualMachine.c endif @@ -10476,8 +10580,8 @@ +FILES_c = \ + BsdVirtualMachine.c +endif ---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-06-15 22:06:16.000000000 -0700 @@ -43,6 +43,11 @@ sun/tools/attach/LinuxAttachProvider.java endif @@ -10490,8 +10594,8 @@ # # Files that need to be copied # ---- ./jdk/make/com/sun/tools/attach/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/Makefile 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/com/sun/tools/attach/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/Makefile 2010-06-15 22:06:16.000000000 -0700 @@ -37,6 +37,9 @@ ifeq ($(PLATFORM), linux) FILES_m = mapfile-linux @@ -10502,8 +10606,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk # ---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-07-04 12:38:37.000000000 -0700 @@ -30,14 +30,12 @@ Java_sun_tools_attach_BsdVirtualMachine_checkPermissions; Java_sun_tools_attach_BsdVirtualMachine_close; @@ -10520,8 +10624,8 @@ local: *; }; ---- ./jdk/make/common/Defs-bsd.gmk 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/make/common/Defs-bsd.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/Defs-bsd.gmk 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/make/common/Defs-bsd.gmk 2010-07-10 13:11:34.000000000 -0700 @@ -25,7 +25,7 @@ # @@ -10720,8 +10824,8 @@ ifeq ($(ARCH), ia64) INCLUDE_SA = false else ---- ./jdk/make/common/Defs-linux.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/Defs-linux.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/Defs-linux.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/Defs-linux.gmk 2010-07-10 13:10:56.000000000 -0700 @@ -322,9 +322,10 @@ override LIBSOCKET = override LIBNSL = @@ -10734,8 +10838,8 @@ ifeq ($(ARCH), amd64) override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 else ---- ./jdk/make/common/Defs-solaris.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/Defs-solaris.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/Defs-solaris.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/Defs-solaris.gmk 2010-07-10 13:11:24.000000000 -0700 @@ -648,6 +648,9 @@ # Network Services library LIBNSL = -lnsl @@ -10746,8 +10850,8 @@ # GLOBAL_KPIC: If set means all libraries are PIC, position independent code # EXCEPT for select compiles # If a .o file is compiled non-PIC then it should be forced ---- ./jdk/make/common/Defs.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/Defs.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/Defs.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/Defs.gmk 2010-10-31 14:12:34.000000000 -0700 @@ -181,6 +181,36 @@ endif endif # OPENJDK @@ -10804,8 +10908,8 @@ endif # PROGRAM LDLIBS_COMMON += $(EXTRA_LIBS) ---- ./jdk/make/common/Program.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/Program.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/Program.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/Program.gmk 2010-06-15 22:06:16.000000000 -0700 @@ -65,11 +65,27 @@ # Create a dependency on libjli (Java Launcher Infrastructure) # @@ -10866,8 +10970,8 @@ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' ---- ./jdk/make/common/Release.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/Release.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/Release.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/Release.gmk 2010-10-31 14:12:34.000000000 -0700 @@ -154,14 +154,13 @@ tnameserv.1 \ unpack200.1 @@ -10909,7 +11013,7 @@ # # Specific files and directories that will be filtered out from above areas. -@@ -1017,7 +1027,7 @@ +@@ -1027,7 +1037,7 @@ @# generated by the more efficient solaris/windows method of copying files. @# So for Linux, make use of the -T option (like Solaris' -I option) of @# obtaining the list of files from a file. MKS tar has no such option. @@ -10918,7 +11022,7 @@ for d in $(SOURCE_DIRS); do \ $(RM) $(ABS_TEMPDIR)/src-files.list; \ ($(CD) $$d && \ -@@ -1030,7 +1040,7 @@ +@@ -1040,7 +1050,7 @@ done ; \ ) ; \ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ @@ -10927,8 +11031,8 @@ | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \ fi; \ done ---- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-06-15 22:06:16.000000000 -0700 @@ -49,8 +49,6 @@ com/sun/jmx/snmp/SnmpDataTypeEnums.class \ com/sun/jmx/snmp/SnmpDefinitions.class \ @@ -11016,8 +11120,8 @@ import-binary-plug-jar \ import-binary-plugs-completed ---- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-06-15 22:06:16.000000000 -0700 @@ -72,6 +72,24 @@ endif @@ -11043,8 +11147,8 @@ ifeq ($(PLATFORM), solaris) # Settings specific to Solaris ---- ./jdk/make/common/shared/Defs-bsd.gmk 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/shared/Defs-bsd.gmk 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-07-04 12:38:37.000000000 -0700 @@ -54,7 +54,7 @@ endef @@ -11083,8 +11187,8 @@ # Import JDK images allow for partial builds, components not built are # imported (or copied from) these import areas when needed. ---- ./jdk/make/common/shared/Defs-utils.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/shared/Defs-utils.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/shared/Defs-utils.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/shared/Defs-utils.gmk 2010-10-31 14:12:34.000000000 -0700 @@ -67,6 +67,13 @@ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH) endif @@ -11099,7 +11203,7 @@ # Utilities ADB = $(UTILS_COMMAND_PATH)adb AR = $(UTILS_CCS_BIN_PATH)ar -@@ -203,3 +210,37 @@ +@@ -202,3 +209,39 @@ ECHO = /usr/bin/echo endif @@ -11127,7 +11231,9 @@ + else + UNZIP = $(UTILS_DEVTOOL_PATH)unzip + endif -+ ifneq ($(OS_VENDOR), OpenBSD) ++ ifeq ($(OS_VENDOR), OpenBSD) ++ NAWK = $(UTILS_USR_BIN_PATH)awk ++ else + CPIO = $(UTILS_USR_BIN_PATH)cpio + TAR = $(UTILS_USR_BIN_PATH)tar + endif @@ -11137,9 +11243,9 @@ + UNZIP = $(UTILS_DEVTOOL_PATH)unzip + endif +endif ---- ./jdk/make/common/shared/Defs.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/shared/Defs.gmk 2010-07-11 09:12:40.000000000 -0700 -@@ -589,8 +589,8 @@ +--- ./jdk/make/common/shared/Defs.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/shared/Defs.gmk 2010-10-31 14:12:34.000000000 -0700 +@@ -613,8 +613,8 @@ override CC_VERSION = sun endif @@ -11150,8 +11256,8 @@ override CC_VERSION = gcc endif ---- ./jdk/make/common/shared/Platform.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/shared/Platform.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/shared/Platform.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/shared/Platform.gmk 2010-06-15 22:06:17.000000000 -0700 @@ -82,7 +82,7 @@ SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags # When changing SCM_DIRs also change SCM_DIRS_rexp and SCM_DIRS_prune: @@ -11297,8 +11403,8 @@ # If blanks in the username, use the first 4 words and pack them together _USER1:=$(subst ', ,$(_USER)) _USER2:=$(subst ", ,$(_USER1)) ---- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-06-15 22:06:17.000000000 -0700 @@ -244,6 +244,7 @@ ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings) ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH) @@ -11307,8 +11413,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-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/common/shared/Sanity.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/common/shared/Sanity.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/common/shared/Sanity.gmk 2010-06-15 22:06:17.000000000 -0700 @@ -142,6 +142,11 @@ $(EGREP) "\#define" | $(NAWK) '{print $$3}') endif @@ -11340,19 +11446,8 @@ ###################################################### # Check for existence of MS_RUNTIME_LIBRARIES ---- ./jdk/make/docs/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/docs/Makefile 2010-07-11 09:12:40.000000000 -0700 -@@ -214,7 +214,7 @@ - # you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR) - # being interpreted as an end of command (newline) - --JAAS_SOURCEPATH = "$(TOPDIR)/src/share/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/solaris/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/windows/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/linux/classes" -+JAAS_SOURCEPATH = "$(TOPDIR)/src/share/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/solaris/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/windows/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/linux/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/bsd/classes" - JAAS_DOCDIR = $(DOCSDIR)/jre/api/security/jaas/spec - JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \ - -encoding ascii \ ---- ./jdk/make/java/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/java/Makefile 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/java/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/Makefile 2010-06-15 22:06:17.000000000 -0700 @@ -53,7 +53,7 @@ endif endif # PLATFORM @@ -11362,8 +11457,8 @@ SUBDIRS += jexec endif # PLATFORM ---- ./jdk/make/java/hpi/hpi_common.gmk 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/java/hpi/hpi_common.gmk 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/java/hpi/hpi_common.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/hpi/hpi_common.gmk 2010-07-10 12:44:13.000000000 -0700 @@ -86,5 +86,5 @@ # Things that must be linked in. # @@ -11371,8 +11466,8 @@ -OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) -ldl +OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) $(LIBDL) endif ---- ./jdk/make/java/hpi/native/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/java/hpi/native/Makefile 2010-07-11 09:12:40.000000000 -0700 +--- ./jdk/make/java/hpi/native/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/hpi/native/Makefile 2010-06-15 22:06:17.000000000 -0700 @@ -73,16 +73,25 @@ ifeq ($(MOOT_PRIORITIES),true) OTHER_CPPFLAGS += -DMOOT_PRIORITIES @@ -11399,9 +11494,9 @@ ifeq ($(HAVE_FILIOH),true) OTHER_CPPFLAGS += -DHAVE_FILIOH endif ---- ./jdk/make/java/instrument/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/java/instrument/Makefile 2010-07-11 09:12:40.000000000 -0700 -@@ -103,6 +103,26 @@ +--- ./jdk/make/java/instrument/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/instrument/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -103,9 +103,29 @@ # equivalent of strcasecmp is stricmp on Windows CPPFLAGS_COMMON += -Dstrcasecmp=stricmp else @@ -11427,7 +11522,11 @@ +else LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli OTHER_LDLIBS += -ljli - OTHER_LDLIBS += -ldl +- OTHER_LDLIBS += -ldl ++ OTHER_LDLIBS += $(LIBDL) + ifeq ($(PLATFORM), solaris) + LDFLAGS += -R \$$ORIGIN/jli + endif @@ -115,6 +135,7 @@ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli endif @@ -11436,8 +11535,8 @@ # # Library to compile. ---- ./jdk/make/java/java/Makefile 2010-07-09 01:51:49.000000000 -0700 -+++ ./jdk/make/java/java/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/java/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/java/Makefile 2010-07-10 12:44:56.000000000 -0700 @@ -166,8 +166,10 @@ # Is the altzone extern documented in ctime(3C) available? # @@ -11458,8 +11557,8 @@ -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) endif ---- ./jdk/make/java/java/genlocales.gmk 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/java/genlocales.gmk 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/java/genlocales.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/java/genlocales.gmk 2010-06-15 22:06:17.000000000 -0700 @@ -76,10 +76,14 @@ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) @$(RM) $@.tmp.euro $@.tmp.noneuro; @@ -11479,8 +11578,8 @@ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ $@.tmp.noneuro $< $@ ---- ./jdk/make/java/java/localegen.sh 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/java/localegen.sh 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/java/localegen.sh 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/java/localegen.sh 2010-06-15 22:06:17.000000000 -0700 @@ -55,9 +55,9 @@ for FILE in $RESOURCE_NAMES do @@ -11493,8 +11592,8 @@ done sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE" ---- ./jdk/make/java/java_hprof_demo/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/java_hprof_demo/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/java_hprof_demo/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/java_hprof_demo/Makefile 2010-07-10 12:45:09.000000000 -0700 @@ -84,7 +84,7 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS += wsock32.lib winmm.lib @@ -11504,8 +11603,8 @@ endif # ---- ./jdk/make/java/jli/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/jli/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/jli/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/jli/Makefile 2010-08-06 21:58:27.000000000 -0700 @@ -45,7 +45,9 @@ include $(BUILDDIR)/common/Defs.gmk @@ -11535,7 +11634,7 @@ ifneq ($(PLATFORM), windows) -@@ -93,16 +99,18 @@ +@@ -93,7 +99,7 @@ LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"' endif @@ -11544,18 +11643,16 @@ ifneq ($(PLATFORM), windows) # UNIX systems - LD_RUNPATH_EXTRAS += .. - LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli -+ifneq ($(PLATFORM), bsd) # other UNIX systems +@@ -102,7 +108,7 @@ # Note: its important to keep this order meaning -lc is the # last library otherwise it could cause compatibility issues # by pulling in SUNW_private symbols from libc - LDLIBS = -ldl -lc -+endif # !bsd +- LDLIBS = -ldl -lc ++ LDLIBS = $(LIBDL) -lc ifeq ($(USE_PTHREADS),true) LDLIBS += -lpthread endif # USE_PTHREADS -@@ -126,7 +134,11 @@ +@@ -126,7 +132,11 @@ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) @@ -11568,7 +11665,7 @@ # # Library to compile. -@@ -163,7 +175,28 @@ +@@ -163,7 +173,28 @@ endif # PLATFORM @@ -11598,8 +11695,8 @@ + vpath %.c $(ZIP_SRC) +endif + ---- ./jdk/make/java/management/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/management/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/management/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/management/Makefile 2010-06-15 22:06:17.000000000 -0700 @@ -86,6 +86,11 @@ OTHER_INCLUDES += \ -I$(SHARE_SRC)/native/sun/management @@ -11612,9 +11709,9 @@ ifeq ($(PLATFORM),windows) OTHER_LDLIBS += $(JVMLIB) endif ---- ./jdk/make/java/net/FILES_c.gmk 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/net/FILES_c.gmk 2010-07-11 09:12:41.000000000 -0700 -@@ -47,6 +47,10 @@ +--- ./jdk/make/java/net/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/net/FILES_c.gmk 2010-10-31 14:12:34.000000000 -0700 +@@ -43,6 +43,10 @@ FILES_c += linux_close.c endif @@ -11625,9 +11722,9 @@ ifeq ($(PLATFORM), windows) FILES_c += TwoStacksPlainSocketImpl.c FILES_c += DualStackPlainSocketImpl.c ---- ./jdk/make/java/net/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/net/Makefile 2010-07-11 09:12:41.000000000 -0700 -@@ -93,6 +93,12 @@ +--- ./jdk/make/java/net/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/net/Makefile 2010-10-31 14:12:34.000000000 -0700 +@@ -96,14 +96,21 @@ include $(BUILDDIR)/common/Library.gmk @@ -11640,7 +11737,9 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS = ws2_32.lib $(JVMLIB) else -@@ -101,6 +107,7 @@ +- OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) -ldl $(JVMLIB) ++ OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) $(LIBDL) $(JVMLIB) + endif ifeq ($(PLATFORM), linux) OTHER_LDLIBS += -lpthread endif @@ -11648,8 +11747,8 @@ CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl ---- ./jdk/make/java/nio/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/nio/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/nio/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/nio/Makefile 2010-08-06 21:58:27.000000000 -0700 @@ -261,6 +261,69 @@ sun/nio/fs/UnixConstants.java endif # PLATFORM = linux @@ -11720,7 +11819,7 @@ # # Find platform-specific C source files # -@@ -285,6 +348,11 @@ +@@ -285,19 +348,28 @@ -I$(PLATFORM_SRC)/native/java/net \ -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders @@ -11732,17 +11831,29 @@ ifeq ($(PLATFORM),windows) OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \ -libpath:$(LIBDIR) java.lib \ -@@ -295,6 +363,9 @@ + $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \ + $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \ + $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj +-endif ++else ++ifeq ($(PLATFORM), solaris) ++OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) ++endif # solaris ++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet ifeq ($(PLATFORM), linux) - OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl - endif -+ifeq ($(PLATFORM), bsd) -+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -pthread +-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl ++OTHER_LDLIBS += -lpthread $(LIBDL) +endif - ifeq ($(PLATFORM), solaris) - OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \ - -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -@@ -321,6 +392,9 @@ ++ifeq ($(PLATFORM), bsd) ++OTHER_LDLIBS += -pthread + endif +-ifeq ($(PLATFORM), solaris) +-OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \ +- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet + endif # PLATFORM + + # +@@ -321,6 +393,9 @@ ifeq ($(PLATFORM), linux) FILES_m = mapfile-linux endif @@ -11752,8 +11863,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk ---- ./jdk/make/java/nio/mapfile-bsd 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/make/java/nio/mapfile-bsd 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/nio/mapfile-bsd 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/make/java/nio/mapfile-bsd 2010-10-31 14:19:20.000000000 -0700 @@ -36,25 +36,6 @@ Java_sun_nio_ch_DatagramDispatcher_readv0; Java_sun_nio_ch_DatagramDispatcher_write0; @@ -11780,7 +11891,7 @@ Java_sun_nio_ch_FileChannelImpl_close0; Java_sun_nio_ch_FileChannelImpl_initIDs; Java_sun_nio_ch_FileChannelImpl_map0; -@@ -122,26 +103,14 @@ +@@ -123,26 +104,14 @@ Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0; Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs; Java_sun_nio_ch_UnixAsynchronousSocketChannelImpl_checkConnect; @@ -11811,8 +11922,8 @@ Java_sun_nio_fs_UnixNativeDispatcher_init; Java_sun_nio_fs_UnixNativeDispatcher_getcwd; Java_sun_nio_fs_UnixNativeDispatcher_strerror; ---- ./jdk/make/java/npt/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/npt/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/npt/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/npt/Makefile 2010-06-15 22:06:18.000000000 -0700 @@ -68,6 +68,18 @@ OTHER_LCF += -export:nptInitialize -export:nptTerminate endif @@ -11832,8 +11943,8 @@ # # Add to ambient vpath so we pick up the library files # ---- ./jdk/make/java/redist/fonts/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/redist/fonts/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/redist/fonts/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/redist/fonts/Makefile 2010-06-15 22:06:18.000000000 -0700 @@ -43,7 +43,7 @@ $(LIBDIR)/fonts/LucidaSansRegular.ttf \ $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \ @@ -11861,8 +11972,8 @@ all build : $(INTERNAL_IMPORT_LIST) ---- ./jdk/make/java/security/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/security/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/security/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/security/Makefile 2010-07-24 14:31:27.000000000 -0700 @@ -50,7 +50,15 @@ ifneq ($(ARCH_DATA_MODEL), 64) PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows @@ -11879,8 +11990,8 @@ endif # PLATFORM ---- ./jdk/make/java/zip/FILES_c.gmk 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/zip/FILES_c.gmk 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/zip/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/zip/FILES_c.gmk 2010-06-15 22:06:18.000000000 -0700 @@ -29,7 +29,10 @@ Deflater.c \ Inflater.c \ @@ -11900,8 +12011,8 @@ - zutil.c + zutil.c +endif ---- ./jdk/make/java/zip/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/java/zip/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/java/zip/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/java/zip/Makefile 2010-06-15 22:06:18.000000000 -0700 @@ -72,16 +72,28 @@ CPPFLAGS += -UDEBUG endif @@ -11932,8 +12043,8 @@ OTHER_LDLIBS = $(JVMLIB) +endif + ---- ./jdk/make/javax/sound/FILES_c.gmk 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/javax/sound/FILES_c.gmk 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/javax/sound/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/javax/sound/FILES_c.gmk 2010-06-15 22:06:18.000000000 -0700 @@ -34,6 +34,8 @@ FILES_linux = @@ -11943,8 +12054,8 @@ FILES_windows = \ PLATFORM_API_WinOS_MidiIn.c \ PLATFORM_API_WinOS_MidiOut.c \ ---- ./jdk/make/javax/sound/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/javax/sound/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/javax/sound/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/javax/sound/Makefile 2010-06-15 22:06:18.000000000 -0700 @@ -108,6 +108,16 @@ #MXSPP_ADD = $(PLATFORM)-$(ARCH)/ endif # PLATFORM linux @@ -11962,8 +12073,8 @@ ifeq ($(PLATFORM), solaris) # build with ports and direct audio CPPFLAGS += -DUSE_PORTS=TRUE \ ---- ./jdk/make/javax/sound/SoundDefs.gmk 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/javax/sound/SoundDefs.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-06-15 22:06:18.000000000 -0700 @@ -40,6 +40,10 @@ CPPFLAGS += -DX_PLATFORM=X_LINUX endif # PLATFORM linux @@ -11975,21 +12086,19 @@ ifeq ($(PLATFORM), solaris) CPPFLAGS += -DX_PLATFORM=X_SOLARIS ---- ./jdk/make/jpda/back/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/jpda/back/Makefile 2010-07-11 09:12:41.000000000 -0700 -@@ -50,8 +50,10 @@ +--- ./jdk/make/jpda/back/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/jpda/back/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -50,7 +50,7 @@ -I$(GENNATIVESRCDIR)/jdwp ifneq ($(PLATFORM), windows) -+ifneq ($(PLATFORM), bsd) - OTHER_LDLIBS += -ldl +- OTHER_LDLIBS += -ldl ++ OTHER_LDLIBS += $(LIBDL) endif # PLATFORM -+endif # PLATFORM # - # This controls the ability to do logging in the library. ---- ./jdk/make/jpda/transport/socket/Makefile 2010-07-09 01:51:50.000000000 -0700 -+++ ./jdk/make/jpda/transport/socket/Makefile 2010-07-11 09:12:41.000000000 -0700 +--- ./jdk/make/jpda/transport/socket/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/jpda/transport/socket/Makefile 2010-07-10 12:31:09.000000000 -0700 @@ -41,6 +41,11 @@ OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread endif @@ -12002,22 +12111,52 @@ ifeq ($(PLATFORM), solaris) OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) endif ---- ./jdk/make/sun/awt/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/awt/Makefile 2010-07-11 09:12:43.000000000 -0700 -@@ -124,6 +124,13 @@ - OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl +--- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -37,12 +37,11 @@ + + ifeq ($(PLATFORM), windows) + EXTRA_LIBS += wsock32.lib winmm.lib +-endif +-ifeq ($(PLATFORM), solaris) +- OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl +-endif ++else ++ OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBDL) + ifeq ($(PLATFORM), linux) +- OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl -lpthread ++ OTHER_LDLIBS += -lpthread ++endif endif + # +--- ./jdk/make/sun/awt/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/awt/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -94,7 +94,7 @@ + ifeq ($(PLATFORM), solaris) + FILES_c = $(FILES_2D_c) + FILES_c += awt_LoadLibrary.c +-OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl ++OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL) + ifeq ($(CC_VER), 5.8) + ifndef REMOVE_ALL_WORKAROUNDS + ifeq ($(ARCH_FAMILY), i586) +@@ -121,7 +121,14 @@ + FILES_c = $(FILES_2D_c) + FILES_c += awt_LoadLibrary.c + OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH +-OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl ++OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL) ++endif ++ +ifeq ($(PLATFORM), bsd) +FILES_c = $(FILES_2D_c) +FILES_c += awt_LoadLibrary.c +OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH +OTHER_LDLIBS = $(JVMLIB) $(LIBM) -+endif -+ - FILES_c += initIDs.c + endif - # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX + FILES_c += initIDs.c @@ -237,7 +244,7 @@ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS endif # PLATFORM @@ -12072,8 +12211,8 @@ LDFLAGS += -L$(OPENWIN_LIB) endif ---- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-07-11 09:12:43.000000000 -0700 +--- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-07-04 12:38:37.000000000 -0700 @@ -533,11 +533,11 @@ X11SurfaceData_GetOps; @@ -12091,8 +12230,8 @@ # CDE private entry point Java_sun_awt_motif_XsessionWMcommand; ---- ./jdk/make/sun/awt/mawt.gmk 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/awt/mawt.gmk 2010-07-11 09:12:43.000000000 -0700 +--- ./jdk/make/sun/awt/mawt.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/awt/mawt.gmk 2010-08-06 21:58:27.000000000 -0700 @@ -169,7 +169,7 @@ OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi endif @@ -12102,20 +12241,16 @@ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH # XXX what is this define below? Isn't it motif-related? OTHER_CFLAGS += -DXMSTRINGDEFINES=1 -@@ -180,7 +180,11 @@ +@@ -180,7 +180,7 @@ # !HEADLESS OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \ - -lawt $(LIBM) -ldl -+ -lawt $(LIBM) -+ -+ifneq ($(PLATFORM), bsd) -+OTHER_LDLIBS += -ldl -+endif ++ -lawt $(LIBM) $(LIBDL) # # Sun CC with -Xa misdefines __STDC__ to 0 (zero). -@@ -198,6 +202,9 @@ +@@ -198,6 +198,9 @@ ifndef HEADLESS CPPFLAGS += -I$(OPENWIN_HOME)/include LDFLAGS += -L$(OPENWIN_LIB) @@ -12125,7 +12260,7 @@ endif # !HEADLESS -@@ -223,16 +230,33 @@ +@@ -223,16 +226,33 @@ -I$(PLATFORM_SRC)/native/$(PKGDIR) \ $(EVENT_MODEL) @@ -12159,8 +12294,8 @@ LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ $(AWT_RUNPATH) ---- ./jdk/make/sun/font/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/font/Makefile 2010-07-11 09:12:43.000000000 -0700 +--- ./jdk/make/sun/font/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/font/Makefile 2010-06-15 22:06:20.000000000 -0700 @@ -174,6 +174,15 @@ # Libraries to link, and other C flags. # @@ -12185,21 +12320,27 @@ endif # PLATFORM ---- ./jdk/make/sun/image/generic/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/image/generic/Makefile 2010-07-11 09:12:43.000000000 -0700 -@@ -69,5 +69,9 @@ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib +--- ./jdk/make/sun/image/generic/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/image/generic/Makefile 2010-10-31 14:16:39.000000000 -0700 +@@ -71,6 +71,6 @@ + OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES + + ifneq ($(PLATFORM), windows) +- OTHER_LDLIBS = $(LIBM) -ldl ++ OTHER_LDLIBS = $(LIBM) $(LIBDL) + endif + +--- ./jdk/make/sun/image/vis/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/image/vis/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -69,5 +69,5 @@ + CFLAGS += $(CFLAGS_$(ARCH)) $(INLINE) -I$(PLATFORM_SRC)/native/sun/awt/medialib -I$(SHARE_SRC)/native/sun/awt/medialib OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -OTHER_LDLIBS = $(LIBM) -ldl -+OTHER_LDLIBS = $(LIBM) -+ifneq ($(PLATFORM), bsd) -+OTHER_LDLIBS += -ldl -+endif -+ ++OTHER_LDLIBS = $(LIBM) $(LIBDL) ---- ./jdk/make/sun/jawt/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/jawt/Makefile 2010-07-11 09:12:43.000000000 -0700 +--- ./jdk/make/sun/jawt/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/jawt/Makefile 2010-06-15 22:06:20.000000000 -0700 @@ -93,8 +93,7 @@ # # Other extra flags needed for compiling. @@ -12227,62 +12368,77 @@ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt endif # PLATFORM ---- ./jdk/make/sun/security/ec/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/security/ec/Makefile 2010-07-11 09:12:43.000000000 -0700 -@@ -193,7 +193,11 @@ +--- ./jdk/make/sun/jdga/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/jdga/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -56,7 +56,7 @@ + vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR) + + ifneq ($(PLATFORM), windows) +- LDLIBS = -ldga -lX11 -ldl -lc ++ LDLIBS = -ldga -lX11 $(LIBDL) -lc + + CPPFLAGS += \ + -I$(SHARE_SRC)/javavm/export \ +--- ./jdk/make/sun/security/ec/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/security/ec/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -193,7 +193,7 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS += $(JVMLIB) else - OTHER_LDLIBS = -ldl $(JVMLIB) $(LIBCXX) -+ ifeq ($(PLATFORM), bsd) -+ OTHER_LDLIBS = $(JVMLIB) $(LIBCXX) -+ else -+ OTHER_LDLIBS = -ldl $(JVMLIB) $(LIBCXX) -+ endif ++ OTHER_LDLIBS = $(LIBDL) $(JVMLIB) $(LIBCXX) endif include $(BUILDDIR)/common/Mapfile-vers.gmk ---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-07-11 09:12:43.000000000 -0700 -@@ -72,6 +72,10 @@ +--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -72,6 +72,6 @@ # # Libraries to link # -ifneq ($(PLATFORM), windows) -+ifneq (,$(findstring $(PLATFORM), linux solaris)) - OTHER_LDLIBS = -ldl $(JVMLIB) +- OTHER_LDLIBS = -ldl $(JVMLIB) ++ifeq ($(PLATFORM), windows) ++OTHER_LDLIBS = $(LIBDL) $(JVMLIB) endif -+ -+ifeq ($(PLATFORM), bsd) -+ OTHER_LDLIBS = $(JVMLIB) -+endif ---- ./jdk/make/sun/security/pkcs11/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/security/pkcs11/Makefile 2010-07-11 09:12:43.000000000 -0700 -@@ -157,7 +157,7 @@ +--- ./jdk/make/sun/security/krb5/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/security/krb5/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -76,7 +76,7 @@ + ifeq ($(PLATFORM), windows) + OTHER_LDLIBS = $(JVMLIB) + else +- OTHER_LDLIBS = -ldl $(JVMLIB) ++ OTHER_LDLIBS = $(LIBDL) $(JVMLIB) + endif + + build: +--- ./jdk/make/sun/security/pkcs11/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/security/pkcs11/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -157,10 +157,10 @@ # # Libraries to link # -ifeq ($(PLATFORM), windows) -+ifneq (,$(findstring $(PLATFORM), windows bsd)) ++ifneq ($(PLATFORM), windows) OTHER_LDLIBS = $(JVMLIB) else - OTHER_LDLIBS = -ldl $(JVMLIB) ---- ./jdk/make/sun/security/smartcardio/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/security/smartcardio/Makefile 2010-07-11 09:12:44.000000000 -0700 -@@ -76,6 +76,10 @@ +- OTHER_LDLIBS = -ldl $(JVMLIB) ++ OTHER_LDLIBS = $(LIBDL) $(JVMLIB) + endif + + # Other config files +--- ./jdk/make/sun/security/smartcardio/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/security/smartcardio/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -76,6 +76,6 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS = $(JVMLIB) winscard.lib else - OTHER_LDLIBS = -ldl $(JVMLIB) -+ ifeq ($(PLATFORM), bsd) -+ OTHER_LDLIBS = $(JVMLIB) -+ else -+ OTHER_LDLIBS = -ldl $(JVMLIB) -+ endif ++ OTHER_LDLIBS = $(LIBDL) $(JVMLIB) OTHER_CFLAGS = -D__sun_jdk endif ---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-07-11 09:12:44.000000000 -0700 +--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-06-15 22:06:21.000000000 -0700 @@ -49,18 +49,6 @@ dgif_lib.c \ gif_err.c \ @@ -12321,8 +12477,8 @@ + zcrc32.c \ + zutil.c +endif ---- ./jdk/make/sun/splashscreen/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/splashscreen/Makefile 2010-07-11 09:12:44.000000000 -0700 +--- ./jdk/make/sun/splashscreen/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/splashscreen/Makefile 2010-06-15 22:06:21.000000000 -0700 @@ -64,8 +64,24 @@ ifneq ($(PLATFORM), windows) @@ -12373,8 +12529,19 @@ # Shun the less than portable MMX assembly code in pnggccrd.c, # and use alternative implementations in C. ---- ./jdk/make/sun/xawt/Makefile 2010-07-09 01:51:51.000000000 -0700 -+++ ./jdk/make/sun/xawt/Makefile 2010-07-11 09:12:44.000000000 -0700 +--- ./jdk/make/sun/tracing/dtrace/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/tracing/dtrace/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -56,7 +56,7 @@ + FILES_export = $(FILES_java) + + ifeq ($(PLATFORM), linux) +-OTHER_LDLIBS += -ldl ++OTHER_LDLIBS += $(LIBDL) + endif + + # +--- ./jdk/make/sun/xawt/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/sun/xawt/Makefile 2010-07-10 13:26:05.000000000 -0700 @@ -48,6 +48,9 @@ AUTO_JAVA_PRUNE = WrapperGenerator.java @@ -12443,8 +12610,8 @@ ifeq ($(MILESTONE), internal) CPPFLAGS += -DINTERNAL_BUILD endif ---- ./jdk/make/tools/freetypecheck/Makefile 2010-07-09 01:51:53.000000000 -0700 -+++ ./jdk/make/tools/freetypecheck/Makefile 2010-07-11 09:12:46.000000000 -0700 +--- ./jdk/make/tools/freetypecheck/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/tools/freetypecheck/Makefile 2010-06-15 22:06:21.000000000 -0700 @@ -49,8 +49,15 @@ # Add runtime lib search path to ensure test will be runnable ifeq ($(PLATFORM), solaris) @@ -12462,8 +12629,427 @@ endif endif FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH) ---- ./jdk/src/share/back/commonRef.c 2010-07-09 01:51:55.000000000 -0700 -+++ ./jdk/src/share/back/commonRef.c 2010-07-11 09:12:49.000000000 -0700 +--- ./jdk/make/tools/reorder/Makefile 2010-11-04 16:13:16.000000000 -0700 ++++ ./jdk/make/tools/reorder/Makefile 2010-08-06 21:58:27.000000000 -0700 +@@ -187,11 +187,11 @@ + + # This library 'libmcount.so' also used by hotspot reordering. + $(OBJDIR)/libmcount.so : $(MCOUNT_OBJ) +- $(CC) -G -mt -zdefs -o $@ $^ -ldl -lelf $(EXTRA_LIBS) ++ $(CC) -G -mt -zdefs -o $@ $^ $(LIBDL) -lelf $(EXTRA_LIBS) + + # This library 'libmcount.so' also used by hotspot reordering. + $(OBJDIR)/remove_mcount : remove_mcount.c +- $(CC) -g -o $@ $^ -ldl -lelf $(EXTRA_LIBS) ++ $(CC) -g -o $@ $^ $(LIBDL) -lelf $(EXTRA_LIBS) + + + # Reorder libraries. +--- ./jdk/src/bsd/doc/man/ja/kinit.1 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/src/bsd/doc/man/ja/kinit.1 2010-07-04 12:38:38.000000000 -0700 +@@ -0,0 +1,159 @@ ++'\" t ++.\" ++.\" Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. ++.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++.\" ++.\" This code is free software; you can redistribute it and/or modify it ++.\" under the terms of the GNU General Public License version 2 only, as ++.\" published by the Free Software Foundation. ++.\" ++.\" This code is distributed in the hope that it will be useful, but WITHOUT ++.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++.\" version 2 for more details (a copy is included in the LICENSE file that ++.\" accompanied this code). ++.\" ++.\" You should have received a copy of the GNU General Public License version ++.\" 2 along with this work; if not, write to the Free Software Foundation, ++.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++.\" ++.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++.\" or visit www.oracle.com if you need additional information or have any ++.\" questions. ++.\" ++.\" ++.\" ++.TH kinit 1 "2004 ǯ 6 ·î 22 Æü" ++.SH "̾Á°" ++kinit \- kinit ¤Ï Kerberos ¥Á¥±¥Ã¥Èµö²Ä¥Á¥±¥Ã¥È¤ò¼èÆÀ¤ª¤è¤Ó¥¥ã¥Ã¥·¥å ++¤¹¤ë¤È¤¤Ë»ÈÍѤ·¤Þ¤¹¡£¤³¤Î¥Ä¡¼¥ë¤Ï¤Û¤«¤Î°ìÈÌŪ¤Ê Kerberos ¼ÂÁõ ++(SEAM ¤ä MIT ¤Î¥ê¥Õ¥¡¥ì¥ó¥¹¼ÂÁõ¤Ê¤É) ¤Î kinit ¥Ä¡¼¥ë¤Èµ¡Ç½Åª¤Ë»÷¤Æ¤¤¤Þ¤¹¡£ ++.LP ++kinit ¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢kinit ¤ò¼Â¹Ô¤¹¤ëÁ°¤Ë Key Distribution Center ++(KDC) ¤ò»ÈÍѤ·¤Æ¥×¥ê¥ó¥·¥Ñ¥ë¤È¤·¤ÆÅÐÏ¿¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ++.SH "·Á¼°" ++.B kinit ++[ ++.IR commands " ]" ++<principal name> ++.SH "µ¡Ç½ÀâÌÀ" ++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢UNIX ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¾ì¹ç¡¢/tmp/krb5cc_<uid> ¤È¤¤¤¦ ++̾Á°¤Î¥¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤¬À¸À®¤µ¤ì¤Þ¤¹¡£<uid> ¤Ï¡¢¥·¥¹¥Æ¥à¤Ë¥í¥°¥¤¥ó ++¤·¤¿¥æ¡¼¥¶¤Î¥æ¡¼¥¶¼±ÊÌÈÖ¹æ¤Ç¤¹¡£¤½¤Î¾¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î¾ì¹ç¡¢ ++<USER_HOME>/krb5cc_<USER_NAME> ¤È¤¤¤¦Ì¾Á°¤Î¥¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë ++¤¬À¸À®¤µ¤ì¤Þ¤¹¡£ ++.LP ++<USER_HOME> ¤Ï ++.BR java.lang.System ++¥×¥í¥Ñ¥Æ¥£¤Î ++.BR user.home ++¤«¤é¼èÆÀ¤µ¤ì¤Þ¤¹¡£<USER_NAME> ¤Ï ++.BR java.lang.System ++¥×¥í¥Ñ¥Æ¥£¤Î ++.BR user.name ++¤«¤é¼èÆÀ¤µ¤ì¤Þ¤¹¡£<USER_HOME> ¤¬ null ¤Ç¤¢¤ë¾ì¹ç¡¢ ++¥¥ã¥Ã¥·¥å¥Õ¥¡¥¤¥ë¤Ï¥×¥í¥°¥é¥à¤ò¼Â¹Ô¤·¤¿¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë³ÊǼ¤µ¤ì ++¤Þ¤¹¡£<USER_NAME> ¤Ï¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥í¥°¥¤¥ó¥æ¡¼¥¶Ì¾ ++¤Ç¤¹¡£¤³¤Î¥æ¡¼¥¶Ì¾¤Ï¥æ¡¼¥¶¤Î¥×¥ê¥ó¥·¥Ñ¥ë̾¤È¤Ï°Û¤Ê¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£ ++¤¿¤È¤¨¤Ð Solaris ¤Ç¤Ï¡¢<USER_NAME> ¤¬ duke ¤Ç¤¢¤ê¡¢<USER_HOME> ++¤¬ /home/duke ¤Ç¤¢¤ë¾ì¹ç¡¢¥æ¡¼¥¶¤Î¥×¥ê¥ó¥·¥Ñ¥ë̾¤Ï /home/duke/krb5cc_duke ++¤Ë¤Ê¤ê¤Þ¤¹¡£ ++.LP ++¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥¡¼¥¿¥Ö̾¤Ï Kerberos ¹½À®¥Õ¥¡¥¤¥ë¤«¤é¼èÆÀ¤µ¤ì¤Þ¤¹¡£ ++¥¡¼¥¿¥Ö̾¤¬ Kerberos ¹½À®¥Õ¥¡¥¤¥ë¤Ë»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢¥¡¼¥¿¥Ö̾¤Ï <USER_HOME>/krb5.keytab ¤Ë¤Ê¤ê¤Þ¤¹¡£ ++.LP ++¥³¥Þ¥ó¥É¹Ô¤Î password ¥ª¥×¥·¥ç¥ó¤Ç¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢ ++kinit ¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤòµá¤á¤Þ¤¹¡£ ++.LP ++.B Ãí: ++¥³¥Þ¥ó¥É¹Ô¤Î password ¥ª¥×¥·¥ç¥ó¤Ï¥Æ¥¹¥È¤ÎÌÜŪ¤À¤±¤ËÄ󶡤µ¤ì¤Þ¤¹¡£ ++¥Ñ¥¹¥ï¡¼¥É¤ò¥¹¥¯¥ê¥×¥ÈÆâ¤Ë»ØÄꤷ¤¿¤ê¡¢¥³¥Þ¥ó¥É¹Ô¤Ë»ØÄꤷ¤¿¤ê¤·¤Ê¤¤¤Ç ++¤¯¤À¤µ¤¤¡£¤½¤¦¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¥Ñ¥¹¥ï¡¼¥É¤¬Ï³¤ì¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£ ++.LP ++¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢kinit ´ØÏ¢¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ ++.SH "¥³¥Þ¥ó¥É" ++.B kinit \-fp ++[ ++\-c <cache_name> ] ++[ ++\-k ] ++[ ++\-t <keytab_filename> ] ++[ ++<principal> ] ++[ ++<password> ] ++[ ++\-help ] ++.TP ++.BI \-f ++žÁ÷²Äǽ¤Ê¥Á¥±¥Ã¥È¤òȯ¹Ô¤·¤Þ¤¹¡£ ++.TP ++.BI \-p ++¥×¥í¥¥·²Äǽ¤Ê¥Á¥±¥Ã¥È¤òȯ¹Ô¤·¤Þ¤¹¡£ ++.TP ++.BI \-c ++<cache_name> ++¥¥ã¥Ã¥·¥å̾ (¤¿¤È¤¨¤Ð¡¢FILE:/temp/mykrb5cc)¡£ ++.TP ++.BI \-k ++¥¡¼¥¿¥Ö¤ò»ÈÍѤ·¤Þ¤¹¡£ ++.TP ++.BI \-t ++<keytab_filename> ++¥¡¼¥¿¥Ö̾ (¤¿¤È¤¨¤Ð¡¢/home/duke/krb5.keytab)¡£ ++.TP ++.BI <principal> ++¥×¥ê¥ó¥·¥Ñ¥ë̾ (¤¿¤È¤¨¤Ð¡¢duke@java.sun.com)¡£ ++.TP ++.BI <password> ++¥×¥ê¥ó¥·¥Ñ¥ë¤Î Kerberos ¥Ñ¥¹¥ï¡¼¥É (¥³¥Þ¥ó¥É¹Ô¤ä¥¹¥¯¥ê¥×¥È¤Ë¥Ñ¥¹¥ï¡¼¥É ++¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤)¡£ ++.TP ++.BI \-help ++¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹¡£ ++.SH "»ÈÍÑÎã" ++ǧ¾Ú¤Ë͸ú¤Ê»ñ³Ê¤ò¸½ºß¤Î¥¯¥é¥¤¥¢¥ó¥È¥Û¥¹¥È¤«¤éÍ׵ᤷ¤Æ¡¢ ++¥Ç¥Õ¥©¥ë¥È¥µ¡¼¥Ó¥¹¤Î¤¿¤á¤Ë»ñ³Ê¤Î¥¥ã¥Ã¥·¥å¤ò¥Ç¥Õ¥©¥ë¥È¤Î¾ì½ê ++(/home/duke/krb5cc_duke) ¤Ë³ÊǼ¤·¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++kinit duke@JAVA.SUN.COM ++.fi ++.ft 1 ++.LP ++°Û¤Ê¤ë¥×¥ê¥ó¥·¥Ñ¥ë¤Î¤¿¤á¤Ë¥×¥í¥¥·²Äǽ¤Ê»ñ³Ê¤òÍ׵ᤷ¤Æ¡¢¤³¤ì¤é¤Î»ñ³Ê¤ò ++»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¥¥ã¥Ã¥·¥å¤Ë³ÊǼ¤·¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++kinit \-p \-c FILE:/home/duke/credentials/krb5cc_cafebeef cafebeef@JAVA.SUN.COM ++.fi ++.ft 1 ++.LP ++°Û¤Ê¤ë¥×¥ê¥ó¥·¥Ñ¥ë¤Î¤¿¤á¤Ë¥×¥í¥¥·²Äǽ¤ÇžÁ÷²Äǽ¤Ê»ñ³Ê¤òÍ׵ᤷ¤Æ¡¢ ++¤³¤ì¤é¤Î»ñ³Ê¤ò»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¥¥ã¥Ã¥·¥å¤Ë³ÊǼ¤·¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++kinit \-f \-p \-c ++FILE:/home/duke/credentials/krb5cc_cafebeef cafebeef@JAVA.SUN.COM ++.fi ++.ft 1 ++.LP ++kinit ¤Î¥Ø¥ë¥×¥á¥Ë¥å¡¼¤òɽ¼¨¤·¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++kinit \-help ++.fi ++.ft 1 ++.LP ++.SH "¥»¥¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë·Ù¹ð" ++¥³¥Þ¥ó¥É¹Ô¤Î ++.BR password ++¥ª¥×¥·¥ç¥ó¤Ï¥Æ¥¹¥È¤ÎÌÜŪ¤À¤±¤ËÄ󶡤µ¤ì¤Þ¤¹¡£¥Ñ¥¹¥ï¡¼¥É¤ò¥³¥Þ¥ó¥É¹Ô¤Ë»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£ ++¤³¤ì¤Ï¥»¥¥å¥ê¥Æ¥£¥Û¡¼¥ë¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢UNIX ¤Î ++.BR ps ++¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢¹¶·â¼Ô¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤¤Æ¤·¤Þ¤¤¤Þ¤¹¡£ +--- ./jdk/src/bsd/doc/man/ja/klist.1 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/src/bsd/doc/man/ja/klist.1 2010-07-04 12:38:38.000000000 -0700 +@@ -0,0 +1,110 @@ ++'\" t ++.\" ++.\" Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. ++.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++.\" ++.\" This code is free software; you can redistribute it and/or modify it ++.\" under the terms of the GNU General Public License version 2 only, as ++.\" published by the Free Software Foundation. ++.\" ++.\" This code is distributed in the hope that it will be useful, but WITHOUT ++.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++.\" version 2 for more details (a copy is included in the LICENSE file that ++.\" accompanied this code). ++.\" ++.\" You should have received a copy of the GNU General Public License version ++.\" 2 along with this work; if not, write to the Free Software Foundation, ++.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++.\" ++.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++.\" or visit www.oracle.com if you need additional information or have any ++.\" questions. ++.\" ++.\" ++.TH klist 1 "2004 ǯ 6 ·î 22 Æü" ++.SH "̾Á°" ++klist \- Kerberos ¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å¤È¥¡¼¥¿¥ÖÆâ¤Î¥¨¥ó¥È¥ê¤òɽ¼¨¤·¤Þ¤¹¡£ ++.LP ++.BR klist ++¤ò»ÈÍѤ¹¤ë¤È¡¢¥æ¡¼¥¶¤Ï¥í¡¼¥«¥ë¤Ë¤¢¤ë¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å¤È ++¥¡¼¥Æ¡¼¥Ö¥ëÆâ¤Î¥¨¥ó¥È¥ê¤òɽ¼¨¤Ç¤¤Þ¤¹¡£ ++.SH "·Á¼°" ++.B klist ++[ ++.IR commands " ]" ++.SH "µ¡Ç½ÀâÌÀ" ++.BR klist ++¤Ï¥í¡¼¥«¥ë¤Ë¤¢¤ë¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å¤È¥¡¼¥Æ¡¼¥Ö¥ëÆâ¤Î¥¨¥ó¥È¥ê¤òɽ¼¨¤·¤Þ¤¹¡£ ++¥æ¡¼¥¶¤¬ ++.BR kinit ++¤ò»ÈÍѤ·¤Æ¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å¤òÊѹ¹¤·¤¿¤ê¡¢ ++.BR ktab ++¤ò»ÈÍѤ·¤Æ¥¡¼¥¿¥Ö¤òÊѹ¹¤·¤¿¸å¡¢Êѹ¹¤ò³Îǧ¤¹¤ëÍ£°ì¤ÎÊýË¡¤Ï¡¢ ++.BR klist ++¤ò»ÈÍѤ·¤Æ¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å¤Þ¤¿¤Ï¥¡¼¥¿¥Ö¤ÎÆâÍƤòɽ¼¨¤¹¤ë¤³¤È¤Ç¤¹¡£ ++.BR klist ++¤Ï Kerberos ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÊѹ¹¤·¤Þ¤»¤ó¡£ ++ ++.SH "¥³¥Þ¥ó¥É" ++.B klist ++[ ++\-c [\-fe]] ++[ ++\-k [\-tK]] ++[ ++<name>] ++[ ++\-help ] ++.TP ++.BI \-c ++ɽ¼¨¤·¤¿¤¤¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£ ++.TP ++.BI \-k ++ɽ¼¨¤·¤¿¤¤¥¡¼¥¿¥Ö¤Î¥¨¥ó¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£ ++.TP ++.BI <cache_name> ++¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å̾¤Þ¤¿¤Ï¥¡¼¥¿¥Ö̾¤ò»ØÄꤷ¤Þ¤¹¡£Ì¾Á°¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¡¢ ++¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å̾¤Þ¤¿¤Ï¥¡¼¥¿¥Ö¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»ÈÍѤµ¤ì¤Þ¤¹¡£ ++¥¥ã¥Ã¥·¥å¤È¥¡¼¥¿¥Ö¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤˤĤ¤¤Æ¤Ï¡¢ ++.BR kinit ++¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ ++.LP ++\-c ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥åÍѤΥª¥×¥·¥ç¥ó¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£ ++.TP ++.BI \-f ++¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥Õ¥é¥°¤òɽ¼¨¤·¤Þ¤¹¡£ ++.TP ++.BI \-e ++°Å¹æ²½¥¿¥¤¥×¤òɽ¼¨¤·¤Þ¤¹¡£ ++.LP ++\-k ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤¿¾ì¹ç¡¢¥¡¼¥¿¥ÖÍѤΥª¥×¥·¥ç¥ó¤Ï¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£ ++.TP ++.BI \-t ++¥¡¼¥¿¥Ö¥¨¥ó¥È¥ê¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤òɽ¼¨¤·¤Þ¤¹¡£ ++.TP ++.BI \-K ++¥¡¼¥¿¥Ö¥¨¥ó¥È¥ê¤Î DES ¥¡¼¤òɽ¼¨¤·¤Þ¤¹¡£ ++.LP ++.TP ++.BI \-help ++¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹¡£ ++.SH "»ÈÍÑÎã" ++»ØÄꤷ¤¿¥¡¼¥Æ¡¼¥Ö¥ë¤Î¥¨¥ó¥È¥ê¤È¡¢¤½¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤È DES ¥¡¼ ++¤òɽ¼¨¤·¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++klist \-k \-t \-K FILE:/temp/mykrb5cc ++.fi ++.ft 1 ++.LP ++»ØÄꤷ¤¿¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¤È¡¢¤½¤Î¥¯¥ì¥Ç¥ó¥·¥ã¥ë¥Õ¥é¥°¤È¥¢¥É¥ì¥¹¥ê¥¹¥È¤ò ++ɽ¼¨¤·¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++klist \-c \-f FILE:/temp/mykrb5cc ++.fi ++.ft 1 ++.LP +--- ./jdk/src/bsd/doc/man/ja/ktab.1 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/src/bsd/doc/man/ja/ktab.1 2010-07-04 12:38:38.000000000 -0700 +@@ -0,0 +1,125 @@ ++'\" t ++.\" ++.\" Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved. ++.\" DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++.\" ++.\" This code is free software; you can redistribute it and/or modify it ++.\" under the terms of the GNU General Public License version 2 only, as ++.\" published by the Free Software Foundation. ++.\" ++.\" This code is distributed in the hope that it will be useful, but WITHOUT ++.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++.\" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++.\" version 2 for more details (a copy is included in the LICENSE file that ++.\" accompanied this code). ++.\" ++.\" You should have received a copy of the GNU General Public License version ++.\" 2 along with this work; if not, write to the Free Software Foundation, ++.\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++.\" ++.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++.\" or visit www.oracle.com if you need additional information or have any ++.\" questions. ++.\" ++.\" ++.TH ktab 1 "2004 ǯ 6 ·î 22 Æü" ++.SH "̾Á°" ++ktab \- Kerberos ¥¡¼¥Æ¡¼¥Ö¥ë¥Þ¥Í¡¼¥¸¥ã ++.LP ++.BR ktab ++¤ò»ÈÍѤ¹¤ë¤È¡¢¥æ¡¼¥¶¤Ï¥í¡¼¥«¥ë¤Ë¤¢¤ë¥¡¼¥Æ¡¼¥Ö¥ë¤Ë³ÊǼ¤µ¤ì¤¿ ++¥×¥ê¥ó¥·¥Ñ¥ë̾¤È¥µ¡¼¥Ó¥¹¥¡¼¤ò´ÉÍý¤Ç¤¤Þ¤¹¡£¥¡¼¥¿¥ÖÆâ¤Î¥×¥ê¥ó¥·¥Ñ¥ë ++¤È¥¡¼¥Ú¥¢¤Ï¡¢¥Û¥¹¥È¾å¤ÇÆ°ºî¤·¤Æ¤¤¤ë¥µ¡¼¥Ó¥¹¤Ë¡¢¤½¤ì¤é¼«¿È¤ò ++Key Distribution Center (KDC) ¤Ëǧ¾Ú¤µ¤»¤Þ¤¹¡£¥µ¡¼¥Ð¤¬ Kerberos ¤ò ++»ÈÍѤǤ¤ë¤è¤¦¤ËÀßÄꤹ¤ë¤Ë¤Ï¡¢¤½¤ÎÁ°¤Ë¥æ¡¼¥¶¤Ï¥µ¡¼¥Ð¤¬Æ°ºî¤·¤Æ¤¤¤ë ++¥Û¥¹¥È¾å¤Ç¥¡¼¥¿¥Ö¤òÀßÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ktab ¤ò»ÈÍѤ·¤Æ¥¡¼¥¿¥Ö ++¤òÊѹ¹¤·¤Æ¤â¡¢Kerberos ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤Ï±Æ¶Á¤·¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ ++¤¤¡£¥¡¼¥¿¥ÖÆâ¤Î¥¡¼¤òÊѹ¹¤·¤¿¾ì¹ç¡¢Kerberos ¥Ç¡¼¥¿¥Ù¡¼¥¹Æâ¤ÎÂбþ¤¹¤ë ++²Õ½ê¤âÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ++.SH "·Á¼°" ++.B ktab ++[ ++.IR commands " ]" ++.SH "µ¡Ç½ÀâÌÀ" ++.BR ktab ++¤Ï¡¢¥¡¼¥Æ¡¼¥Ö¥ëÆâ¤Î¥×¥ê¥ó¥·¥Ñ¥ë̾¤È¥¡¼¥Ú¥¢¤ò´ÉÍý¤·¤Þ¤¹¡£ ++.BR ktab ++¤ò»ÈÍѤ¹¤ë¤È¡¢¥æ¡¼¥¶¤Ï¥¡¼¥Æ¡¼¥Ö¥ëÆâ¤Î¥×¥ê¥ó¥·¥Ñ¥ë̾¤È¥¡¼¥Ú¥¢¤ò ++°ìÍ÷ɽ¼¨¡¢Äɲᢹ¹¿·¡¢¤Þ¤¿¤Ïºï½ü¤Ç¤¤Þ¤¹¡£¤³¤ì¤é¤ÎÁàºî¤Ï¤¹¤Ù¤Æ¡¢ ++Kerberos ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¤Ï±Æ¶Á¤·¤Þ¤»¤ó¡£ ++.LP ++.ft 3 ++.B ¥¡¼¥¿¥Ö ++.LP ++¥¡¼¥¿¥Ö¤È¤Ï¡¢¥Û¥¹¥È¤¬»ý¤Ä¼«Ê¬¼«¿È¤Î¥¡¼¥ê¥¹¥È¤Î¥³¥Ô¡¼¤Ç¤¢¤ê¡¢¥æ¡¼¥¶ ++¤Î¥Ñ¥¹¥ï¡¼¥É¤È»÷¤Æ¤¤¤Þ¤¹¡£¼«Ê¬¼«¿È¤ò Key Distribution Center (KDC) ++¤Ëǧ¾Ú¤µ¤»¤ëɬÍפ¬¤¢¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥µ¡¼¥Ð¤Ï¡¢¤½¤ì¼«¿È¤Î¥×¥ê¥ó¥·¥Ñ¥ë ++¤È¥¡¼¤ò´Þ¤à¥¡¼¥¿¥Ö¤ò»ý¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¥æ¡¼¥¶¤¬¼«Ê¬¤Î ++¥Ñ¥¹¥ï¡¼¥É¤òÊݸ¤ë¤³¤È¤¬ÂçÀڤǤ¢¤ë¤Î¤ÈƱÍͤˡ¢¥Û¥¹¥È¤Ï¼«Ê¬¤Î¥¡¼¥¿¥Ö ++¤òÊݸ¤ë¤³¤È¤¬ÂçÀڤǤ¹¡£¥¡¼¥¿¥Ö¥Õ¥¡¥¤¥ë¤Ï¾ï¤Ë¥í¡¼¥«¥ë¥Ç¥£¥¹¥¯¤Ë ++³ÊǼ¤·¤Æ¡¢root °Ê³°¤Î¥æ¡¼¥¶¤¬Æɤá¤Ê¤¤¤è¤¦¤ËÀßÄꤷ¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£ ++¥¡¼¥¿¥Ö¥Õ¥¡¥¤¥ë¤Ï°Å¹æ²½¤»¤º¤Ë¥Í¥Ã¥È¥ï¡¼¥¯¤ØÁ÷¿®¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£ ++.SH "¥³¥Þ¥ó¥É" ++»ÈÍÑË¡: ¥³¥Þ¥ó¥É¹Ô¥ª¥×¥·¥ç¥ó¤Ç¤ÏÂçʸ»ú¤È¾®Ê¸»ú¤Ï¶èÊ̤·¤Þ¤»¤ó¡£ ++.LP ++.B ktab ++\-help ++.LP ++.B ktab ++\-l [\-k <keytab_name>] ++.LP ++.B ktab ++[\-a <principal_name> <password>] [\-k <keytab_name>] ++.LP ++.B ktab ++[\-d <principal_name>] [\-k <keytab_name>] ++.LP ++.TP ++.BI \-l ++¥¡¼¥¿¥Ö̾¤È¥¨¥ó¥È¥ê¤ò°ìÍ÷ɽ¼¨¤·¤Þ¤¹¡£ ++.TP ++.BI \-a ++<principal_name> <password> ++¥¨¥ó¥È¥ê¤ò¥¡¼¥¿¥Ö¤ËÄɲä·¤Þ¤¹¡£Kerberos ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÏÊѹ¹¤·¤Þ¤»¤ó ++(¥³¥Þ¥ó¥É¹Ô¤ä¥¹¥¯¥ê¥×¥È¤Ë¥Ñ¥¹¥ï¡¼¥É¤ò»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤)¡£ ++.TP ++.BI \-d ++<principal_name> ++¥¡¼¥¿¥Ö¤«¤é¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹¡£Kerberos ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÏÊѹ¹¤·¤Þ¤»¤ó¡£ ++.TP ++.BI \-k ++<keytab_name> ++¥¡¼¥¿¥Ö̾¤È¡¢ÀÜƬ¼ FILE: ¤Ç»Ï¤Þ¤ë¥Ñ¥¹¤ò»ØÄꤷ¤Þ¤¹¡£ ++.TP ++.BI \-help ++¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹¡£ ++.SH "»ÈÍÑÎã" ++¥Ç¥Õ¥©¥ë¥È¤Î¥¡¼¥Æ¡¼¥Ö¥ëÆâ¤Î¥¨¥ó¥È¥ê¤ò¤¹¤Ù¤Æɽ¼¨¤·¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++ktab \-l ++.fi ++.ft 1 ++.LP ++¿·¤·¤¤¥×¥ê¥ó¥·¥Ñ¥ë¤ò¥¡¼¥Æ¡¼¥Ö¥ë¤ËÄɲä·¤Þ¤¹¡£¥Ñ¥¹¥ï¡¼¥É¤ÎÆþÎϤ¬µá¤á¤é¤ì¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++ktab \-a duke@java.sun.com ++.fi ++.ft 1 ++.LP ++¥¡¼¥Æ¡¼¥Ö¥ë¤«¤é¥×¥ê¥ó¥·¥Ñ¥ë¤òºï½ü¤·¤Þ¤¹¡£ ++.LP ++.ft 3 ++.nf ++ktab \-d duke@java.sun.com ++.fi ++.ft 1 ++.LP ++.SH "¥»¥¥å¥ê¥Æ¥£¤Ë´Ø¤¹¤ë·Ù¹ð" ++¥Ñ¥¹¥ï¡¼¥É¤ò¥³¥Þ¥ó¥É¹Ô¤Ë»ØÄꤷ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£¤³¤ì¤Ï¥»¥¥å¥ê¥Æ¥£¥Û¡¼¥ë ++¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢UNIX ¤Î ++.BI ps ++¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢¹¶·â¼Ô¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤¤Æ¤·¤Þ¤¤¤Þ¤¹¡£ +--- ./jdk/src/share/back/commonRef.c 2010-11-04 16:13:17.000000000 -0700 ++++ ./jdk/src/share/back/commonRef.c 2010-06-15 22:06:23.000000000 -0700 @@ -23,6 +23,10 @@ * questions. */ @@ -12475,8 +13061,8 @@ #include "util.h" #include "commonRef.h" ---- ./jdk/src/share/bin/java.c 2010-07-09 01:51:55.000000000 -0700 -+++ ./jdk/src/share/bin/java.c 2010-07-11 09:12:49.000000000 -0700 +--- ./jdk/src/share/bin/java.c 2010-11-04 16:13:17.000000000 -0700 ++++ ./jdk/src/share/bin/java.c 2010-10-31 14:12:34.000000000 -0700 @@ -66,6 +66,10 @@ static jboolean printUsage = JNI_FALSE; /* print and exit*/ static jboolean printXUsage = JNI_FALSE; /* print and exit*/ @@ -12499,7 +13085,7 @@ /* Maximum supported entries from jvm.cfg. */ #define INIT_MAX_KNOWN_VMS 10 -@@ -297,9 +305,16 @@ +@@ -300,9 +308,16 @@ /* Show the splash screen if needed */ ShowSplashScreen(); @@ -12516,8 +13102,8 @@ - +#endif } - - #define CHECK_EXCEPTION_NULL_LEAVE(e) \ + /* + * Always detach the main thread so that it appears to have ended when @@ -1015,6 +1030,12 @@ } else if (JLI_StrCmp(arg, "-X") == 0) { printXUsage = JNI_TRUE; @@ -12531,7 +13117,7 @@ /* * The following case provide backward compatibility with old-style * command line options. -@@ -1902,6 +1923,44 @@ +@@ -1901,6 +1922,44 @@ } } @@ -12576,8 +13162,8 @@ static void DumpState() { ---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-07-09 01:51:56.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-07-11 09:12:51.000000000 -0700 +--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-11-04 16:13:17.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-06-15 22:06:25.000000000 -0700 @@ -477,6 +477,10 @@ String[] dirs = new String[] { userHome + sep + ".themes", @@ -12589,8 +13175,8 @@ "/usr/share/themes", "/usr/gnome/share/themes", // Debian/Redhat/Solaris "/opt/gnome2/share/themes" // SuSE ---- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-07-09 01:51:58.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-07-11 09:12:54.000000000 -0700 +--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-11-04 16:13:17.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-06-15 22:06:27.000000000 -0700 @@ -78,6 +78,9 @@ */ public long timeStamp ; @@ -12601,7 +13187,7 @@ /** ---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-07-11 09:19:13.000000000 -0700 +--- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 1969-12-31 16:00:00.000000000 -0800 @@ -1,6 +0,0 @@ -# service provider file for Bsd: with DirectAudioDeviceProvider @@ -12610,7 +13196,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-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,193 +0,0 @@ -/* @@ -12806,8 +13392,8 @@ - } - -} ---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-07-09 01:52:03.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-07-11 09:13:02.000000000 -0700 +--- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-11-04 16:13:18.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-06-15 22:06:34.000000000 -0700 @@ -172,7 +172,12 @@ } else { String osName = System.getProperty("os.name"); @@ -12822,9 +13408,9 @@ (System.getenv("DISPLAY") == null)); } } else if (nm.equals("true")) { ---- ./jdk/src/share/classes/java/util/TimeZone.java 2010-07-09 01:52:09.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-07-11 09:13:11.000000000 -0700 -@@ -776,15 +776,13 @@ +--- ./jdk/src/share/classes/java/util/TimeZone.java 2010-11-04 16:13:20.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-10-31 14:12:35.000000000 -0700 +@@ -810,15 +810,13 @@ } int gmtOffset = (hours * 60 + num) * 60 * 1000; @@ -12841,8 +13427,8 @@ } return zi; } ---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-07-09 01:52:18.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-07-11 09:13:25.000000000 -0700 +--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-11-04 16:13:22.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-06-15 22:06:56.000000000 -0700 @@ -1122,7 +1122,7 @@ */ HashMap<String, Boolean> existsMap; @@ -12861,8 +13447,8 @@ errors++; } } ---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-07-09 01:52:18.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-07-11 09:13:25.000000000 -0700 +--- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-11-04 16:13:22.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-06-15 22:06:56.000000000 -0700 @@ -39,6 +39,7 @@ WINDOWS, LINUX, @@ -12886,8 +13472,8 @@ // determine another OS here } ---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-07-09 01:52:19.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-07-11 09:13:26.000000000 -0700 +--- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-11-04 16:13:22.000000000 -0700 ++++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-10-31 14:12:35.000000000 -0700 @@ -46,6 +46,8 @@ public static boolean isLinux; @@ -12897,7 +13483,7 @@ public static boolean isSolaris8; public static boolean isSolaris9; -@@ -70,6 +72,11 @@ +@@ -74,6 +76,11 @@ isLinux = osName.startsWith("Linux"); @@ -12909,8 +13495,8 @@ String t2kStr = System.getProperty("sun.java2d.font.scaler"); if (t2kStr != null) { useT2K = "t2k".equals(t2kStr); ---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-07-09 01:52:19.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-07-11 09:13:26.000000000 -0700 +--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-11-04 16:13:22.000000000 -0700 ++++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-06-15 22:06:58.000000000 -0700 @@ -413,7 +413,7 @@ * registerFonts method as on-screen these JRE fonts * always go through the T2K rasteriser. @@ -12920,7 +13506,7 @@ /* Linux font configuration uses these fonts */ registerFontDir(jreFontDirName); } ---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,190 +0,0 @@ -/* @@ -13113,7 +13699,7 @@ - return charOff - outOff; - } -} ---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,193 +0,0 @@ -/* @@ -13309,7 +13895,7 @@ - return 2; - } -} ---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,370 +0,0 @@ -/* @@ -13682,8 +14268,8 @@ - } - } -} ---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-07-09 01:52:25.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-07-11 09:13:33.000000000 -0700 +--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-11-04 16:13:23.000000000 -0700 ++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-06-15 22:07:04.000000000 -0700 @@ -1534,7 +1534,9 @@ pFlags |= NOSHEET; ncomps+=1; @@ -13695,8 +14281,8 @@ execCmd = new String[ncomps]; execCmd[n++] = "/usr/bin/lpr"; if ((pFlags & PRINTER) != 0) { ---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-07-09 01:52:26.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-07-11 09:13:35.000000000 -0700 +--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-11-04 16:13:23.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-06-15 22:07:06.000000000 -0700 @@ -83,7 +83,9 @@ String osname = System.getProperty("os.name"); if (osname.startsWith("SunOS")) { @@ -13708,15 +14294,15 @@ gssLibs = new String[]{ "libgssapi.so", "libgssapi_krb5.so", ---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-07-09 01:52:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-07-11 09:13:40.000000000 -0700 +--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-11-04 16:13:24.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-06-15 22:07:11.000000000 -0700 @@ -30,3 +30,4 @@ #[solaris]sun.tools.attach.SolarisAttachProvider #[windows]sun.tools.attach.WindowsAttachProvider #[linux]sun.tools.attach.LinuxAttachProvider +#[bsd]sun.tools.attach.BsdAttachProvider ---- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-07-09 01:52:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-07-11 09:13:40.000000000 -0700 +--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-11-04 16:13:24.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-06-15 22:07:11.000000000 -0700 @@ -50,6 +50,7 @@ String zname = ""; String[] files; @@ -13787,8 +14373,8 @@ if (!d.exists() && !d.mkdirs() || !d.isDirectory()) { throw new IOException(formatMsg( "error.create.dir", d.getPath())); ---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-07-09 01:52:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-07-11 09:13:40.000000000 -0700 +--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-11-04 16:13:24.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-06-15 22:07:11.000000000 -0700 @@ -44,6 +44,8 @@ {0} : could not create directory error.incorrect.length=\ @@ -13798,8 +14384,8 @@ out.added.manifest=\ added manifest out.update.manifest=\ ---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-07-09 01:52:33.000000000 -0700 -+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-07-11 09:13:45.000000000 -0700 +--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-11-04 16:13:24.000000000 -0700 ++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-06-15 22:07:15.000000000 -0700 @@ -38,6 +38,7 @@ # gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9] # gnumake JDK=<java_home> OSNAME=linux [OPT=true] @@ -13838,8 +14424,8 @@ # Common -I options CFLAGS += -I. CFLAGS += -I../agent_util ---- ./jdk/src/share/hpi/include/hpi_impl.h 2010-07-09 01:52:34.000000000 -0700 -+++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-07-11 09:13:46.000000000 -0700 +--- ./jdk/src/share/hpi/include/hpi_impl.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-06-15 22:07:16.000000000 -0700 @@ -138,7 +138,11 @@ int sysBind(int fd, struct sockaddr *him, int len); int sysAccept(int fd, struct sockaddr *him, int *len); @@ -13854,7 +14440,7 @@ int tolen); ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags, --- ./jdk/src/share/lib/security/java.security-openbsd 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/lib/security/java.security-openbsd 2010-07-11 09:13:47.000000000 -0700 ++++ ./jdk/src/share/lib/security/java.security-openbsd 2010-01-30 09:28:24.000000000 -0800 @@ -0,0 +1,269 @@ +# +# This is the "master security properties file". @@ -14125,8 +14711,8 @@ +# Example, +# ocsp.responderCertSerialNumber=2A:FF:00 + ---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-07-09 01:52:34.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-06-15 22:07:17.000000000 -0700 @@ -32,6 +32,10 @@ #include <unistd.h> #endif @@ -14152,8 +14738,8 @@ #ifdef _MSC_VER typedef LONGLONG jlong; typedef DWORDLONG julong; ---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-07-09 01:52:34.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-06-15 22:07:17.000000000 -0700 @@ -22,6 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. @@ -14194,8 +14780,8 @@ true)); } ---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-07-09 01:52:34.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-06-15 22:07:17.000000000 -0700 @@ -33,7 +33,11 @@ #include <jni.h> @@ -14208,8 +14794,8 @@ #include "SoundDefs.h" #include "DirectAudio.h" #include "Utilities.h" ---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-07-09 01:52:34.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-06-15 22:07:17.000000000 -0700 @@ -99,5 +99,17 @@ return com_sun_media_sound_Platform_LIB_ALSA; } @@ -14228,8 +14814,8 @@ +#endif return 0; } ---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-07-09 01:52:34.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-15 22:07:17.000000000 -0700 @@ -31,6 +31,7 @@ #define X_WINDOWS 1 #define X_SOLARIS 2 @@ -14257,8 +14843,8 @@ + + #endif // __SOUNDDEFS_INCLUDED__ ---- ./jdk/src/share/native/common/check_code.c 2010-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/common/check_code.c 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/common/check_code.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/common/check_code.c 2010-10-31 14:12:35.000000000 -0700 @@ -1067,7 +1067,7 @@ * Make sure that branches don't go into the middle of nowhere. */ @@ -14320,8 +14906,8 @@ /* There can't be more than 64K labels because of the limit * on per-method byte code length. */ ---- ./jdk/src/share/native/java/io/io_util.h 2010-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/java/io/io_util.h 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/java/io/io_util.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/java/io/io_util.h 2010-06-15 22:07:17.000000000 -0700 @@ -29,7 +29,15 @@ extern jfieldID IO_fd_fdID; extern jfieldID IO_handle_fdID; @@ -14339,8 +14925,8 @@ #define O_SYNC (0x0800) #define O_DSYNC (0x2000) #endif ---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-10-31 14:12:35.000000000 -0700 @@ -24,6 +24,15 @@ * questions. */ @@ -14367,22 +14953,8 @@ #define __HI(x) *(1+(int*)&x) #define __LO(x) *(int*)&x #define __HIp(x) *(1+(int*)x) -@@ -46,11 +56,13 @@ - #define __LOp(x) *(1+(int*)x) - #endif - -+#ifndef __P - #ifdef __STDC__ - #define __P(p) p - #else - #define __P(p) () - #endif -+#endif - - /* - * ANSI/POSIX ---- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-07-11 09:13:47.000000000 -0700 +--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-06-15 22:07:17.000000000 -0700 @@ -61,7 +61,7 @@ #define log1p jlog1p #define expm1 jexpm1 @@ -14392,9 +14964,9 @@ #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-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-07-11 09:13:48.000000000 -0700 -@@ -65,6 +65,10 @@ +--- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-10-31 14:12:36.000000000 -0700 +@@ -67,6 +67,10 @@ return jlong_zero; } else { char *msg; @@ -14405,7 +14977,7 @@ switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) { case Z_OK: return ptr_to_jlong(strm); -@@ -197,6 +201,10 @@ +@@ -213,6 +217,10 @@ if (inflateReset(jlong_to_ptr(addr)) != Z_OK) { JNU_ThrowInternalError(env, 0); } @@ -14416,8 +14988,8 @@ } JNIEXPORT void JNICALL ---- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-07-11 09:13:48.000000000 -0700 +--- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-06-15 22:07:18.000000000 -0700 @@ -46,6 +46,10 @@ #include "zip_util.h" #include "zlib.h" @@ -14429,8 +15001,8 @@ /* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */ #ifdef USE_MMAP #include <sys/mman.h> ---- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-07-11 09:13:48.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-06-15 22:07:18.000000000 -0700 @@ -50,7 +50,9 @@ #include <stdio.h> #include <string.h> @@ -14441,8 +15013,8 @@ #include <limits.h> /* keep these after the other headers */ ---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-07-11 09:13:48.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-10-31 14:12:36.000000000 -0700 @@ -24,7 +24,11 @@ */ @@ -14455,8 +15027,8 @@ #include "sun_awt_image_BufImgSurfaceData.h" ---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-07-09 01:52:35.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-07-11 09:13:48.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-06-15 22:07:18.000000000 -0700 @@ -23,7 +23,11 @@ * questions. */ @@ -14469,8 +15041,8 @@ #include "SurfaceData.h" #include "sun_awt_image_DataBufferNative.h" ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-07-09 01:52:36.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-06-15 22:07:19.000000000 -0700 @@ -86,7 +86,7 @@ #endif /* MLIB_USE_FTOI_CLAMPING */ @@ -14510,8 +15082,8 @@ #endif /* _NO_LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-07-09 01:52:36.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-06-15 22:07:20.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14551,8 +15123,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-07-09 01:52:36.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-06-15 22:07:20.000000000 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14592,8 +15164,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-07-09 01:52:36.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-06-15 22:07:20.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14633,8 +15205,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-07-09 01:52:36.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-06-15 22:07:20.000000000 -0700 @@ -95,7 +95,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14674,8 +15246,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-07-09 01:52:36.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-06-15 22:07:20.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14715,8 +15287,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-06-15 22:07:20.000000000 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -14756,8 +15328,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-06-15 22:07:20.000000000 -0700 @@ -95,7 +95,7 @@ dst = dp[0]; if (ld_offset + size < 32) { @@ -14977,8 +15549,8 @@ } #else /* _LONGLONG */ ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-10-31 14:12:36.000000000 -0700 @@ -168,7 +168,7 @@ } @@ -14997,7 +15569,7 @@ /***************************************************************/ void mlib_ImageLookUp_U8_D64(const mlib_u8 *src, -@@ -612,7 +612,7 @@ +@@ -613,7 +613,7 @@ #pragma pipeloop(0) #endif /* __SUNPRO_C */ for (i = 0; i < size - 7; i += 4, dp += 8, sa++) { @@ -15006,7 +15578,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8)); -@@ -622,12 +622,12 @@ +@@ -623,12 +623,12 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); @@ -15021,7 +15593,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8)); -@@ -637,7 +637,7 @@ +@@ -638,7 +638,7 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); @@ -15030,7 +15602,7 @@ s0 = sa[0]; dp[4] = t0; dp[5] = t1; -@@ -645,7 +645,7 @@ +@@ -646,7 +646,7 @@ dp[7] = t3; } @@ -15039,7 +15611,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8)); -@@ -655,12 +655,12 @@ +@@ -656,12 +656,12 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); @@ -15054,7 +15626,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8)); -@@ -670,7 +670,7 @@ +@@ -671,7 +671,7 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); @@ -15063,7 +15635,7 @@ dp[4] = t0; dp[5] = t1; dp[6] = t2; -@@ -718,7 +718,7 @@ +@@ -719,7 +719,7 @@ #pragma pipeloop(0) #endif /* __SUNPRO_C */ for (i = 0; i < size - 7; i += 4, dp += 12, sa++) { @@ -15072,7 +15644,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); -@@ -732,14 +732,14 @@ +@@ -733,14 +733,14 @@ t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); @@ -15089,7 +15661,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); -@@ -753,7 +753,7 @@ +@@ -754,7 +754,7 @@ t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); @@ -15098,7 +15670,7 @@ s0 = sa[0]; dp[6] = t0; dp[7] = t1; -@@ -763,7 +763,7 @@ +@@ -764,7 +764,7 @@ dp[11] = t5; } @@ -15107,7 +15679,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); -@@ -777,14 +777,14 @@ +@@ -778,14 +778,14 @@ t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); @@ -15124,7 +15696,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); -@@ -798,7 +798,7 @@ +@@ -799,7 +799,7 @@ t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); @@ -15133,7 +15705,7 @@ dp[6] = t0; dp[7] = t1; dp[8] = t2; -@@ -851,7 +851,7 @@ +@@ -852,7 +852,7 @@ #pragma pipeloop(0) #endif /* __SUNPRO_C */ for (i = 0; i < size - 7; i += 4, dp += 16, sa++) { @@ -15142,7 +15714,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); -@@ -861,12 +861,12 @@ +@@ -862,12 +862,12 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8)); @@ -15157,7 +15729,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8)); -@@ -876,12 +876,12 @@ +@@ -877,12 +877,12 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8)); @@ -15172,7 +15744,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); -@@ -891,12 +891,12 @@ +@@ -892,12 +892,12 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8)); @@ -15187,7 +15759,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8)); -@@ -906,7 +906,7 @@ +@@ -907,7 +907,7 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8)); @@ -15196,7 +15768,7 @@ s0 = sa[0]; dp[12] = t0; dp[13] = t1; -@@ -914,7 +914,7 @@ +@@ -915,7 +915,7 @@ dp[15] = t3; } @@ -15205,7 +15777,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); -@@ -924,12 +924,12 @@ +@@ -925,12 +925,12 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8)); @@ -15220,7 +15792,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8)); -@@ -939,12 +939,12 @@ +@@ -940,12 +940,12 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8)); @@ -15235,7 +15807,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8)); -@@ -954,12 +954,12 @@ +@@ -955,12 +955,12 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8)); @@ -15250,7 +15822,7 @@ t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8)); t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8)); -@@ -969,7 +969,7 @@ +@@ -970,7 +970,7 @@ t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8)); t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8)); t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8)); @@ -15259,8 +15831,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-06-15 22:07:20.000000000 -0700 @@ -88,7 +88,7 @@ } d64_2_f32; @@ -15412,8 +15984,8 @@ ((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l; ((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-06-15 22:07:20.000000000 -0700 @@ -30,7 +30,7 @@ typedef union { mlib_d64 db; @@ -15423,8 +15995,8 @@ mlib_s32 int1, int0; #else mlib_s32 int0, int1; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-06-15 22:07:21.000000000 -0700 @@ -275,11 +275,11 @@ for (i = 0; j <= (b_size - 4); j += 4, i++) { src0 = src1; @@ -15523,8 +16095,8 @@ s0 = s1; dp += SIZE; sp += SIZE; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-06-15 22:07:21.000000000 -0700 @@ -120,7 +120,7 @@ } \ } @@ -16757,8 +17329,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-06-15 22:07:21.000000000 -0700 @@ -27,6 +27,16 @@ #ifndef MLIB_IMAGE_H #define MLIB_IMAGE_H @@ -16776,8 +17348,8 @@ #include <mlib_types.h> #include <mlib_status.h> #include <mlib_sys.h> ---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-06-15 22:07:21.000000000 -0700 @@ -26,9 +26,15 @@ #include <stdlib.h> @@ -16808,8 +17380,8 @@ return (void *) memalign(8, size); #endif /* _MSC_VER */ } ---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-06-15 22:07:21.000000000 -0700 @@ -59,7 +59,10 @@ #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__) @@ -16822,8 +17394,8 @@ #include <stdint.h> /* for uintptr_t */ #include <malloc.h> /* for ptrdiff_t */ #else ---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-06-15 22:07:21.000000000 -0700 @@ -23,7 +23,11 @@ * questions. */ @@ -16836,8 +17408,8 @@ #include "jni.h" #include "AccelGlyphCache.h" #include "Trace.h" ---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-07-11 09:13:49.000000000 -0700 +--- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-06-15 22:07:21.000000000 -0700 @@ -26,7 +26,11 @@ #include "jlong.h" #include "math.h" @@ -16850,8 +17422,8 @@ #include "sunfontids.h" #include "fontscalerdefs.h" #include "glyphblitting.h" ---- ./jdk/src/share/native/sun/font/sunFont.c 2010-07-09 01:52:37.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/sunFont.c 2010-07-11 09:13:50.000000000 -0700 +--- ./jdk/src/share/native/sun/font/sunFont.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/sunFont.c 2010-06-15 22:07:22.000000000 -0700 @@ -24,7 +24,9 @@ */ @@ -16862,8 +17434,8 @@ #include "string.h" #include "gdefs.h" #include "jlong.h" ---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-07-09 01:52:38.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-07-11 09:13:50.000000000 -0700 +--- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-06-15 22:07:22.000000000 -0700 @@ -28,7 +28,11 @@ #include "jni_util.h" #include "Disposer.h" @@ -16876,8 +17448,8 @@ #include "string.h" /** ---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-07-09 01:52:38.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-07-11 09:13:51.000000000 -0700 +--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-06-15 22:07:23.000000000 -0700 @@ -26,6 +26,9 @@ #ifndef OGLFuncs_h_Included #define OGLFuncs_h_Included @@ -16888,8 +17460,8 @@ #include "jni.h" #include "J2D_GL/gl.h" #include "J2D_GL/glext.h" ---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-07-09 01:52:38.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-07-11 09:13:51.000000000 -0700 +--- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-06-15 22:07:23.000000000 -0700 @@ -25,7 +25,11 @@ #ifndef HEADLESS @@ -16902,8 +17474,8 @@ #include "sun_java2d_pipe_BufferedOpCodes.h" ---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-07-09 01:52:38.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-07-11 09:13:51.000000000 -0700 +--- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-06-15 22:07:23.000000000 -0700 @@ -25,7 +25,11 @@ #ifndef HEADLESS @@ -16916,8 +17488,8 @@ #include <math.h> #include <jlong.h> ---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-07-09 01:52:38.000000000 -0700 -+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-07-11 09:13:51.000000000 -0700 +--- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-06-15 22:07:24.000000000 -0700 @@ -28,6 +28,7 @@ #include <winsock2.h> #include <ws2tcpip.h> @@ -16926,8 +17498,8 @@ #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> ---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-07-09 01:52:38.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-07-11 09:13:51.000000000 -0700 +--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-06-15 22:07:24.000000000 -0700 @@ -78,6 +78,14 @@ typedef enum { B_FALSE, B_TRUE } boolean_t; #endif /* __linux__ */ @@ -16943,8 +17515,8 @@ #ifdef _WIN32 typedef unsigned char uint8_t; typedef unsigned long ulong_t; ---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-07-09 01:52:38.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-07-11 09:13:51.000000000 -0700 +--- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-06-15 22:07:24.000000000 -0700 @@ -60,9 +60,9 @@ #include <sys/types.h> @@ -16957,8 +17529,8 @@ #include <sys/param.h> #endif /* _WIN32 */ ---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-07-11 09:13:52.000000000 -0700 +--- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-06-15 22:07:24.000000000 -0700 @@ -59,9 +59,9 @@ #include <sys/types.h> @@ -16971,8 +17543,8 @@ #include <sys/param.h> #endif /* _WIN32 */ ---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-07-11 09:13:52.000000000 -0700 +--- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-11-04 16:13:25.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-06-15 22:07:24.000000000 -0700 @@ -64,9 +64,9 @@ #include <sys/types.h> @@ -16985,8 +17557,8 @@ #include <sys/param.h> #endif /* _WIN32 */ ---- ./jdk/src/share/transport/socket/socketTransport.c 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/share/transport/socket/socketTransport.c 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/share/transport/socket/socketTransport.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/share/transport/socket/socketTransport.c 2010-06-15 22:07:27.000000000 -0700 @@ -65,6 +65,9 @@ #define HEADER_SIZE 11 #define MAX_DATA_SIZE 1000 @@ -17074,8 +17646,8 @@ return res; } else if (res == 0) { break; /* eof, return nbytes which is less than len */ ---- ./jdk/src/solaris/back/exec_md.c 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/solaris/back/exec_md.c 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/solaris/back/exec_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/back/exec_md.c 2010-06-15 22:07:27.000000000 -0700 @@ -30,7 +30,7 @@ #include "sys.h" #include "util.h" @@ -17085,8 +17657,8 @@ /* Linux */ #define FORK() fork() #else ---- ./jdk/src/solaris/back/linker_md.c 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/solaris/back/linker_md.c 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/solaris/back/linker_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/back/linker_md.c 2010-06-15 22:07:27.000000000 -0700 @@ -48,6 +48,12 @@ #include "threads_md.h" #endif @@ -17112,8 +17684,8 @@ } } ---- ./jdk/src/solaris/back/util_md.h 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/solaris/back/util_md.h 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/solaris/back/util_md.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/back/util_md.h 2010-06-15 22:07:27.000000000 -0700 @@ -31,6 +31,11 @@ #include <limits.h> @@ -17135,8 +17707,8 @@ #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) ---- ./jdk/src/solaris/bin/ergo.c 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo.c 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/solaris/bin/ergo.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo.c 2010-06-15 22:07:27.000000000 -0700 @@ -71,14 +71,39 @@ /* Compute physical memory by asking the OS */ uint64_t @@ -17179,8 +17751,8 @@ return result; +#endif /* _ALLBSD_SOURCE */ } ---- ./jdk/src/solaris/bin/ergo.h 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo.h 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/solaris/bin/ergo.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo.h 2010-06-15 22:07:27.000000000 -0700 @@ -33,6 +33,10 @@ #include <sys/stat.h> #include <unistd.h> @@ -17192,8 +17764,8 @@ #include "java.h" ---- ./jdk/src/solaris/bin/ergo_i586.c 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo_i586.c 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/solaris/bin/ergo_i586.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo_i586.c 2010-06-15 22:07:27.000000000 -0700 @@ -106,7 +106,7 @@ #endif /* __solaris__ */ @@ -17274,8 +17846,8 @@ JLI_TraceLauncher("physical processors: %lu\n", result); return result; } ---- ./jdk/src/solaris/bin/java_md.c 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/solaris/bin/java_md.c 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/solaris/bin/java_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/bin/java_md.c 2010-10-31 14:12:36.000000000 -0700 @@ -24,6 +24,7 @@ */ @@ -17350,7 +17922,7 @@ static const char *user_dir = "/java"; #else /* Solaris */ static const char *system_dir = "/usr/jdk"; -@@ -1021,9 +1052,23 @@ +@@ -1030,9 +1061,23 @@ return(borrowed_unsetenv(name)); } @@ -17375,7 +17947,7 @@ static void* hSplashLib = NULL; -@@ -1059,7 +1104,7 @@ +@@ -1068,7 +1113,7 @@ int ContinueInNewThread0(int (JNICALL *continuation)(void *), jlong stack_size, void * args) { int rslt; @@ -17384,8 +17956,8 @@ pthread_t tid; pthread_attr_t attr; pthread_attr_init(&attr); ---- ./jdk/src/solaris/bin/java_md.h 2010-07-09 01:52:39.000000000 -0700 -+++ ./jdk/src/solaris/bin/java_md.h 2010-07-11 09:13:53.000000000 -0700 +--- ./jdk/src/solaris/bin/java_md.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/bin/java_md.h 2010-06-15 22:07:27.000000000 -0700 @@ -47,10 +47,14 @@ #include <sys/time.h> #define CounterGet() (gethrtime()/1000) @@ -17402,8 +17974,58 @@ /* * Function prototypes. ---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-07-09 01:52:40.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-07-11 09:13:54.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2010-10-31 13:48:56.000000000 -0700 +@@ -101,7 +101,8 @@ + ICE_WM = 10, + METACITY_WM = 11, + COMPIZ_WM = 12, +- LG3D_WM = 13; ++ LG3D_WM = 13, ++ CWM_WM = 14; + public String toString() { + switch (WMID) { + case NO_WM: +@@ -128,6 +129,8 @@ + return "Compiz"; + case LG3D_WM: + return "LookingGlass"; ++ case CWM_WM: ++ return "CWM"; + case UNDETERMINED_WM: + default: + return "Undetermined WM"; +@@ -555,6 +558,10 @@ + return isNetWMName("LG3D"); + } + ++ static boolean isCWM() { ++ return isNetWMName("CWM"); ++ } ++ + /* + * Is Metacity running? + */ +@@ -567,7 +574,7 @@ + } + + static boolean isNonReparentingWM() { +- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); ++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); + } + + /* +@@ -743,6 +750,8 @@ + awt_wmgr = XWM.COMPIZ_WM; + } else if (isLookingGlass()) { + awt_wmgr = LG3D_WM; ++ } else if (isCWM()) { ++ awt_wmgr = CWM_WM; + } else if (doIsIceWM && isIceWM()) { + awt_wmgr = XWM.ICE_WM; + } +--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-01-30 09:28:31.000000000 -0800 @@ -213,7 +213,7 @@ if (fontID != null) { fileName = (String)fontNameMap.get(fontID); @@ -17431,7 +18053,7 @@ (!mFontConfig.foundOsSpecificFile() || !mFontConfig.fontFilesArePresent()) || (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { ---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 1969-12-31 16:00:00.000000000 -0800 @@ -1,377 +0,0 @@ -# @@ -17811,7 +18433,7 @@ -filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf -filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf - ---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 1969-12-31 16:00:00.000000000 -0800 @@ -1,154 +0,0 @@ -# @@ -17968,7 +18590,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-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 1969-12-31 16:00:00.000000000 -0800 @@ -1,348 +0,0 @@ -# @@ -18319,7 +18941,7 @@ -awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic -awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk -awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts ---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,99 +0,0 @@ -/* @@ -18421,7 +19043,7 @@ - return new SimpleAsynchronousDatagramChannelImpl(family, toPort(group)); - } -} ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,288 +0,0 @@ -/* @@ -18712,8 +19334,8 @@ - } - } -} ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-07-11 09:13:55.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-10-31 14:19:20.000000000 -0700 @@ -36,10 +36,6 @@ class BsdFileStore extends UnixFileStore @@ -18791,9 +19413,9 @@ +*/ return super.supportsFileAttributeView(name); } - ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-07-11 09:13:55.000000000 -0700 + } +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-07-04 12:40:24.000000000 -0700 @@ -31,49 +31,23 @@ import java.util.*; import java.security.AccessController; @@ -18926,8 +19548,8 @@ @Override FileStore getFileStore(UnixPath path) throws IOException { return new BsdFileStore(path); ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-07-11 09:13:55.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-07-04 12:45:14.000000000 -0700 @@ -36,84 +36,23 @@ private BsdNativeDispatcher() { } @@ -19031,7 +19653,7 @@ + initIDs(); } } ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,350 +0,0 @@ -/* @@ -19384,7 +20006,7 @@ - } - } -} ---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,466 +0,0 @@ -/* @@ -19853,8 +20475,8 @@ - init(); - } -} ---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-07-09 01:52:41.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-07-11 09:13:55.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-06-15 22:07:32.000000000 -0700 @@ -68,6 +68,8 @@ return createProvider("sun.nio.fs.SolarisFileSystemProvider"); if (osname.equals("Linux")) @@ -19864,8 +20486,8 @@ throw new AssertionError("Platform not recognized"); } } ---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-07-09 01:52:41.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-06-15 22:07:32.000000000 -0700 @@ -119,7 +119,11 @@ } @@ -19899,8 +20521,8 @@ String[] names = execCmd(command); if ((names == null) || (names.length == 0)) { ---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-07-10 13:22:31.000000000 -0700 @@ -40,9 +40,6 @@ // temp directory for socket file private static final String tmpdir = System.getProperty("java.io.tmpdir"); @@ -19998,8 +20620,8 @@ - isBsdThreads = isBsdThreads(); } } ---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-07-09 01:52:41.000000000 -0700 -+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-06-15 22:07:33.000000000 -0700 @@ -33,7 +33,7 @@ #include <sys/stat.h> #include <fcntl.h> @@ -20065,8 +20687,8 @@ } } ---- ./jdk/src/solaris/hpi/include/interrupt.h 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/include/interrupt.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-06-15 22:07:33.000000000 -0700 @@ -75,7 +75,7 @@ * N_INTERRUPTS - The number of interrupt channels. These * are numbered from 0 to (N_INTERRUPTS - 1). @@ -20087,8 +20709,8 @@ #ifdef SA_SIGINFO /* Thread implementation dependent interrupt dispatcher. */ void intrDispatchMD(int sig, siginfo_t *info, void *uc); ---- ./jdk/src/solaris/hpi/include/largefile.h 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/include/largefile.h 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/include/largefile.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/include/largefile.h 2010-06-15 22:07:33.000000000 -0700 @@ -34,6 +34,10 @@ #include "largefile_linux.h" #endif @@ -20100,8 +20722,8 @@ /* * Prototypes for wrappers that we define. These wrapper functions * are low-level I/O routines that will use 64 bit versions if ---- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-07-04 12:40:44.000000000 -0700 @@ -26,11 +26,29 @@ #ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ #define _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ @@ -20136,8 +20758,8 @@ +#define pwrite64 pwrite + #endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */ ---- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-06-15 22:07:33.000000000 -0700 @@ -36,6 +36,8 @@ #define N_TRACED_REGS 12 #elif i386 @@ -20184,8 +20806,8 @@ #ifdef __linux__ extern thread_key_t intrJmpbufkey; ---- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-06-15 22:07:33.000000000 -0700 @@ -58,7 +58,7 @@ { int err; @@ -20195,8 +20817,8 @@ err = pthread_cond_destroy((cond_t *) &condvar->cond); #else err = cond_destroy((cond_t *) condvar); ---- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-06-15 22:07:33.000000000 -0700 @@ -147,7 +147,7 @@ mid->monitor_owner = self; mid->entry_count = 1; @@ -20206,8 +20828,15 @@ if (mid->monitor_owner == self) { mid->entry_count++; return SYS_OK; ---- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-10-31 13:48:56.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it @@ -23,389 +23,381 @@ * questions. */ @@ -20664,7 +21293,9 @@ + break; + } + } -+ + +- *addr = (void *)(((unsigned long)sp | (STACK_SIZE-1))+1) - 1; +- *size = STACK_SIZE; + /* If the thread wasn't previously suspended, suspend it now and set the change flag */ + if (found) { + /* Don't suspend ourselves! */ @@ -20688,9 +21319,7 @@ + /* Deallocate the last-allocated list. */ + for (i = 0; i < prev_count; i++) + mach_port_deallocate(self, prev_list[i]); - -- *addr = (void *)(((unsigned long)sp | (STACK_SIZE-1))+1) - 1; -- *size = STACK_SIZE; ++ + vm_deallocate(self, (vm_address_t)prev_list, sizeof(thread_t) * prev_count); + /* Record registers and return */ @@ -20771,7 +21400,7 @@ + mach_port_t self; + + self = pthread_mach_thread_np(pthread_self()); - ++ + /* Get a list of all threads. This has to succeed! */ + if (task_threads(self, &thr_list, &thr_count) != KERN_SUCCESS) + abort(); @@ -20780,7 +21409,7 @@ + for (i = 0; i < thr_count; i++) { + // XXXDARWIN: Assumes that the current thread was the thread used + // to call np_single. Is that true? -+ + + if (thr_list[i] != self) + thread_resume(thr_list[i]); + @@ -20893,8 +21522,8 @@ + pthread_attr_destroy(&attr); +#endif } ---- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-06-15 22:07:34.000000000 -0700 @@ -54,6 +54,10 @@ #error That can NOT possibly be right. #endif @@ -20976,8 +21605,8 @@ info.isMP = (cpus < 0) ? 1 : (cpus > 1); info.name = "native threads"; ---- ./jdk/src/solaris/hpi/src/linker_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/src/linker_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-06-15 22:07:34.000000000 -0700 @@ -44,11 +44,19 @@ #include "threads_md.h" #endif @@ -21044,8 +21673,8 @@ #endif /* * This is a bit of bulletproofing to catch the commonly occurring ---- ./jdk/src/solaris/hpi/src/memory_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/src/memory_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-06-15 22:07:34.000000000 -0700 @@ -50,12 +50,24 @@ #include <stdlib.h> #include <stdio.h> /* For perror() */ @@ -21135,8 +21764,8 @@ ret = committedAddr; #else ret = requestedAddr; ---- ./jdk/src/solaris/hpi/src/system_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/hpi/src/system_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/hpi/src/system_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/hpi/src/system_md.c 2010-06-15 22:07:34.000000000 -0700 @@ -41,6 +41,7 @@ #include <dlfcn.h> @@ -21190,8 +21819,8 @@ fd = open64_w(path, oflag, mode); if (delete != 0) { unlink(path); ---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-06-15 22:07:34.000000000 -0700 @@ -28,7 +28,10 @@ #include <string.h> #include <ctype.h> @@ -21221,8 +21850,8 @@ /* Open conversion descriptors */ iconvToPlatform = iconv_open(codeset, "UTF-8"); ---- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-06-15 22:07:34.000000000 -0700 @@ -41,7 +41,14 @@ #define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"} @@ -21247,8 +21876,8 @@ /* Signals */ ---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-07-11 09:13:56.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-06-15 22:07:34.000000000 -0700 @@ -32,10 +32,16 @@ #include <sys/types.h> @@ -21411,7 +22040,7 @@ } JNIEXPORT jlong JNICALL ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,180 +0,0 @@ -/* @@ -21594,7 +22223,7 @@ - - -/* end */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,82 +0,0 @@ -/* @@ -21679,7 +22308,7 @@ - - -#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,322 +0,0 @@ -/* @@ -22004,7 +22633,7 @@ -} - -#endif /* USE_PLATFORM_MIDI_IN */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,179 +0,0 @@ -/* @@ -22186,7 +22815,7 @@ - - -#endif /* USE_PLATFORM_MIDI_OUT */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,480 +0,0 @@ -/* @@ -22669,7 +23298,7 @@ - - -/* end */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,85 +0,0 @@ -/* @@ -22757,7 +23386,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-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,938 +0,0 @@ -/* @@ -23698,7 +24327,7 @@ - - -#endif // USE_DAUDIO ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,291 +0,0 @@ -/* @@ -23992,7 +24621,7 @@ - - -/* end */ ---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 1969-12-31 16:00:00.000000000 -0800 @@ -1,72 +0,0 @@ -/* @@ -24067,7 +24696,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-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,723 +0,0 @@ -/* @@ -24793,8 +25422,8 @@ - - -#endif // USE_PORTS ---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-10-31 14:12:36.000000000 -0700 @@ -41,6 +41,12 @@ #include "java_io_FileSystem.h" #include "java_io_UnixFileSystem.h" @@ -24816,8 +25445,8 @@ JNIEXPORT jboolean JNICALL Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this, jobject file, ---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-10-31 14:12:37.000000000 -0700 @@ -33,7 +33,9 @@ #include <sys/stat.h> #include <errno.h> @@ -24828,8 +25457,8 @@ /* Note: The comments in this file use the terminology ---- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-10-31 14:12:37.000000000 -0700 @@ -36,7 +36,7 @@ WITH_PLATFORM_STRING(env, path, ps) { FD fd; @@ -24839,8 +25468,8 @@ /* Remove trailing slashes, since the kernel won't */ char *p = (char *)ps + strlen(ps) - 1; while ((p > ps) && (*p == '/')) ---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-06-15 22:07:34.000000000 -0700 @@ -28,6 +28,11 @@ #include "jni.h" #include "jni_util.h" @@ -24881,8 +25510,8 @@ jbyteArray var, val; const char * valBeg = varEnd + 1; jsize varLength = varEnd - environ[i]; ---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-06-15 22:07:34.000000000 -0700 @@ -40,7 +40,11 @@ #include <stdlib.h> #include <sys/types.h> @@ -24985,8 +25614,8 @@ if (envp == NULL || (char **) envp == environ) { execvp(file, (char **) argv); return; ---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-10-31 14:17:47.000000000 -0700 @@ -23,7 +23,7 @@ * questions. */ @@ -25012,9 +25641,9 @@ +#if !defined(_ALLBSD_SOURCE) #ifdef __linux__ - #define CODESET _NL_CTYPE_CODESET_NAME - #else -@@ -52,6 +60,7 @@ + #ifndef CODESET + #define CODESET _NL_CTYPE_CODESET_NAME +@@ -54,6 +62,7 @@ #define CODESET ALT_CODESET_KEY #endif #endif @@ -25022,79 +25651,9 @@ /* Take an array of string pairs (map of key->value) and a string (key). * Examine each pair in the map to see if the first string (key) matches the -@@ -121,7 +130,7 @@ - java_props_t * - GetJavaProperties(JNIEnv *env) - { -- static java_props_t sprops = {0}; -+ static java_props_t sprops = { 0 }; - char *v; /* tmp var */ - - if (sprops.user_dir) { -@@ -188,7 +197,12 @@ - { - char *lc; - lc = setlocale(LC_CTYPE, ""); --#ifndef __linux__ -+#if defined(_ALLBSD_SOURCE) -+ if (lc == NULL) { -+ lc = "C"; -+ } -+ { -+#elif !defined(__linux__) - if (lc == NULL) { - /* - * 'lc == null' means system doesn't support user's environment -@@ -219,7 +233,7 @@ - char *p, encoding_variant[64]; - int i, found; - --#ifndef __linux__ -+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE) - /* - * Workaround for Solaris bug 4201684: Xlib doesn't like @euro - * locales. Since we don't depend on the libc @euro behavior, -@@ -236,6 +250,13 @@ - *p = '\0'; - setlocale(LC_ALL, temp); - #endif -+ if (lc == NULL) { -+ strncpy(temp, "C", sizeof(temp)-1); -+ temp[sizeof(temp)-1] = '\0'; -+ } else { -+ strncpy(temp, lc, sizeof(temp)-1); -+ temp[sizeof(temp)-1] = '\0'; -+ } - - strcpy(temp, lc); - -@@ -316,6 +337,9 @@ - else - p = nl_langinfo(CODESET); - -+ if (p == NULL || !strcmp(p, "C") || !strcmp(p, "US-ASCII")) -+ p = ""; // use default -+ - /* Convert the bare "646" used on Solaris to a proper IANA name */ - if (strcmp(p, "646") == 0) - p = "ISO646-US"; -@@ -325,6 +349,7 @@ - std_encoding = (*p != '\0') ? p : "ISO8859-1"; - - -+#if !defined(_ALLBSD_SOURCE) - #ifdef __linux__ - /* - * Remap the encoding string to a different value for japanese -@@ -357,11 +382,19 @@ - std_encoding = "Big5-HKSCS-2001"; - } - #endif -+#endif /* !_ALLBSD_SOURCE */ - sprops.encoding = std_encoding; - sprops.sun_jnu_encoding = sprops.encoding; - } - } +@@ -375,6 +384,13 @@ + sprops.display_variant = sprops.variant; + sprops.sun_jnu_encoding = sprops.encoding; +#ifdef _ALLBSD_SOURCE +#if BYTE_ORDER == _LITTLE_ENDIAN @@ -25106,7 +25665,7 @@ #ifdef __linux__ #if __BYTE_ORDER == __LITTLE_ENDIAN sprops.unicode_encoding = "UnicodeLittle"; -@@ -371,6 +404,7 @@ +@@ -384,6 +400,7 @@ #else sprops.unicode_encoding = "UnicodeBig"; #endif @@ -25114,7 +25673,7 @@ /* user properties */ { -@@ -407,12 +441,14 @@ +@@ -420,12 +437,14 @@ sprops.path_separator = ":"; sprops.line_separator = "\n"; @@ -25129,8 +25688,8 @@ return &sprops; } ---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-06-15 22:07:34.000000000 -0700 @@ -36,12 +36,288 @@ #include <stdlib.h> #include <ctype.h> @@ -25481,8 +26040,8 @@ #define SET_NONBLOCKING(fd) { \ int flags = fcntl(fd, F_GETFL); \ flags |= O_NONBLOCK; \ ---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-10-31 14:12:37.000000000 -0700 @@ -33,6 +33,9 @@ #include <strings.h> #include <stdlib.h> @@ -25523,31 +26082,26 @@ } return (*env)->NewStringUTF(env, hostname); } ---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-07-11 09:13:57.000000000 -0700 -@@ -23,13 +23,13 @@ - * questions. - */ +--- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-10-31 13:48:56.000000000 -0700 +@@ -26,6 +26,9 @@ -+#include <sys/types.h> -+#include <sys/socket.h> #include <errno.h> #include <strings.h> ++#if defined(_ALLBSD_SOURCE) && defined(__OpenBSD__) ++#include <sys/types.h> ++#endif #include <netinet/in.h> #include <stdlib.h> #include <string.h> --#include <sys/types.h> --#include <sys/socket.h> - #include <arpa/inet.h> - #include <net/if.h> - #include <net/if_arp.h> -@@ -47,6 +47,21 @@ - #else - #include <sys/sockio.h> +@@ -54,6 +57,23 @@ + #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" #endif + +#if defined(_ALLBSD_SOURCE) +#include <sys/param.h> +#include <sys/ioctl.h> ++#include <sys/sockio.h> +#if defined(__FreeBSD__) || defined(__APPLE__) +#include <net/ethernet.h> +#include <net/if_var.h> @@ -25560,51 +26114,71 @@ +#include <netinet/in_var.h> +#include <ifaddrs.h> +#endif ++ + #include "jvm.h" + #include "jni_util.h" + #include "net_util.h" +@@ -821,11 +841,11 @@ + netif *currif = ifs, *parent; + netaddr *addrP; + +- #ifdef __solaris__ ++#ifdef LIFNAMSIZ + char name[LIFNAMSIZ], vname[LIFNAMSIZ]; +- #else ++#else + char name[IFNAMSIZ], vname[IFNAMSIZ]; +- #endif ++#endif - #ifdef __linux__ - #define ifr_index ifr_ifindex -@@ -587,6 +602,7 @@ - } - + char *name_colonP; + int mask; +@@ -1649,3 +1669,307 @@ + #endif -+#if !defined(_ALLBSD_SOURCE) - /* - * Enumerates and returns all IPv4 interfaces - */ -@@ -697,6 +713,176 @@ - return ifs; - } -+#else /* _ALLBSD_SOURCE */ -+ ++/** BSD **/ ++#ifdef _ALLBSD_SOURCE ++/* Open socket for further ioct calls, try v4 socket first and ++ * if it falls return v6 socket ++ */ ++ ++#ifdef AF_INET6 ++static int openSocketWithFallback(JNIEnv *env, const char *ifname){ ++ int sock; ++ struct ifreq if2; ++ ++ if ((sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0)) < 0) { ++ if (errno == EPROTONOSUPPORT){ ++ if ( (sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0)) < 0 ){ ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", "IPV6 Socket creation failed"); ++ return -1; ++ } ++ } ++ else{ // errno is not NOSUPPORT ++ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", "IPV4 Socket creation failed"); ++ return -1; ++ } ++ } ++ ++ return sock; ++} ++ ++#else ++static int openSocketWithFallback(JNIEnv *env, const char *ifname){ ++ return openSocket(env,AF_INET); ++} ++#endif ++ +/* + * Enumerates and returns all IPv4 interfaces -+ * -+ * WARNING! Make sure that it's correctly synchronized on future JDK -+ * versions imports! + */ -+static netif *enumIPv4Interfaces(JNIEnv *env, netif *ifs) -+{ -+ int sock; ++static netif *enumIPv4Interfaces(JNIEnv *env, int sock, netif *ifs) { + struct ifaddrs *ifa, *origifa; + -+ sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0); -+ if (sock < 0) { -+ /* -+ * If EPROTONOSUPPORT is returned it means we don't have -+ * IPv4 support so don't throw an exception. -+ */ -+ if (errno != EPROTONOSUPPORT) { -+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", -+ "Socket creation failed"); -+ } -+ return ifs; -+ } -+ + if (getifaddrs(&origifa) != 0) { + NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", + "getifaddrs() function failed"); -+ close(sock); + return ifs; + } + @@ -25618,18 +26192,13 @@ + + /* + * Add to the list. -+ * -+ * BSDNOTE: in order to optimize code, interface index detection -+ * logic was added directly to addif(). + */ -+ ifs = addif(env, ifs, ifa->ifa_name, (-1), AF_INET, -+ ifa->ifa_addr, sizeof(struct sockaddr_in), 0); ++ ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, AF_INET, 0); + + /* + * If an exception occurred then free the list. + */ + if ((*env)->ExceptionOccurred(env)) { -+ close(sock); + freeifaddrs(origifa); + freeif(ifs); + return NULL; @@ -25639,12 +26208,16 @@ + /* + * Free socket and buffer + */ -+ close(sock); + freeifaddrs(origifa); + return ifs; +} + -+#if defined(AF_INET6) ++ ++/* ++ * Enumerates and returns all IPv6 interfaces on Linux ++ */ ++ ++#ifdef AF_INET6 +/* + * Determines the prefix on BSD for IPv6 interfaces. + */ @@ -25672,30 +26245,16 @@ +} + +/* -+ * Enumerates and returns all IPv6 interfaces on FreeBSD -+ * -+ * BSDNOTE: it's done in same as IPv4 enumeration and should be carefully -+ * reviewed with each JDK update (according to Solaris/Linux version) ++ * Enumerates and returns all IPv6 interfaces on BSD + */ -+static netif *enumIPv6Interfaces(JNIEnv *env, netif *ifs) { -+ -+ int sock; ++static netif *enumIPv6Interfaces(JNIEnv *env, int sock, netif *ifs) { + struct ifaddrs *ifa, *origifa; + struct sockaddr_in6 *sin6; + struct in6_ifreq ifr6; + -+ // Open IPv6 UDP socket. -+ sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0); -+ if (sock < 0) { -+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", -+ "Failed to create IPv6 socket"); -+ return ifs; -+ } -+ + if (getifaddrs(&origifa) != 0) { + NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", + "getifaddrs() function failed"); -+ close(sock); + return ifs; + } + @@ -25714,7 +26273,6 @@ + if (ioctl(sock, SIOCGIFNETMASK_IN6, (caddr_t)&ifr6) < 0) { + NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", + "ioctl SIOCGIFNETMASK_IN6 failed"); -+ close(sock); + freeifaddrs(origifa); + freeif(ifs); + return NULL; @@ -25722,13 +26280,11 @@ + + /* Add to the list. */ + sin6 = (struct sockaddr_in6 *)&ifr6.ifr_addr; -+ ifs = addif(env, ifs, ifa->ifa_name, (-1), AF_INET6, -+ ifa->ifa_addr, sizeof(struct sockaddr_in6), ++ ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, AF_INET6, + prefix(&sin6->sin6_addr, sizeof(struct in6_addr))); + + /* If an exception occurred then free the list. */ + if ((*env)->ExceptionOccurred(env)) { -+ close(sock); + freeifaddrs(origifa); + freeif(ifs); + return NULL; @@ -25738,73 +26294,155 @@ + /* + * Free socket and ifaddrs buffer + */ -+ close(sock); + freeifaddrs(origifa); + return ifs; +} -+#endif /* AF_INET6 */ ++#endif + -+#endif /* !_ALLBSD_SOURCE */ - - #if defined(__solaris__) && defined(AF_INET6) - /* -@@ -1040,7 +1226,13 @@ - JNU_ThrowOutOfMemoryError(env, "heap allocation failed"); - return ifs; - } -+#if defined(_ALLBSD_SOURCE) -+ currif->index = if_nametoindex(name); -+ if (currif->index == 0) -+ currif->index = -1; ++static int getIndex(int sock, const char *name){ ++#ifdef __FreeBSD__ ++ /* ++ * Try to get the interface index ++ * (Not supported on Solaris 2.6 or 7) ++ */ ++ struct ifreq if2; ++ strcpy(if2.ifr_name, name); ++ ++ if (ioctl(sock, SIOCGIFINDEX, (char *)&if2) < 0) { ++ return -1; ++ } ++ ++ return if2.ifr_index; +#else - currif->index = index; ++ /* ++ * Try to get the interface index using BSD specific if_nametoindex ++ */ ++ int index = if_nametoindex(name); ++ return (index == 0) ? -1 : index; +#endif - currif->addr = NULL; - currif->childs = NULL; - currif->virtual = isVirtual; -@@ -1351,6 +1543,31 @@ - * All bytes to 0 means no hardware address. - */ - return -1; -+#elif defined(_ALLBSD_SOURCE) -+ struct ifaddrs *ifa0, *ifa; -+ struct sockaddr *saddr; -+ int i; ++} + -+ /* Grab the interface list */ -+ if (!getifaddrs(&ifa0)) { -+ /* Cycle through the interfaces */ -+ for (i = 0, ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next, i++) { -+ saddr = ifa->ifa_addr; -+ /* Link layer contains the MAC address */ -+ if (saddr->sa_family == AF_LINK && !strcmp(ifname, ifa->ifa_name)) { -+ struct sockaddr_dl *sadl = (struct sockaddr_dl *) saddr; -+ /* Check the address is the correct length */ -+ if (sadl->sdl_alen == ETHER_ADDR_LEN) { -+ memcpy(buf, (sadl->sdl_data + sadl->sdl_nlen), ETHER_ADDR_LEN); -+ freeifaddrs(ifa0); -+ return ETHER_ADDR_LEN; -+ } ++/** ++ * Returns the IPv4 broadcast address of a named interface, if it exists. ++ * Returns 0 if it doesn't have one. ++ */ ++static struct sockaddr *getBroadcast(JNIEnv *env, int sock, const char *ifname, struct sockaddr *brdcast_store) { ++ struct sockaddr *ret = NULL; ++ struct ifreq if2; ++ ++ memset((char *) &if2, 0, sizeof(if2)); ++ strcpy(if2.ifr_name, ifname); ++ ++ /* Let's make sure the interface does have a broadcast address */ ++ if (ioctl(sock, SIOCGIFFLAGS, (char *)&if2) < 0) { ++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFFLAGS failed"); ++ return ret; ++ } ++ ++ if (if2.ifr_flags & IFF_BROADCAST) { ++ /* It does, let's retrieve it*/ ++ if (ioctl(sock, SIOCGIFBRDADDR, (char *)&if2) < 0) { ++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFBRDADDR failed"); ++ return ret; + } ++ ++ ret = brdcast_store; ++ memcpy(ret, &if2.ifr_broadaddr, sizeof(struct sockaddr)); ++ } ++ ++ return ret; ++} ++ ++/** ++ * Returns the IPv4 subnet prefix length (aka subnet mask) for the named ++ * interface, if it has one, otherwise return -1. ++ */ ++static short getSubnet(JNIEnv *env, int sock, const char *ifname) { ++ unsigned int mask; ++ short ret; ++ struct ifreq if2; ++ ++ memset((char *) &if2, 0, sizeof(if2)); ++ strcpy(if2.ifr_name, ifname); ++ ++ if (ioctl(sock, SIOCGIFNETMASK, (char *)&if2) < 0) { ++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFNETMASK failed"); ++ return -1; + } -+ freeifaddrs(ifa0); ++ ++ mask = ntohl(((struct sockaddr_in*)&(if2.ifr_addr))->sin_addr.s_addr); ++ ret = 0; ++ while (mask) { ++ mask <<= 1; ++ ret++; ++ } ++ ++ return ret; ++} ++ ++/** ++ * Get the Hardware address (usually MAC address) for the named interface. ++ * return puts the data in buf, and returns the length, in byte, of the ++ * MAC address. Returns -1 if there is no hardware address on that interface. ++ */ ++static int getMacAddress(JNIEnv *env, int sock, const char* ifname, const struct in_addr* addr, unsigned char *buf) { ++ struct ifaddrs *ifa0, *ifa; ++ struct sockaddr *saddr; ++ int i; ++ ++ /* Grab the interface list */ ++ if (!getifaddrs(&ifa0)) { ++ /* Cycle through the interfaces */ ++ for (i = 0, ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next, i++) { ++ saddr = ifa->ifa_addr; ++ /* Link layer contains the MAC address */ ++ if (saddr->sa_family == AF_LINK && !strcmp(ifname, ifa->ifa_name)) { ++ struct sockaddr_dl *sadl = (struct sockaddr_dl *) saddr; ++ /* Check the address is the correct length */ ++ if (sadl->sdl_alen == ETHER_ADDR_LEN) { ++ memcpy(buf, (sadl->sdl_data + sadl->sdl_nlen), ETHER_ADDR_LEN); ++ freeifaddrs(ifa0); ++ return ETHER_ADDR_LEN; ++ } ++ } ++ } ++ freeifaddrs(ifa0); ++ } ++ ++ return -1; ++} ++ ++static int getMTU(JNIEnv *env, int sock, const char *ifname) { ++ struct ifreq if2; ++ ++ memset((char *) &if2, 0, sizeof(if2)); ++ strcpy(if2.ifr_name, ifname); ++ ++ if (ioctl(sock, SIOCGIFMTU, (char *)&if2) < 0) { ++ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFMTU failed"); ++ return -1; ++ } ++ ++ return if2.ifr_mtu; ++} ++ ++static int getFlags(int sock, const char *ifname) { ++ struct ifreq if2; ++ int ret = -1; ++ ++ memset((char *) &if2, 0, sizeof(if2)); ++ strcpy(if2.ifr_name, ifname); ++ ++ if (ioctl(sock, SIOCGIFFLAGS, (char *)&if2) < 0){ ++ return -1; + } + -+ return -1; - #else - struct arpreq arpreq; - struct sockaddr_in* sin; -@@ -1516,7 +1733,7 @@ - "Socket creation failed"); - } else { - --#ifdef __linux__ -+#if defined(__linux__) || defined(_ALLBSD_SOURCE) - memset((char *) &if2, 0, sizeof(if2)); - strcpy(if2.ifr_name, name_utf); - ---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-07-11 09:13:57.000000000 -0700 ++ return if2.ifr_flags; ++} ++ ++#endif +--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-10-31 14:12:37.000000000 -0700 @@ -23,12 +23,12 @@ * questions. */ @@ -25877,16 +26515,7 @@ #else JVM_Connect(fd, 0, 0); #endif -@@ -2247,7 +2261,7 @@ - { - struct in_addr in; - struct in_addr *inP = ∈ -- int len = sizeof(struct in_addr); -+ socklen_t len = sizeof(struct in_addr); - - #ifdef __linux__ - struct ip_mreqn mreqn; -@@ -2392,18 +2406,30 @@ +@@ -2400,18 +2414,30 @@ mname6.ipv6mr_interface = idx; } @@ -25920,9 +26549,9 @@ } } } ---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-07-11 09:13:57.000000000 -0700 -@@ -467,9 +467,11 @@ +--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-10-31 14:12:37.000000000 -0700 +@@ -483,9 +483,11 @@ if (connect_rv == JVM_IO_INTR) { JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException", "operation interrupted"); @@ -25934,7 +26563,7 @@ } else if (errno == ECONNREFUSED) { NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ConnectException", "Connection refused"); -@@ -985,7 +987,7 @@ +@@ -1001,7 +1003,7 @@ */ if (cmd == java_net_SocketOptions_SO_BINDADDR) { SOCKADDR him; @@ -25943,8 +26572,8 @@ int port; jobject iaObj; jclass iaCntrClass; ---- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-07-04 12:40:44.000000000 -0700 @@ -57,7 +57,7 @@ /* * Signal to unblock thread @@ -25980,8 +26609,8 @@ } int NET_Connect(int s, struct sockaddr *addr, int addrlen) { ---- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-10-31 14:12:37.000000000 -0700 @@ -34,6 +34,15 @@ #include <stdlib.h> #include <dlfcn.h> @@ -25998,7 +26627,7 @@ #ifdef __solaris__ #include <sys/sockio.h> #include <stropts.h> -@@ -219,6 +228,14 @@ +@@ -220,6 +229,14 @@ return (*env)->GetFieldID(env, cls, "fd", "I"); } @@ -26013,15 +26642,15 @@ jint IPv6_supported() { #ifndef AF_INET6 -@@ -354,6 +371,7 @@ +@@ -358,6 +375,7 @@ return JNI_TRUE; #endif /* AF_INET6 */ } +#endif /* DONT_ENABLE_IPV6 */ - void - NET_AllocSockaddr(struct sockaddr **him, int *len) { -@@ -687,6 +705,10 @@ + void ThrowUnknownHostExceptionWithGaiError(JNIEnv *env, + const char* hostname, +@@ -720,6 +738,10 @@ him6->sin6_family = AF_INET6; *len = sizeof(struct sockaddr_in6) ; @@ -26032,7 +26661,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) -@@ -1093,7 +1115,6 @@ +@@ -1126,7 +1148,6 @@ *len = socklen; } #endif @@ -26040,7 +26669,7 @@ if (rv < 0) { return rv; } -@@ -1140,6 +1161,24 @@ +@@ -1173,6 +1194,24 @@ #define IPTOS_PREC_MASK 0xe0 #endif @@ -26065,7 +26694,7 @@ /* * IPPROTO/IP_TOS :- * 1. IPv6 on Solaris: no-op and will be set in flowinfo -@@ -1172,6 +1211,10 @@ +@@ -1205,6 +1244,10 @@ *iptos &= (IPTOS_TOS_MASK | IPTOS_PREC_MASK); } @@ -26074,9 +26703,9 @@ +#endif + /* - * SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On Solaris need to - * ensure that value is <= max_buf as otherwise we get -@@ -1180,7 +1223,8 @@ + * SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On Solaris we may need to clamp + * the value when it exceeds the system limit. +@@ -1212,7 +1255,8 @@ #ifdef __solaris__ if (level == SOL_SOCKET) { if (opt == SO_SNDBUF || opt == SO_RCVBUF) { @@ -26084,9 +26713,9 @@ + int sotype; + socklen_t arglen; int *bufsize, maxbuf; + int ret; - if (!init_max_buf) { -@@ -1219,6 +1263,84 @@ +@@ -1259,6 +1303,84 @@ } #endif @@ -26171,7 +26800,7 @@ return setsockopt(fd, level, opt, arg, len); } -@@ -1269,7 +1391,8 @@ +@@ -1309,7 +1431,8 @@ * corresponding IPv4 port is in use. */ if (ipv6_available()) { @@ -26181,8 +26810,8 @@ len = sizeof(arg); if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg, ---- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-10-31 14:12:37.000000000 -0700 @@ -37,7 +37,7 @@ #endif @@ -26192,34 +26821,8 @@ extern int NET_Timeout(int s, long timeout); extern int NET_Read(int s, void* buf, size_t len); extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, ---- ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-07-11 09:13:57.000000000 -0700 -@@ -38,7 +38,11 @@ - jlong address, jlong len) - { - jboolean loaded = JNI_TRUE; -+#if defined(_ALLBSD_SOURCE) -+ jint pageSize = getpagesize(); -+#else - jint pageSize = sysconf(_SC_PAGESIZE); -+#endif - jint numPages = (len + pageSize - 1) / pageSize; - int result = 0; - int i = 0; -@@ -96,7 +100,11 @@ - Java_java_nio_MappedByteBuffer_force0(JNIEnv *env, jobject obj, jlong address, - jlong len) - { -+#if defined(_ALLBSD_SOURCE) -+ jlong pageSize = getpagesize(); -+#else - jlong pageSize = sysconf(_SC_PAGESIZE); -+#endif - unsigned long lAddress = address; - - jlong offset = lAddress % pageSize; ---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-06-15 22:07:35.000000000 -0700 @@ -47,8 +47,11 @@ return (jint) result; } @@ -26257,8 +26860,8 @@ if (rc < 0) { close(fd); ---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-06-15 22:07:35.000000000 -0700 @@ -31,7 +31,7 @@ #include <errno.h> #include <stddef.h> @@ -26395,8 +26998,8 @@ sprintf(buf, (const char *)"GMT%c%02d:%02d", sign, (int)(offset/3600), (int)((offset%3600)/60)); return strdup(buf); ---- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-06-15 22:07:35.000000000 -0700 @@ -25,6 +25,7 @@ #include <jni.h> @@ -26419,8 +27022,8 @@ if (handle == NULL) { return JNI_FALSE; } ---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-06-15 22:07:35.000000000 -0700 @@ -31,7 +31,11 @@ #endif /* !HEADLESS */ @@ -26433,8 +27036,8 @@ #ifdef __linux__ /* XXX: Shouldn't be necessary. */ ---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-06-15 22:07:35.000000000 -0700 @@ -33,7 +33,9 @@ #include <math.h> #include <sys/time.h> @@ -26445,8 +27048,8 @@ #ifndef HEADLESS #include <X11/Xlib.h> #include <X11/Xatom.h> ---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-06-15 22:07:35.000000000 -0700 @@ -31,7 +31,11 @@ #include <Xm/XmP.h> @@ -26459,8 +27062,8 @@ #ifdef DEBUG #include <jvm.h> /* To get jio_fprintf() */ ---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-06-15 22:07:35.000000000 -0700 @@ -334,7 +334,7 @@ if (strcmp(style, "regular") == 0) { altstyle = "roman"; @@ -26470,8 +27073,8 @@ if (!strcmp(family, "lucidasans")) { family = "lucida"; } ---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-06-15 22:07:35.000000000 -0700 @@ -40,6 +40,7 @@ #include <jni.h> #include <jni_util.h> @@ -26599,9 +27202,9 @@ 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-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-07-11 09:13:57.000000000 -0700 -@@ -69,7 +69,7 @@ +--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-10-31 14:18:11.000000000 -0700 +@@ -67,7 +67,7 @@ XIMPreeditDrawCallbackStruct *); static void PreeditCaretCallback(XIC, XPointer, XIMPreeditCaretCallbackStruct *); @@ -26610,7 +27213,7 @@ static void StatusStartCallback(XIC, XPointer, XPointer); static void StatusDoneCallback(XIC, XPointer, XPointer); static void StatusDrawCallback(XIC, XPointer, -@@ -83,7 +83,7 @@ +@@ -81,7 +81,7 @@ #define PreeditDoneIndex 1 #define PreeditDrawIndex 2 #define PreeditCaretIndex 3 @@ -26619,7 +27222,7 @@ #define StatusStartIndex 4 #define StatusDoneIndex 5 #define StatusDrawIndex 6 -@@ -101,14 +101,14 @@ +@@ -99,14 +99,14 @@ (XIMProc)PreeditDoneCallback, (XIMProc)PreeditDrawCallback, (XIMProc)PreeditCaretCallback, @@ -26636,7 +27239,7 @@ #define MAX_STATUS_LEN 100 typedef struct { Window w; /*status window id */ -@@ -148,7 +148,7 @@ +@@ -146,7 +146,7 @@ #endif /* XAWT */ jobject x11inputmethod; /* global ref to X11InputMethod instance */ /* associated with the XIC */ @@ -26645,7 +27248,7 @@ StatusWindow *statusWindow; /* our own status window */ #else #ifndef XAWT -@@ -427,7 +427,7 @@ +@@ -425,7 +425,7 @@ static void freeX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData) { @@ -26654,7 +27257,7 @@ if (pX11IMData->statusWindow != NULL){ StatusWindow *sw = pX11IMData->statusWindow; XFreeGC(awt_display, sw->lightGC); -@@ -533,7 +533,7 @@ +@@ -531,7 +531,7 @@ pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance); if (pX11IMData == NULL) { @@ -26663,7 +27266,7 @@ return False; #else return result; -@@ -541,7 +541,7 @@ +@@ -539,7 +539,7 @@ } if ((ic = pX11IMData->current_ic) == (XIC)0){ @@ -26672,7 +27275,7 @@ return False; #else return result; -@@ -650,7 +650,7 @@ +@@ -648,7 +648,7 @@ return result; } @@ -26681,7 +27284,7 @@ static StatusWindow *createStatusWindow( #ifdef XAWT Window parent) { -@@ -994,7 +994,7 @@ +@@ -993,7 +993,7 @@ } } } @@ -26690,7 +27293,7 @@ /* * Creates two XICs, one for active clients and the other for passive * clients. All information on those XICs are stored in the -@@ -1051,7 +1051,7 @@ +@@ -1050,7 +1050,7 @@ return FALSE ; } @@ -26699,7 +27302,7 @@ on_the_spot_styles |= XIMStatusNothing; /*kinput does not support XIMPreeditCallbacks and XIMStatusArea -@@ -1064,7 +1064,7 @@ +@@ -1063,7 +1063,7 @@ break; } } @@ -26708,7 +27311,7 @@ #ifdef XAWT on_the_spot_styles |= XIMStatusNothing; #else /* !XAWT */ -@@ -1087,7 +1087,7 @@ +@@ -1086,7 +1086,7 @@ on_the_spot_styles |= XIMStatusNothing; #endif /* XAWT */ @@ -26717,7 +27320,7 @@ for (i = 0; i < im_styles->count_styles; i++) { active_styles |= im_styles->supported_styles[i] & on_the_spot_styles; -@@ -1135,7 +1135,7 @@ +@@ -1134,7 +1134,7 @@ NULL); if (preedit == (XVaNestedList)NULL) goto err; @@ -26726,7 +27329,7 @@ /*always try XIMStatusCallbacks for active client...*/ { status = (XVaNestedList)XVaCreateNestedList(0, -@@ -1157,7 +1157,7 @@ +@@ -1156,7 +1156,7 @@ XFree((void *)status); XFree((void *)preedit); } @@ -26735,16 +27338,16 @@ #ifndef XAWT if (on_the_spot_styles & XIMStatusArea) { Widget parent; -@@ -1185,7 +1185,7 @@ +@@ -1184,7 +1184,7 @@ } #endif /* XAWT */ XFree((void *)preedit); -#endif /* __linux__ */ +#endif /* __linux__ || _ALLBSD_SOURCE */ pX11IMData->ic_passive = XCreateIC(X11im, - XNClientWindow, XtWindow(w), - XNFocusWindow, XtWindow(w), -@@ -1344,7 +1344,7 @@ + XNClientWindow, w, + XNFocusWindow, w, +@@ -1343,7 +1343,7 @@ } @@ -26753,7 +27356,7 @@ static void StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data) { -@@ -1412,7 +1412,7 @@ +@@ -1411,7 +1411,7 @@ finally: AWT_UNLOCK(); } @@ -26762,14 +27365,14 @@ static void CommitStringCallback(XIC ic, XPointer client_data, XPointer call_data) { JNIEnv *env = GetJNIEnv(); -@@ -1514,14 +1514,14 @@ +@@ -1517,14 +1517,14 @@ /* Use IMInstantiate call back only on Linux, as there is a bug in Solaris (4768335) */ -#ifdef __linux__ +#if defined(__linux__) || defined(_ALLBSD_SOURCE) registered = XRegisterIMInstantiateCallback(dpy, NULL, NULL, - NULL, (XIMProc)OpenXIMCallback, NULL); + NULL, (XIDProc)OpenXIMCallback, NULL); if (!registered) { /* directly call openXIM callback */ #endif @@ -26779,7 +27382,7 @@ } #endif -@@ -1585,13 +1585,13 @@ +@@ -1588,13 +1588,13 @@ #endif /* XAWT */ globalRef = (*env)->NewGlobalRef(env, this); pX11IMData->x11inputmethod = globalRef; @@ -26796,10 +27399,10 @@ pX11IMData->lookup_buf = 0; pX11IMData->lookup_buf_len = 0; -@@ -1738,14 +1738,14 @@ +@@ -1741,14 +1741,14 @@ setXICFocus(pX11IMData->current_ic, req); currentX11InputMethodInstance = pX11IMData->x11inputmethod; - currentFocusWindow = XtWindow(w); + currentFocusWindow = w; -#ifdef __linux__ +#if defined(__linux__) || defined(_ALLBSD_SOURCE) if (active && pX11IMData->statusWindow && pX11IMData->statusWindow->on) @@ -26813,7 +27416,7 @@ onoffStatusWindow(pX11IMData, 0, False); if (pX11IMData->current_ic != NULL) #endif -@@ -1762,7 +1762,7 @@ +@@ -1765,7 +1765,7 @@ Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env, jobject this) { @@ -26822,7 +27425,7 @@ X11InputMethodData *pX11IMData; StatusWindow *statusWindow; -@@ -1859,7 +1859,7 @@ +@@ -1862,7 +1862,7 @@ X11InputMethodData *pX11IMData; XVaNestedList status; @@ -26831,7 +27434,7 @@ /*do nothing for linux? */ #else AWT_LOCK(); -@@ -1965,7 +1965,7 @@ +@@ -1968,7 +1968,7 @@ JNIEXPORT void JNICALL Java_sun_awt_X11_XInputMethod_adjustStatusWindow (JNIEnv *env, jobject this, jlong window) { @@ -26840,8 +27443,8 @@ AWT_LOCK(); adjustStatusWindow(window); AWT_UNLOCK(); ---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-06-15 22:07:36.000000000 -0700 @@ -143,7 +143,11 @@ (*env)->DeleteLocalRef(env, propname); } @@ -26854,8 +27457,8 @@ JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load", "(Ljava/lang/String;)V", ---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-06-15 22:07:36.000000000 -0700 @@ -63,8 +63,9 @@ extern JavaVM *jvm; @@ -26876,8 +27479,8 @@ statusWindowEventHandler(xev); #endif xembed_eventHandler(&xev); ---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-06-15 22:07:36.000000000 -0700 @@ -32,6 +32,7 @@ #include <dlfcn.h> #include "jni.h" @@ -26900,8 +27503,8 @@ } if (handle == NULL) { ---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-10-31 14:12:37.000000000 -0700 @@ -45,7 +45,7 @@ #include "wsutils.h" #include "list.h" @@ -26911,8 +27514,8 @@ #include <sys/socket.h> #endif ---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-06-15 22:07:36.000000000 -0700 @@ -187,15 +187,20 @@ #ifdef __solaris__ extern Widget awt_util_getXICStatusAreaWindow(Widget w); @@ -26935,8 +27538,8 @@ typedef struct _XmImRefRec { Cardinal num_refs; /* Number of referencing widgets. */ Cardinal max_refs; /* Maximum length of refs array. */ ---- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-06-15 22:07:36.000000000 -0700 @@ -121,12 +121,19 @@ static Atom XA_KWM_WIN_MAXIMIZED; @@ -27034,8 +27637,8 @@ awt_wmgr = OPENLOOK_WM; } else { ---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-06-15 22:07:36.000000000 -0700 @@ -45,7 +45,10 @@ KDE2_WM, SAWFISH_WM, @@ -27048,8 +27651,8 @@ }; extern void awt_wm_init(void); ---- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-06-15 22:07:36.000000000 -0700 @@ -58,7 +58,7 @@ */ /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ @@ -27065,8 +27668,8 @@ -#endif /* __linux__ */ +#endif /* __linux__ || _ALLBSD_SOURCE */ ---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-06-15 22:07:36.000000000 -0700 @@ -23,7 +23,7 @@ * questions. */ @@ -27224,8 +27827,8 @@ if (libfontconfig == NULL) { return NULL; } ---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-10-31 14:12:37.000000000 -0700 @@ -30,9 +30,12 @@ #include <string.h> #include "gtk2_interface.h" @@ -27241,7 +27844,7 @@ #define G_TYPE_INVALID G_TYPE_MAKE_FUNDAMENTAL (0) #define G_TYPE_NONE G_TYPE_MAKE_FUNDAMENTAL (1) -@@ -404,9 +407,12 @@ +@@ -414,9 +417,12 @@ void *lib = NULL; gboolean result = FALSE; @@ -27256,7 +27859,7 @@ } fp_gtk_check_version = dlsym(lib, "gtk_check_version"); -@@ -458,11 +464,19 @@ +@@ -468,11 +474,19 @@ int (*io_handler)(); char *gtk_modules_env; @@ -27280,8 +27883,8 @@ if (setjmp(j) == 0) { ---- ./jdk/src/solaris/native/sun/awt/list.c 2010-07-09 01:52:42.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/list.c 2010-07-11 09:13:57.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/list.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/list.c 2010-06-15 22:07:37.000000000 -0700 @@ -66,7 +66,11 @@ ----------------------------------------------------------------------- **/ @@ -27294,8 +27897,8 @@ #include "list.h" ---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-06-15 22:07:37.000000000 -0700 @@ -27,6 +27,9 @@ #error This file should not be included in headless library #endif @@ -27306,8 +27909,8 @@ #include "robot_common.h" /* ---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-06-15 22:07:37.000000000 -0700 @@ -32,7 +32,11 @@ * into X11FontScaler_md.c, which is compiled into another library. */ @@ -27320,8 +27923,8 @@ #include <ctype.h> #include <sys/utsname.h> ---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-06-15 22:07:37.000000000 -0700 @@ -39,7 +39,11 @@ #include "GraphicsPrimitiveMgr.h" #include "glyphblitting.h" @@ -27334,8 +27937,8 @@ JNIEXPORT void JNICALL AWTDrawGlyphList ---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-06-15 22:07:37.000000000 -0700 @@ -28,11 +28,11 @@ #include <sys/types.h> @@ -27351,8 +27954,8 @@ typedef unsigned char jubyte; typedef unsigned short jushort; ---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-06-15 22:07:38.000000000 -0700 @@ -63,6 +63,10 @@ * MLIB_EDGE_SRC_PADDED */ @@ -27458,8 +28061,8 @@ LOGIC(da[0], dtmp, dtmp1, |); } else { /* aligned */ ---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-06-15 22:07:38.000000000 -0700 @@ -794,7 +794,7 @@ static int initialized; static int usevis = JNI_TRUE; @@ -27469,8 +28072,8 @@ # define ULTRA_CHIP "sparc64" #else # define ULTRA_CHIP "sun4u" ---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-06-15 22:07:38.000000000 -0700 @@ -27,7 +27,10 @@ #define OGLFuncs_md_h_Included @@ -27491,8 +28094,8 @@ } \ OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \ } \ ---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-07-24 14:31:30.000000000 -0700 @@ -32,6 +32,7 @@ #include "gdefs.h" @@ -27510,8 +28113,8 @@ } if (lib != NULL) { ---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-06-15 22:07:38.000000000 -0700 @@ -44,6 +44,7 @@ #include <X11/Xlib.h> @@ -27534,8 +28137,8 @@ void *sym = dlsym(handle, "IsXineramaOn"); IsXineramaOn = (IsXineramaOnFunc *)sym; if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) { ---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-06-15 22:07:38.000000000 -0700 @@ -26,6 +26,10 @@ #include <sys/types.h> #include <sys/stat.h> @@ -27547,8 +28150,8 @@ #include "jni.h" #include "jni_util.h" #include "sun_management_FileSystemImpl.h" ---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-06-15 22:07:38.000000000 -0700 @@ -33,7 +33,7 @@ #include <strings.h> #endif @@ -27558,8 +28161,8 @@ #include <string.h> #endif ---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-10-31 14:12:37.000000000 -0700 @@ -26,11 +26,12 @@ #include "jni.h" #include "jni_util.h" @@ -27586,8 +28189,8 @@ gconf_ver = 2; } if (gconf_ver > 0) { ---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-06-15 22:07:38.000000000 -0700 @@ -35,7 +35,7 @@ #include <string.h> #include <errno.h> @@ -27637,8 +28240,8 @@ } #endif ---- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-06-15 22:07:38.000000000 -0700 @@ -73,7 +73,7 @@ m.msg_accrightslen = 0; #endif @@ -27657,8 +28260,8 @@ m.msg_control = NULL; m.msg_controllen = 0; #endif ---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-06-15 22:07:38.000000000 -0700 @@ -26,15 +26,21 @@ #include "jni.h" #include "jni_util.h" @@ -27774,8 +28377,8 @@ +#endif +#endif } ---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-06-15 22:07:38.000000000 -0700 @@ -33,9 +33,13 @@ #include <sys/socket.h> #include <fcntl.h> @@ -27814,8 +28417,8 @@ if (lockResult < 0) { JNU_ThrowIOExceptionWithLastError(env, "Release failed"); } ---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-06-15 22:07:38.000000000 -0700 @@ -30,6 +30,10 @@ #include "nio_util.h" #include "sun_nio_ch_FileKey.h" @@ -27827,8 +28430,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-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-10-31 14:12:37.000000000 -0700 @@ -116,6 +116,47 @@ #endif /* __linux__ */ @@ -27877,7 +28480,7 @@ #define COPY_INET6_ADDRESS(env, source, target) \ (*env)->GetByteArrayRegion(env, source, 0, 16, target) -@@ -255,8 +296,30 @@ +@@ -271,8 +312,30 @@ SOCKADDR sa; socklen_t sa_len = SOCKADDR_LEN; if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) { @@ -27908,7 +28511,7 @@ } return NET_GetPortFromSockaddr((struct sockaddr *)&sa); } -@@ -268,8 +331,30 @@ +@@ -284,8 +347,30 @@ socklen_t sa_len = SOCKADDR_LEN; int port; if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) { @@ -27939,17 +28542,7 @@ } return NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port); } -@@ -282,7 +367,8 @@ - struct linger linger; - u_char carg; - void *arg; -- int arglen, n; -+ socklen_t arglen; -+ int n; - - /* Option value is an int except for a few specific cases */ - -@@ -332,7 +418,8 @@ +@@ -349,7 +434,8 @@ struct linger linger; u_char carg; void *parg; @@ -27959,7 +28552,7 @@ /* Option value is an int except for a few specific cases */ -@@ -495,7 +582,7 @@ +@@ -512,7 +598,7 @@ Java_sun_nio_ch_Net_setInterface4(JNIEnv* env, jobject this, jobject fdo, jint interf) { struct in_addr in; @@ -27968,16 +28561,7 @@ int n; in.s_addr = htonl(interf); -@@ -511,7 +598,7 @@ - Java_sun_nio_ch_Net_getInterface4(JNIEnv* env, jobject this, jobject fdo) - { - struct in_addr in; -- int arglen = sizeof(struct in_addr); -+ socklen_t arglen = sizeof(struct in_addr); - int n; - - n = getsockopt(fdval(env, fdo), IPPROTO_IP, IP_MULTICAST_IF, (void*)&in, &arglen); -@@ -526,7 +613,7 @@ +@@ -543,7 +629,7 @@ Java_sun_nio_ch_Net_setInterface6(JNIEnv* env, jobject this, jobject fdo, jint index) { int value = (jint)index; @@ -27986,16 +28570,7 @@ int n; n = setsockopt(fdval(env, fdo), IPPROTO_IPV6, IPV6_MULTICAST_IF, -@@ -540,7 +627,7 @@ - Java_sun_nio_ch_Net_getInterface6(JNIEnv* env, jobject this, jobject fdo) - { - int index; -- int arglen = sizeof(index); -+ socklen_t arglen = sizeof(index); - int n; - - n = getsockopt(fdval(env, fdo), IPPROTO_IPV6, IPV6_MULTICAST_IF, (void*)&index, &arglen); -@@ -569,9 +656,11 @@ +@@ -586,9 +672,11 @@ switch (errorValue) { case EINPROGRESS: /* Non-blocking connect */ return 0; @@ -28007,8 +28582,8 @@ case ECONNREFUSED: xn = JNU_JAVANETPKG "ConnectException"; break; ---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-06-15 22:07:38.000000000 -0700 @@ -67,7 +67,7 @@ @@ -28057,8 +28632,8 @@ jboolean loadSocketExtensionFuncs(JNIEnv* env); #endif /* !SUN_NIO_CH_SCTP_H */ ---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-06-15 22:07:38.000000000 -0700 @@ -337,11 +337,11 @@ break; case SCTP_ADDR_MADE_PRIM : @@ -28073,8 +28648,8 @@ } addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr); ---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-10-31 14:12:37.000000000 -0700 @@ -58,6 +58,7 @@ */ jboolean loadSocketExtensionFuncs @@ -28091,8 +28666,8 @@ funcsLoaded = JNI_TRUE; return JNI_TRUE; ---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-07-04 12:49:46.000000000 -0700 @@ -28,23 +28,35 @@ #include "jvm.h" #include "jlong.h" @@ -28373,7 +28948,7 @@ + free(iter); + } } ---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800 @@ -1,195 +0,0 @@ -/* @@ -28571,8 +29146,8 @@ - - -} ---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-07-11 09:13:58.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-06-15 22:07:39.000000000 -0700 @@ -30,7 +30,9 @@ #include <stdlib.h> @@ -28583,8 +29158,8 @@ #ifdef __solaris__ #include <strings.h> ---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-06-15 22:07:39.000000000 -0700 @@ -49,6 +49,11 @@ #include <mntent.h> #endif @@ -28643,8 +29218,8 @@ #else m = getmntent_r(fp, &ent, (char*)&buf, buflen); if (m == NULL) ---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-06-15 22:07:39.000000000 -0700 @@ -63,7 +63,12 @@ DEFX(O_EXCL); DEFX(O_TRUNC); @@ -28671,8 +29246,8 @@ DEF(ERANGE); // flags used with openat/unlinkat/etc. ---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-06-15 22:07:39.000000000 -0700 @@ -26,7 +26,9 @@ #include <stdio.h> #include <stdlib.h> @@ -28683,8 +29258,8 @@ #include "NativeFunc.h" /* standard GSS method names (ordering is from mapfile) */ ---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-15 22:07:39.000000000 -0700 @@ -28,12 +28,19 @@ #include <string.h> @@ -28727,8 +29302,8 @@ (*env)->ReleaseStringUTFChars(env, jLibName, libName); dprintf2("-handle: %u (0X%X)\n", hModule, hModule); ---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-06-15 22:07:39.000000000 -0700 @@ -64,7 +64,9 @@ #include <assert.h> @@ -28739,8 +29314,8 @@ #include <jni.h> ---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-06-15 22:07:39.000000000 -0700 @@ -29,7 +29,9 @@ #include <assert.h> @@ -28751,8 +29326,37 @@ #include <winscard.h> ---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-07-11 09:19:15.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-11-07 17:21:38.000000000 -0800 ++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-10-31 13:48:56.000000000 -0700 +@@ -1,12 +1,12 @@ + /* +- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. ++ * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as +- * published by the Free Software Foundation. Oracle designates this ++ * published by the Free Software Foundation. Sun designates this + * particular file as subject to the "Classpath" exception as provided +- * by Oracle in the LICENSE file that accompanied this code. ++ * by Sun in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +@@ -18,9 +18,9 @@ + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * +- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +- * or visit www.oracle.com if you need additional information or have any +- * questions. ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. + */ + + #include "jni.h" @@ -35,10 +35,10 @@ #include <dirent.h> #include <ctype.h> @@ -29057,8 +29661,8 @@ + JNU_ReleaseStringPlatformChars(env, path, _path); + } +} ---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-06-15 22:07:39.000000000 -0700 @@ -228,10 +228,10 @@ {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD}, @@ -29083,8 +29687,8 @@ /* The following code on Linux will cause the keypad keys * not to echo on JTextField when the NumLock is on. The * keysyms will be 0, because the last parameter 2 is not defined. ---- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-10-31 14:12:37.000000000 -0700 @@ -24,6 +24,7 @@ */ @@ -29093,8 +29697,8 @@ #include <dlfcn.h> typedef int gboolean; -@@ -36,12 +37,15 @@ - gboolean (*gnome_vfs_init) (void); +@@ -39,12 +40,15 @@ + void *gnome_handle; const char *errmsg; - vfs_handle = dlopen("libgnomevfs-2.so.0", RTLD_LAZY); @@ -29111,8 +29715,8 @@ + } } dlerror(); /* Clear errors */ - gnome_vfs_init = dlsym(vfs_handle, "gnome_vfs_init"); -@@ -54,12 +58,15 @@ + gnome_vfs_init = (GNOME_VFS_INIT_TYPE*)dlsym(vfs_handle, "gnome_vfs_init"); +@@ -57,12 +61,15 @@ // call gonme_vfs_init() (*gnome_vfs_init)(); @@ -29130,9 +29734,9 @@ + } } dlerror(); /* Clear errors */ - gnome_url_show = dlsym(gnome_handle, "gnome_url_show"); ---- ./jdk/src/solaris/npt/npt_md.h 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/npt/npt_md.h 2010-07-11 09:13:59.000000000 -0700 + gnome_url_show = (GNOME_URL_SHOW_TYPE*)dlsym(gnome_handle, "gnome_url_show"); +--- ./jdk/src/solaris/npt/npt_md.h 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/npt/npt_md.h 2010-06-15 22:07:39.000000000 -0700 @@ -32,9 +32,10 @@ #include <string.h> #include <errno.h> @@ -29155,8 +29759,8 @@ if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \ _sym = dlsym(_handle, "nptInitialize"); \ if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \ ---- ./jdk/src/solaris/transport/socket/socket_md.c 2010-07-09 01:52:43.000000000 -0700 -+++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-07-11 09:13:59.000000000 -0700 +--- ./jdk/src/solaris/transport/socket/socket_md.c 2010-11-04 16:13:26.000000000 -0700 ++++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-06-15 22:07:39.000000000 -0700 @@ -36,7 +36,7 @@ #ifdef __solaris__ #include <thread.h> @@ -29175,8 +29779,8 @@ int dbgsysTlsAlloc() { pthread_key_t key; ---- ./jdk/test/Makefile 2010-07-09 01:52:46.000000000 -0700 -+++ ./jdk/test/Makefile 2010-07-11 09:14:03.000000000 -0700 +--- ./jdk/test/Makefile 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/Makefile 2010-07-24 14:31:30.000000000 -0700 @@ -79,6 +79,16 @@ endif OS_VERSION := $(shell $(UNAME) -r) @@ -29194,8 +29798,8 @@ ifeq ($(OS_NAME),) OS_NAME = windows # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always ---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-07-11 09:14:04.000000000 -0700 +--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-06-15 22:07:44.000000000 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -29205,8 +29809,8 @@ PATHSEP=":" ;; ---- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-07-11 09:14:04.000000000 -0700 +--- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-06-15 22:07:44.000000000 -0700 @@ -63,7 +63,7 @@ OS=`uname -s` export TRANSPORT_METHOD @@ -29216,8 +29820,8 @@ PATHSEP=":" TRANSPORT_METHOD=dt_socket ;; ---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-07-11 09:14:04.000000000 -0700 +--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-06-15 22:07:45.000000000 -0700 @@ -121,10 +121,14 @@ esac libloc=${jreloc}/lib/${libarch} @@ -29234,9 +29838,9 @@ Windows*) libloc=${jreloc}/bin sep=';' ---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-07-11 09:14:04.000000000 -0700 -@@ -289,7 +289,7 @@ +--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-08-14 11:45:21.000000000 -0700 +@@ -292,7 +292,7 @@ psCmd=ps jstack=jstack.exe ;; @@ -29245,8 +29849,8 @@ transport=dt_socket address= devnull=/dev/null ---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-07-11 09:14:04.000000000 -0700 +--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-06-15 22:07:45.000000000 -0700 @@ -112,7 +112,7 @@ fi ;; @@ -29256,8 +29860,8 @@ pass "This test always passes on $OS" ;; ---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-07-11 09:14:05.000000000 -0700 +--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-06-15 22:07:45.000000000 -0700 @@ -45,10 +45,7 @@ OS=`uname -s` @@ -29270,8 +29874,8 @@ PS=":" ;; Windows* | CYGWIN*) ---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-07-11 09:14:05.000000000 -0700 +--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-06-15 22:07:46.000000000 -0700 @@ -83,6 +83,10 @@ total_swap=`free -b | grep -i swap | awk '{print $2}'` runOne GetTotalSwapSpaceSize $total_swap @@ -29283,8 +29887,8 @@ * ) runOne GetTotalSwapSpaceSize "sanity-only" ;; ---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-07-11 09:14:05.000000000 -0700 +--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-06-15 22:07:46.000000000 -0700 @@ -48,7 +48,7 @@ # Test GetMaxFileDescriptorCount if we are running on Unix @@ -29294,8 +29898,8 @@ runOne GetMaxFileDescriptorCount ;; * ) ---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-07-09 01:52:47.000000000 -0700 -+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-07-11 09:14:05.000000000 -0700 +--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-06-15 22:07:46.000000000 -0700 @@ -48,7 +48,7 @@ # Test GetOpenFileDescriptorCount if we are running on Unix @@ -29305,8 +29909,8 @@ runOne GetOpenFileDescriptorCount ;; * ) ---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-07-09 01:52:48.000000000 -0700 -+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-07-11 09:14:06.000000000 -0700 +--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-11-04 16:13:27.000000000 -0700 ++++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-06-15 22:07:47.000000000 -0700 @@ -36,11 +36,7 @@ OS=`uname -s` @@ -29320,8 +29924,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-07-09 01:52:49.000000000 -0700 -+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-07-11 09:14:08.000000000 -0700 +--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-11-04 16:13:28.000000000 -0700 ++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-30 09:28:46.000000000 -0800 @@ -25,10 +25,11 @@ fi @@ -29338,8 +29942,8 @@ # Windows if [ -z "${TESTJAVA}" ] ; then ---- ./jdk/test/java/io/File/GetXSpace.sh 2010-07-09 01:52:52.000000000 -0700 -+++ ./jdk/test/java/io/File/GetXSpace.sh 2010-07-11 09:14:12.000000000 -0700 +--- ./jdk/test/java/io/File/GetXSpace.sh 2010-11-04 16:13:28.000000000 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.sh 2010-06-15 22:07:52.000000000 -0700 @@ -26,7 +26,7 @@ # set platform-dependent variable OS=`uname -s` @@ -29349,8 +29953,8 @@ Windows_98 ) return ;; Windows* ) SID=`sid`; TMP="c:/temp" ;; * ) ---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-07-09 01:52:53.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-07-11 09:14:13.000000000 -0700 +--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-11-04 16:13:28.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-06-15 22:07:53.000000000 -0700 @@ -41,7 +41,7 @@ # Need to determine the classpath separator and filepath separator based on the # operating system. @@ -29360,8 +29964,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-07-09 01:52:53.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-07-11 09:14:14.000000000 -0700 +--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-11-04 16:13:28.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-06-15 22:07:54.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29371,8 +29975,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-07-09 01:52:53.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-07-11 09:14:14.000000000 -0700 +--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-11-04 16:13:28.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-06-15 22:07:54.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29382,8 +29986,8 @@ PS=":" ;; Windows* | CYGWIN* ) PS=";" ;; ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-07-09 01:52:54.000000000 -0700 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-07-11 09:14:15.000000000 -0700 +--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-11-04 16:13:28.000000000 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-06-15 22:07:55.000000000 -0700 @@ -49,10 +49,7 @@ # set platform-specific variables OS=`uname -s` @@ -29396,8 +30000,8 @@ FS="/" ;; Windows* | CYGWIN* ) ---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-07-09 01:52:54.000000000 -0700 -+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-07-11 09:14:16.000000000 -0700 +--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-06-15 22:07:55.000000000 -0700 @@ -30,7 +30,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29407,8 +30011,8 @@ Windows* | CYGWIN* ) echo "Passed"; exit 0 ;; * ) echo "Unrecognized system!" ; exit 1 ;; ---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-07-09 01:52:55.000000000 -0700 -+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-07-11 09:14:16.000000000 -0700 +--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-06-15 22:07:56.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29418,8 +30022,8 @@ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-07-09 01:52:55.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-07-11 09:14:16.000000000 -0700 +--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-06-15 22:07:56.000000000 -0700 @@ -49,7 +49,7 @@ OS=`uname -s` @@ -29429,8 +30033,8 @@ PATHSEP=":" ;; ---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-07-09 01:52:55.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-07-11 09:14:17.000000000 -0700 +--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-06-15 22:07:56.000000000 -0700 @@ -35,11 +35,7 @@ OS=`uname -s` @@ -29444,8 +30048,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-07-09 01:52:55.000000000 -0700 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-07-11 09:14:17.000000000 -0700 +--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-06-15 22:07:57.000000000 -0700 @@ -61,10 +61,7 @@ while true; do echo "Run $i: TestSystemLoadAvg" @@ -29458,8 +30062,8 @@ runOne GetSystemLoadAverage ;; * ) ---- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-07-09 01:52:56.000000000 -0700 -+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-07-11 09:14:18.000000000 -0700 +--- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-06-15 22:07:58.000000000 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -29469,8 +30073,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-07-09 01:52:56.000000000 -0700 -+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-07-11 09:14:18.000000000 -0700 +--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-06-15 22:07:58.000000000 -0700 @@ -27,11 +27,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29484,8 +30088,8 @@ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-07-09 01:52:56.000000000 -0700 -+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-07-11 09:14:19.000000000 -0700 +--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-06-15 22:07:59.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -29495,8 +30099,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URL/B5086147.sh 2010-07-09 01:52:56.000000000 -0700 -+++ ./jdk/test/java/net/URL/B5086147.sh 2010-07-11 09:14:19.000000000 -0700 +--- ./jdk/test/java/net/URL/B5086147.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/net/URL/B5086147.sh 2010-06-15 22:07:59.000000000 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -29506,8 +30110,8 @@ exit 0 ;; CYGWIN* ) ---- ./jdk/test/java/net/URL/runconstructor.sh 2010-07-09 01:52:56.000000000 -0700 -+++ ./jdk/test/java/net/URL/runconstructor.sh 2010-07-11 09:14:19.000000000 -0700 +--- ./jdk/test/java/net/URL/runconstructor.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/net/URL/runconstructor.sh 2010-06-15 22:07:59.000000000 -0700 @@ -27,7 +27,7 @@ # OS=`uname -s` @@ -29517,8 +30121,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-07-09 01:52:57.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-07-11 09:14:19.000000000 -0700 +--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-06-15 22:07:59.000000000 -0700 @@ -34,11 +34,7 @@ OS=`uname -s` @@ -29532,8 +30136,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-07-09 01:52:57.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-07-11 09:14:20.000000000 -0700 +--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-06-15 22:07:59.000000000 -0700 @@ -27,11 +27,7 @@ OS=`uname -s` @@ -29547,8 +30151,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-07-09 01:52:57.000000000 -0700 -+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-07-11 09:14:20.000000000 -0700 +--- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-06-15 22:07:59.000000000 -0700 @@ -33,11 +33,7 @@ OS=`uname -s` @@ -29562,8 +30166,8 @@ PS=":" FS="/" ;; ---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-07-09 01:52:58.000000000 -0700 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-07-11 09:14:21.000000000 -0700 +--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-01-30 09:28:55.000000000 -0800 @@ -71,6 +71,48 @@ EXTRA_LIBS = -lc endif @@ -29613,9 +30217,9 @@ LIBDIR=lib/$(PLATFORM)-$(ARCH) LAUNCHERLIB=$(LIBDIR)/libLauncher.so -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-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-07-09 01:52:58.000000000 -0700 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-07-11 09:14:21.000000000 -0700 +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ +--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-06-15 22:08:01.000000000 -0700 @@ -33,11 +33,14 @@ # @run shell run_tests.sh @@ -29684,8 +30288,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select LIBDIR=lib/${PLATFORM}-${ARCH} LAUNCHERLIB=${LIBDIR}/libLauncher.so ---- ./jdk/test/java/nio/charset/Charset/default.sh 2010-07-09 01:52:58.000000000 -0700 -+++ ./jdk/test/java/nio/charset/Charset/default.sh 2010-07-11 09:14:21.000000000 -0700 +--- ./jdk/test/java/nio/charset/Charset/default.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/nio/charset/Charset/default.sh 2010-06-15 22:08:01.000000000 -0700 @@ -41,10 +41,14 @@ fi @@ -29705,8 +30309,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select JAVA=$TESTJAVA/bin/java ---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-07-09 01:52:58.000000000 -0700 -+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-07-11 09:14:21.000000000 -0700 +--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-06-15 22:08:01.000000000 -0700 @@ -34,7 +34,7 @@ OS=`uname -s` @@ -29716,8 +30320,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select # Skip locale test for Windows Windows* ) echo "Passed"; exit 0 ;; ---- ./jdk/test/java/nio/charset/spi/basic.sh 2010-07-09 01:52:58.000000000 -0700 -+++ ./jdk/test/java/nio/charset/spi/basic.sh 2010-07-11 09:14:22.000000000 -0700 +--- ./jdk/test/java/nio/charset/spi/basic.sh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/nio/charset/spi/basic.sh 2010-06-15 22:08:01.000000000 -0700 @@ -70,10 +70,14 @@ L="$1" shift @@ -29746,8 +30350,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select Windows* ) CPS=';' ;; *) echo "Unknown platform: `uname`"; exit 1 ;; esac ---- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-07-09 01:52:58.000000000 -0700 -+++ ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-07-11 09:14:22.000000000 -0700 +--- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-06-15 22:08:01.000000000 -0700 @@ -147,7 +147,8 @@ // get file attributes of source file @@ -29758,8 +30362,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/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-07-09 01:52:59.000000000 -0700 -+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-07-11 09:14:24.000000000 -0700 +--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-11-04 16:13:29.000000000 -0700 ++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-06-15 22:08:03.000000000 -0700 @@ -84,14 +84,12 @@ @@ -29779,8 +30383,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select export PATH_SEP mainpid=$$ ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-07-09 01:53:00.000000000 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-07-11 09:14:26.000000000 -0700 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-06-15 22:08:05.000000000 -0700 @@ -46,11 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29794,8 +30398,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-07-09 01:53:00.000000000 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-07-11 09:14:26.000000000 -0700 +--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-06-15 22:08:05.000000000 -0700 @@ -34,11 +34,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29809,8 +30413,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-07-09 01:53:00.000000000 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-07-11 09:14:26.000000000 -0700 +--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-06-15 22:08:05.000000000 -0700 @@ -46,11 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29824,8 +30428,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-07-09 01:53:01.000000000 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-07-11 09:14:26.000000000 -0700 +--- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-06-15 22:08:05.000000000 -0700 @@ -46,11 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29839,8 +30443,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-07-09 01:53:01.000000000 -0700 -+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-07-11 09:14:27.000000000 -0700 +--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-11-04 16:13:30.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 OS=`uname -s` @@ -29850,8 +30454,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PS=":" FS="/" ;; ---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-07-09 01:53:02.000000000 -0700 -+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-07-11 09:14:28.000000000 -0700 +--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-06-15 22:08:06.000000000 -0700 @@ -58,7 +58,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29861,8 +30465,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PS=":" FS="/" ;; ---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-07-09 01:53:02.000000000 -0700 -+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-07-11 09:14:28.000000000 -0700 +--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-06-15 22:08:07.000000000 -0700 @@ -31,7 +31,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29872,8 +30476,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-07-09 01:53:02.000000000 -0700 -+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-07-11 09:14:28.000000000 -0700 +--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-06-15 22:08:07.000000000 -0700 @@ -75,7 +75,7 @@ SunOS) DEL=":" @@ -29883,8 +30487,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select DEL=":" HAS_S=YES ;; ---- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-07-09 01:53:02.000000000 -0700 -+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-07-11 09:14:29.000000000 -0700 +--- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-06-15 22:08:07.000000000 -0700 @@ -42,9 +42,7 @@ OS=`uname -s` @@ -29896,8 +30500,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select SEP=':' ;; * ) SEP='\;' ;; ---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-07-09 01:53:03.000000000 -0700 -+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-07-11 09:14:30.000000000 -0700 +--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-11-04 16:13:30.000000000 -0700 ++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-06-15 22:08:09.000000000 -0700 @@ -51,7 +51,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29907,8 +30511,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/javax/script/CommonSetup.sh 2010-07-09 01:53:05.000000000 -0700 -+++ ./jdk/test/javax/script/CommonSetup.sh 2010-07-11 09:14:33.000000000 -0700 +--- ./jdk/test/javax/script/CommonSetup.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/javax/script/CommonSetup.sh 2010-06-15 22:08:11.000000000 -0700 @@ -36,11 +36,7 @@ OS=`uname -s` @@ -29922,8 +30526,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PS=":" FS="/" ;; ---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-07-09 01:53:05.000000000 -0700 -+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-07-11 09:14:33.000000000 -0700 +--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-06-15 22:08:11.000000000 -0700 @@ -33,12 +33,7 @@ # set platform-dependent variables OS=`uname -s` @@ -29938,8 +30542,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PS=":" FS="/" RM="/bin/rm -f" ---- ./jdk/test/jprt.config 2010-07-09 01:53:07.000000000 -0700 -+++ ./jdk/test/jprt.config 2010-07-11 09:14:37.000000000 -0700 +--- ./jdk/test/jprt.config 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/jprt.config 2010-06-15 22:08:14.000000000 -0700 @@ -71,8 +71,8 @@ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. @@ -30007,8 +30611,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select # Export PATH setting PATH="${path4sdk}" ---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-07-09 01:53:07.000000000 -0700 -+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-07-11 09:14:37.000000000 -0700 +--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-06-15 22:08:14.000000000 -0700 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30018,8 +30622,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-07-11 09:14:37.000000000 -0700 +--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-06-15 22:08:15.000000000 -0700 @@ -45,37 +45,50 @@ # has to locate libjvm.so. Also $! is not reliable on some releases of MKS. #{ @@ -30096,8 +30700,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select # ---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-07-11 09:14:37.000000000 -0700 +--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-06-15 22:08:15.000000000 -0700 @@ -35,7 +35,7 @@ UMASK=`umask` @@ -30107,8 +30711,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select PATHSEP=":" FILESEP="/" DFILESEP=$FILESEP ---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-07-11 09:14:37.000000000 -0700 +--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-06-15 22:08:15.000000000 -0700 @@ -86,10 +86,12 @@ # on Windows 98. @@ -30126,8 +30730,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select JAVA=${TESTJAVA}/bin/java CLASSPATH=${TESTCLASSES} ---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-07-11 09:14:37.000000000 -0700 +--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-06-15 22:08:15.000000000 -0700 @@ -70,10 +70,12 @@ # security the password file. @@ -30145,8 +30749,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select # Create configuration file and dummy password file ---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-07-11 09:14:37.000000000 -0700 +--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-06-15 22:08:15.000000000 -0700 @@ -69,10 +69,12 @@ # security the password file. @@ -30164,9 +30768,9 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/java/nio/channels/spi/Select # Create management and SSL configuration files -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ ---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-07-11 09:14:38.000000000 -0700 +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ +--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-06-15 22:08:15.000000000 -0700 @@ -36,11 +36,7 @@ OS=`uname -s` @@ -30180,8 +30784,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-07-11 09:14:38.000000000 -0700 +--- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-06-15 22:08:15.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -30191,8 +30795,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh 2010-07-11 09:14:38.000000000 -0700 +--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-06-15 22:08:15.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -30202,19 +30806,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-07-09 01:53:08.000000000 -0700 -+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-07-11 09:14:38.000000000 -0700 -@@ -28,7 +28,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux ) -+ SunOS | Linux | *BSD | Darwin ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-07-09 01:53:09.000000000 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-07-11 09:14:39.000000000 -0700 +--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-06-15 22:08:16.000000000 -0700 @@ -31,11 +31,7 @@ OS=`uname -s` @@ -30228,8 +30821,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-07-09 01:53:09.000000000 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-07-11 09:14:39.000000000 -0700 +--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-11-04 16:13:31.000000000 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-06-15 22:08:16.000000000 -0700 @@ -31,11 +31,7 @@ OS=`uname -s` @@ -30243,7 +30836,7 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo PS=":" FS="/" ;; ---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-07-11 09:19:15.000000000 -0700 +--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,79 +0,0 @@ -/* @@ -30325,7 +30918,7 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/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-07-11 09:19:15.000000000 -0700 +--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-11-07 17:21:38.000000000 -0800 +++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800 @@ -1,70 +0,0 @@ -/* @@ -30398,8 +30991,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo - } - } -} ---- ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-07-09 01:53:11.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-07-11 09:14:41.000000000 -0700 +--- ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-11-04 16:13:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-06-15 22:08:18.000000000 -0700 @@ -58,6 +58,11 @@ FILESEP="/" NATIVE=true @@ -30412,8 +31005,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo CYGWIN* ) PATHSEP=";" FILESEP="/" ---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-07-09 01:53:11.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-07-11 09:14:41.000000000 -0700 +--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-11-04 16:13:32.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-06-15 22:08:18.000000000 -0700 @@ -131,6 +131,27 @@ ;; esac @@ -30442,8 +31035,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo Windows* ) FS="\\" PS=";" ---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-07-09 01:53:11.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-07-11 09:14:41.000000000 -0700 +--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-11-04 16:13:32.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-06-15 22:08:19.000000000 -0700 @@ -92,6 +92,27 @@ ;; esac @@ -30472,8 +31065,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo Windows* ) FS="\\" PS=";" ---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-07-09 01:53:11.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-07-11 09:14:42.000000000 -0700 +--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-11-04 16:13:32.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-06-15 22:08:19.000000000 -0700 @@ -50,13 +50,7 @@ OS=`uname -s` @@ -30489,8 +31082,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo FS="/" PS=":" CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-07-09 01:53:11.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-07-11 09:14:42.000000000 -0700 +--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-11-04 16:13:32.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-06-15 22:08:19.000000000 -0700 @@ -51,13 +51,7 @@ OS=`uname -s` @@ -30506,23 +31099,23 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/management/jmxremote/boo FS="/" PS=":" CP="${FS}bin${FS}cp" -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ -Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/tmp-bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ ---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-07-09 01:53:13.000000000 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-07-11 09:14:43.000000000 -0700 +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ +Files /tmp/openjdk_srcdir.NfUrTkDS/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ +--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-11-04 16:13:32.000000000 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-06-15 22:08:19.000000000 -0700 @@ -44,11 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30536,8 +31129,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-07-09 01:53:13.000000000 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-07-11 09:14:44.000000000 -0700 +--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-11-04 16:13:32.000000000 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-06-15 22:08:19.000000000 -0700 @@ -47,11 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30551,8 +31144,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/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-07-09 01:53:14.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-07-11 09:14:45.000000000 -0700 +--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-06-15 22:08:20.000000000 -0700 @@ -42,7 +42,7 @@ OS=`uname -s` @@ -30562,8 +31155,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FILESEP="/" PATHSEP=":" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-07-09 01:53:14.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-06-15 22:08:21.000000000 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -30573,8 +31166,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-07-09 01:53:14.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-06-15 22:08:21.000000000 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -30584,8 +31177,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-07-09 01:53:14.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-06-15 22:08:21.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30595,8 +31188,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-07-09 01:53:14.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-06-15 22:08:21.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30606,8 +31199,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-07-09 01:53:14.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-07-04 12:51:51.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30617,8 +31210,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-06-15 22:08:21.000000000 -0700 @@ -42,7 +42,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30628,8 +31221,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-06-15 22:08:21.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30639,8 +31232,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-06-15 22:08:21.000000000 -0700 @@ -47,11 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30654,8 +31247,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" FILESEP="/" ;; ---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-06-15 22:08:21.000000000 -0700 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30665,8 +31258,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-06-15 22:08:21.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30676,8 +31269,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-06-15 22:08:21.000000000 -0700 @@ -72,6 +72,27 @@ ;; esac @@ -30706,8 +31299,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/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-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-06-15 22:08:21.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30717,8 +31310,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-06-15 22:08:22.000000000 -0700 @@ -37,7 +37,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30728,8 +31321,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; CYGWIN* ) ---- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/resource.sh 2010-06-15 22:08:22.000000000 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30739,8 +31332,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null FS="/" TMP=/tmp ---- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/standard.sh 2010-06-15 22:08:22.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30750,8 +31343,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows_* ) ---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-06-15 22:08:22.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30761,8 +31354,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-06-15 22:08:22.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30772,8 +31365,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-06-15 22:08:22.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30783,8 +31376,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-06-15 22:08:22.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30794,8 +31387,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-06-15 22:08:22.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30805,8 +31398,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-06-15 22:08:22.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30816,8 +31409,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-06-15 22:08:22.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -30827,8 +31420,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-07-11 09:14:46.000000000 -0700 +--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-06-15 22:08:22.000000000 -0700 @@ -53,7 +53,7 @@ OS=`uname -s` @@ -30838,8 +31431,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" ;; ---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-07-09 01:53:15.000000000 -0700 -+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-07-11 09:14:47.000000000 -0700 +--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-06-15 22:08:22.000000000 -0700 @@ -54,7 +54,7 @@ OS=`uname -s` @@ -30849,8 +31442,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" ;; ---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-07-09 01:53:16.000000000 -0700 -+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-07-11 09:14:47.000000000 -0700 +--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-06-15 22:08:23.000000000 -0700 @@ -33,7 +33,7 @@ case `uname -s` in @@ -30860,8 +31453,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ esac N2A=$TESTJAVA/bin/native2ascii ---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-07-09 01:53:16.000000000 -0700 -+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-07-11 09:14:47.000000000 -0700 +--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-11-04 16:13:33.000000000 -0700 ++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-06-15 22:08:23.000000000 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -30871,23 +31464,19 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PATHSEP=":" ;; ---- ./jdk/test/tools/pack200/Pack200Simple.sh 2010-07-09 01:53:16.000000000 -0700 -+++ ./jdk/test/tools/pack200/Pack200Simple.sh 2010-07-11 09:14:48.000000000 -0700 -@@ -85,7 +85,7 @@ - break - ;; - -- Linux ) -+ Linux | *BSD | Darwin ) - PackOptions="-J-Xmx512m -J-ea" - break - ;; ---- ./langtools/.jcheck/conf 2010-07-09 01:53:39.000000000 -0700 +--- ./langtools/.hgtags 2010-11-04 16:13:41.000000000 -0700 ++++ ./langtools/.hgtags 2010-11-06 22:59:55.000000000 -0700 +@@ -91,3 +91,4 @@ + e4e7408cdc5b3d91d39161e1e94aad576ecc2dcd jdk7-b114 + 01e8ac5fbefd35d2d9a0996213cf2390fd164e57 jdk7-b115 + 857bfcea3f30cb5f4ae96f46a53ae1c772f9b0e5 jdk7-b116 ++2129a046f117547fc8a5cb3397a767e6d528f5b6 jdk7-b117 +--- ./langtools/.jcheck/conf 2010-11-04 16:13:41.000000000 -0700 +++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -project=jdk7 ---- ./langtools/test/Makefile 2010-07-09 01:53:41.000000000 -0700 -+++ ./langtools/test/Makefile 2010-07-11 09:15:06.000000000 -0700 +--- ./langtools/test/Makefile 2010-11-04 16:13:42.000000000 -0700 ++++ ./langtools/test/Makefile 2010-06-15 22:08:59.000000000 -0700 @@ -34,6 +34,22 @@ ARCH=i586 endif @@ -30931,8 +31520,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ # Root of all test results TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools ---- ./langtools/test/jprt.config 2010-07-09 01:53:42.000000000 -0700 -+++ ./langtools/test/jprt.config 2010-07-11 09:15:09.000000000 -0700 +--- ./langtools/test/jprt.config 2010-11-04 16:13:42.000000000 -0700 ++++ ./langtools/test/jprt.config 2010-06-15 22:09:02.000000000 -0700 @@ -71,8 +71,8 @@ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. @@ -31000,8 +31589,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ # Export PATH setting PATH="${path4sdk}" ---- ./langtools/test/tools/javac/4846262/Test.sh 2010-07-09 01:53:43.000000000 -0700 -+++ ./langtools/test/tools/javac/4846262/Test.sh 2010-07-11 09:15:09.000000000 -0700 +--- ./langtools/test/tools/javac/4846262/Test.sh 2010-11-04 16:13:42.000000000 -0700 ++++ ./langtools/test/tools/javac/4846262/Test.sh 2010-06-15 22:09:03.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31011,8 +31600,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; CYGWIN* ) ---- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-07-09 01:53:43.000000000 -0700 -+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2010-07-11 09:15:09.000000000 -0700 +--- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-11-04 16:13:42.000000000 -0700 ++++ ./langtools/test/tools/javac/6302184/T6302184.sh 2010-06-15 22:09:03.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31022,8 +31611,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; CYGWIN* ) ---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-07-09 01:53:43.000000000 -0700 -+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-07-11 09:15:10.000000000 -0700 +--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-11-04 16:13:43.000000000 -0700 ++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-06-15 22:09:04.000000000 -0700 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31033,8 +31622,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-07-09 01:53:44.000000000 -0700 -+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-07-11 09:15:11.000000000 -0700 +--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-11-04 16:13:43.000000000 -0700 ++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-06-15 22:09:04.000000000 -0700 @@ -54,7 +54,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31044,8 +31633,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javac/MissingInclude.sh 2010-07-09 01:53:44.000000000 -0700 -+++ ./langtools/test/tools/javac/MissingInclude.sh 2010-07-11 09:15:12.000000000 -0700 +--- ./langtools/test/tools/javac/MissingInclude.sh 2010-11-04 16:13:43.000000000 -0700 ++++ ./langtools/test/tools/javac/MissingInclude.sh 2010-06-15 22:09:05.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31055,8 +31644,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-07-09 01:53:44.000000000 -0700 -+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-07-11 09:15:12.000000000 -0700 +--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-11-04 16:13:43.000000000 -0700 ++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-06-15 22:09:05.000000000 -0700 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31066,8 +31655,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-07-09 01:53:44.000000000 -0700 -+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2010-07-11 09:15:13.000000000 -0700 +--- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-11-04 16:13:43.000000000 -0700 ++++ ./langtools/test/tools/javac/T5090006/compiler.sh 2010-06-15 22:09:05.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31077,8 +31666,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/apt.sh 2010-07-09 01:53:45.000000000 -0700 -+++ ./langtools/test/tools/javac/apt.sh 2010-07-11 09:15:14.000000000 -0700 +--- ./langtools/test/tools/javac/apt.sh 2010-11-04 16:13:43.000000000 -0700 ++++ ./langtools/test/tools/javac/apt.sh 2010-06-15 22:09:06.000000000 -0700 @@ -38,7 +38,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31088,8 +31677,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-07-09 01:53:45.000000000 -0700 -+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-07-11 09:15:15.000000000 -0700 +--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-11-04 16:13:43.000000000 -0700 ++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-06-15 22:09:07.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31099,8 +31688,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-07-09 01:53:45.000000000 -0700 -+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-07-11 09:15:15.000000000 -0700 +--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-06-15 22:09:07.000000000 -0700 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31110,8 +31699,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; CYGWIN* ) ---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-07-09 01:53:47.000000000 -0700 -+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-07-11 09:15:18.000000000 -0700 +--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-06-15 22:09:09.000000000 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31121,8 +31710,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/javazip/Test.sh 2010-07-09 01:53:47.000000000 -0700 -+++ ./langtools/test/tools/javac/javazip/Test.sh 2010-07-11 09:15:18.000000000 -0700 +--- ./langtools/test/tools/javac/javazip/Test.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javac/javazip/Test.sh 2010-06-15 22:09:10.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31132,8 +31721,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" SCR=`pwd` ;; ---- ./langtools/test/tools/javac/links/links.sh 2010-07-09 01:53:47.000000000 -0700 -+++ ./langtools/test/tools/javac/links/links.sh 2010-07-11 09:15:19.000000000 -0700 +--- ./langtools/test/tools/javac/links/links.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javac/links/links.sh 2010-06-15 22:09:10.000000000 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31143,8 +31732,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ NULL=/dev/null PS=":" FS="/" ---- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-07-09 01:53:47.000000000 -0700 -+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2010-07-11 09:15:19.000000000 -0700 +--- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javac/newlines/Newlines.sh 2010-06-15 22:09:10.000000000 -0700 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31154,8 +31743,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows* ) ---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-07-09 01:53:48.000000000 -0700 -+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-07-11 09:15:21.000000000 -0700 +--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-06-15 22:09:11.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31165,8 +31754,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ FS="/" ;; Windows_95 | Windows_98 | Windows_NT ) ---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-07-09 01:53:48.000000000 -0700 -+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-07-11 09:15:22.000000000 -0700 +--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-06-15 22:09:11.000000000 -0700 @@ -66,6 +66,17 @@ exit 0; fi @@ -31185,8 +31774,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/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-07-09 01:53:48.000000000 -0700 -+++ ./langtools/test/tools/javah/6257087/foo.sh 2010-07-11 09:15:23.000000000 -0700 +--- ./langtools/test/tools/javah/6257087/foo.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javah/6257087/foo.sh 2010-06-15 22:09:12.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31196,8 +31785,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-07-09 01:53:48.000000000 -0700 -+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2010-07-11 09:15:23.000000000 -0700 +--- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javah/ConstMacroTest.sh 2010-06-15 22:09:12.000000000 -0700 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31207,8 +31796,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-07-09 01:53:48.000000000 -0700 -+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-07-11 09:15:23.000000000 -0700 +--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-06-15 22:09:12.000000000 -0700 @@ -58,7 +58,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31218,8 +31807,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javah/ReadOldClass.sh 2010-07-09 01:53:48.000000000 -0700 -+++ ./langtools/test/tools/javah/ReadOldClass.sh 2010-07-11 09:15:23.000000000 -0700 +--- ./langtools/test/tools/javah/ReadOldClass.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javah/ReadOldClass.sh 2010-06-15 22:09:12.000000000 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -31229,8 +31818,8 @@ Files /tmp/openjdk_srcdir.CMbkjJRB/openjdk/jdk/test/sun/security/pkcs11/nss/lib/ PS=":" FS="/" ;; ---- ./langtools/test/tools/javap/pathsep.sh 2010-07-09 01:53:49.000000000 -0700 -+++ ./langtools/test/tools/javap/pathsep.sh 2010-07-11 09:15:23.000000000 -0700 +--- ./langtools/test/tools/javap/pathsep.sh 2010-11-04 16:13:44.000000000 -0700 ++++ ./langtools/test/tools/javap/pathsep.sh 2010-06-15 22:09:12.000000000 -0700 @@ -40,7 +40,7 @@ # set platform-dependent variables OS=`uname -s` |