ports/145057: [PATCH] Update java/openjdk6 to b18 (latest one)
Lev A. Serebryakov
lev at FreeBSD.org
Fri Mar 26 12:40:06 UTC 2010
>Number: 145057
>Category: ports
>Synopsis: [PATCH] Update java/openjdk6 to b18 (latest one)
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 26 12:40:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Lev A. Serebryakov
>Release: FreeBSD 7.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD blob.home.serebryakov.spb.ru 7.2-STABLE FreeBSD 7.2-STABLE #0: Tue Jul 28 22:39:45 MSD 2009 lev at blob.home.serebryakov.spb.ru:/usr/home/build/world/usr/src/sys/BLOB amd64
>Description:
Update `java/openjdk6' to latest build 18.
This build fails 44 tests, but build 17 fails them too.
file/patch-set is updated to remove rejects on changed files:
jdk/src/share/transport/socket/socketTransport.c
jdk/src/solaris/native/java/util/TimeZone_md.c
and patch to
jdk/src/solaris/back/util_md.h
was added to use <stdint.h> instead of <int_*.h>.
>How-To-Repeat:
>Fix:
diff -ruN ../openjdk6.b17_2/Makefile ./Makefile
--- ../openjdk6.b17_2/Makefile 2010-03-25 22:04:58.000000000 +0300
+++ ./Makefile 2010-03-19 22:24:02.000000000 +0300
@@ -6,8 +6,8 @@
#
PORTNAME= openjdk6
-PORTVERSION= b17
-PORTREVISION= 2
+PORTVERSION= b18
+PORTREVISION= 0
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
@@ -25,7 +25,7 @@
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
-OPENJDK_BUILDDATE= 14_oct_2009
+OPENJDK_BUILDDATE= 16_feb_2010
OPTIONS= DEBUG "Enable legacy debugging support" off \
FASTDEBUG "Include fastdebug build" off \
diff -ruN ../openjdk6.b17_2/distinfo ./distinfo
--- ../openjdk6.b17_2/distinfo 2010-03-25 22:04:58.000000000 +0300
+++ ./distinfo 2010-03-19 22:24:02.000000000 +0300
@@ -1,6 +1,6 @@
-MD5 (openjdk-6-src-b17-14_oct_2009.tar.gz) = 078fe0ab744c98694decc77f2456c560
-SHA256 (openjdk-6-src-b17-14_oct_2009.tar.gz) = 2019a4c3d2d14620caa78d7df49fd987a041066b4631bde4fd8424033f3c1785
-SIZE (openjdk-6-src-b17-14_oct_2009.tar.gz) = 50029293
+MD5 (openjdk-6-src-b18-16_feb_2010.tar.gz) = 94db01691ab38f98b7d42b2ebf4d5c0b
+SHA256 (openjdk-6-src-b18-16_feb_2010.tar.gz) = 778ea7b323aaa24d3c6e8fe32b8bb0f49040d9e86271859077ada9f9ee3c8ebf
+SIZE (openjdk-6-src-b18-16_feb_2010.tar.gz) = 44216412
MD5 (apache-ant-1.7.1-bin.tar.bz2) = 9330447f3763b87570dd1118c49a8efd
SHA256 (apache-ant-1.7.1-bin.tar.bz2) = 24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97
SIZE (apache-ant-1.7.1-bin.tar.bz2) = 7641928
diff -ruN ../openjdk6.b17_2/files/patch-set ./files/patch-set
--- ../openjdk6.b17_2/files/patch-set 2010-03-25 22:21:53.000000000 +0300
+++ ./files/patch-set 2010-03-19 22:24:02.000000000 +0300
@@ -1,6 +1,6 @@
diff -uNr ../orig/Makefile ./Makefile
---- ../orig/Makefile 2009-10-14 10:12:12.000000000 -0700
-+++ ./Makefile 2009-10-22 22:37:21.000000000 -0700
+--- ../orig/Makefile 2010-02-17 06:10:08.000000000 +0300
++++ ./Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -159,6 +159,18 @@
clobber:: deploy-clobber
endif
@@ -21,8 +21,8 @@
# Generic debug build, fastdebug or debug. Needs special handling.
# Note that debug builds do NOT do INSTALL steps, but must be done
diff -uNr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.gmk
---- ../orig/corba/make/common/Defs-bsd.gmk 2009-10-22 23:07:25.000000000 -0700
-+++ ./corba/make/common/Defs-bsd.gmk 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/corba/make/common/Defs-bsd.gmk 2010-03-14 20:08:07.000000000 +0300
++++ ./corba/make/common/Defs-bsd.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -40,18 +40,12 @@
# Get shared JDK settings
include $(BUILDDIR)/common/shared/Defs.gmk
@@ -145,8 +145,8 @@
override SUN_CMM_SUBDIR =
override THREADS_FLAG = native
diff -uNr ../orig/corba/make/common/Defs-linux.gmk ./corba/make/common/Defs-linux.gmk
---- ../orig/corba/make/common/Defs-linux.gmk 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/common/Defs-linux.gmk 2009-10-28 20:01:54.000000000 -0700
+--- ../orig/corba/make/common/Defs-linux.gmk 2010-02-17 06:10:16.000000000 +0300
++++ ./corba/make/common/Defs-linux.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -282,7 +282,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
@@ -157,8 +157,8 @@
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
diff -uNr ../orig/corba/make/common/Defs.gmk ./corba/make/common/Defs.gmk
---- ../orig/corba/make/common/Defs.gmk 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/common/Defs.gmk 2009-10-28 20:01:54.000000000 -0700
+--- ../orig/corba/make/common/Defs.gmk 2010-02-17 06:10:16.000000000 +0300
++++ ./corba/make/common/Defs.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -53,6 +53,24 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -195,8 +195,8 @@
LDLIBS_COMMON += $(EXTRA_LIBS)
diff -uNr ../orig/corba/make/common/Mapfile-vers.gmk ./corba/make/common/Mapfile-vers.gmk
---- ../orig/corba/make/common/Mapfile-vers.gmk 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/common/Mapfile-vers.gmk 2009-10-28 20:01:54.000000000 -0700
+--- ../orig/corba/make/common/Mapfile-vers.gmk 2010-02-17 06:10:16.000000000 +0300
++++ ./corba/make/common/Mapfile-vers.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -77,7 +77,7 @@
endif # PLATFORM
@@ -207,8 +207,8 @@
ifeq ($(VARIANT), OPT)
# OPT build MUST have a mapfile?
diff -uNr ../orig/corba/make/common/shared/Compiler-gcc.gmk ./corba/make/common/shared/Compiler-gcc.gmk
---- ../orig/corba/make/common/shared/Compiler-gcc.gmk 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/common/shared/Compiler-gcc.gmk 2009-10-28 20:01:54.000000000 -0700
+--- ../orig/corba/make/common/shared/Compiler-gcc.gmk 2010-02-17 06:10:17.000000000 +0300
++++ ./corba/make/common/shared/Compiler-gcc.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -94,6 +94,24 @@
endif
@@ -235,8 +235,8 @@
# Settings specific to Solaris
diff -uNr ../orig/corba/make/common/shared/Compiler.gmk ./corba/make/common/shared/Compiler.gmk
---- ../orig/corba/make/common/shared/Compiler.gmk 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/common/shared/Compiler.gmk 2009-10-28 20:01:54.000000000 -0700
+--- ../orig/corba/make/common/shared/Compiler.gmk 2010-02-17 06:10:17.000000000 +0300
++++ ./corba/make/common/shared/Compiler.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -42,6 +42,11 @@
override CC_VERSION = gcc
endif
@@ -250,8 +250,8 @@
include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk
diff -uNr ../orig/corba/make/common/shared/Defs-bsd.gmk ./corba/make/common/shared/Defs-bsd.gmk
---- ../orig/corba/make/common/shared/Defs-bsd.gmk 2009-10-22 23:07:25.000000000 -0700
-+++ ./corba/make/common/shared/Defs-bsd.gmk 2009-10-28 20:01:54.000000000 -0700
+--- ../orig/corba/make/common/shared/Defs-bsd.gmk 2010-03-14 20:08:07.000000000 +0300
++++ ./corba/make/common/shared/Defs-bsd.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -54,7 +54,7 @@
endef
@@ -271,8 +271,8 @@
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
diff -uNr ../orig/corba/make/common/shared/Defs-java.gmk ./corba/make/common/shared/Defs-java.gmk
---- ../orig/corba/make/common/shared/Defs-java.gmk 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/common/shared/Defs-java.gmk 2009-10-29 20:39:14.000000000 -0700
+--- ../orig/corba/make/common/shared/Defs-java.gmk 2010-02-17 06:10:17.000000000 +0300
++++ ./corba/make/common/shared/Defs-java.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -38,7 +38,7 @@
# Suspect this may not be needed anymore.
JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
@@ -283,8 +283,8 @@
#
diff -uNr ../orig/corba/make/common/shared/Defs-utils.gmk ./corba/make/common/shared/Defs-utils.gmk
---- ../orig/corba/make/common/shared/Defs-utils.gmk 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/common/shared/Defs-utils.gmk 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/corba/make/common/shared/Defs-utils.gmk 2010-02-17 06:10:17.000000000 +0300
++++ ./corba/make/common/shared/Defs-utils.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -53,6 +53,13 @@
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
endif
@@ -333,8 +333,8 @@
+ endif
+endif
diff -uNr ../orig/corba/make/common/shared/Platform.gmk ./corba/make/common/shared/Platform.gmk
---- ../orig/corba/make/common/shared/Platform.gmk 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/common/shared/Platform.gmk 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/corba/make/common/shared/Platform.gmk 2010-02-17 06:10:17.000000000 +0300
++++ ./corba/make/common/shared/Platform.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -262,6 +262,76 @@
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
endif
@@ -438,8 +438,8 @@
MIN_VM_MEMORY := $(shell \
if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
diff -uNr ../orig/corba/make/sun/corba/core/Makefile ./corba/make/sun/corba/core/Makefile
---- ../orig/corba/make/sun/corba/core/Makefile 2009-10-14 10:12:21.000000000 -0700
-+++ ./corba/make/sun/corba/core/Makefile 2009-10-22 22:36:15.000000000 -0700
+--- ../orig/corba/make/sun/corba/core/Makefile 2010-02-17 06:10:17.000000000 +0300
++++ ./corba/make/sun/corba/core/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -53,11 +53,19 @@
ifdef STANDALONE_CORBA_WS
# FIXUP: What is this all about?
@@ -461,8 +461,8 @@
FILES_c = ioser.c
diff -uNr ../orig/hotspot/agent/make/Makefile ./hotspot/agent/make/Makefile
---- ../orig/hotspot/agent/make/Makefile 2009-10-14 10:13:08.000000000 -0700
-+++ ./hotspot/agent/make/Makefile 2009-10-22 22:36:36.000000000 -0700
+--- ../orig/hotspot/agent/make/Makefile 2010-02-17 06:10:59.000000000 +0300
++++ ./hotspot/agent/make/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -52,6 +52,9 @@
sun.jvm.hotspot.compiler \
sun.jvm.hotspot.debugger \
@@ -504,8 +504,8 @@
sun/jvm/hotspot/runtime/linux/*.java \
sun/jvm/hotspot/runtime/linux_amd64/*.java \
diff -uNr ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c
---- ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2009-10-27 12:57:11.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-03-14 20:12:55.000000000 +0300
@@ -22,6 +22,7 @@
*
*/
@@ -640,8 +640,8 @@
#endif /* amd64 */
diff -uNr ../orig/hotspot/agent/src/os/bsd/Makefile ./hotspot/agent/src/os/bsd/Makefile
---- ../orig/hotspot/agent/src/os/bsd/Makefile 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/Makefile 2009-10-22 22:36:51.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/Makefile 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -22,7 +22,7 @@
#
#
@@ -703,8 +703,8 @@
+ -rmdir $(ARCH)
diff -uNr ../orig/hotspot/agent/src/os/bsd/elfmacros.h ./hotspot/agent/src/os/bsd/elfmacros.h
---- ../orig/hotspot/agent/src/os/bsd/elfmacros.h 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/elfmacros.h 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/elfmacros.h 2010-03-14 20:12:55.000000000 +0300
@@ -25,16 +25,19 @@
#ifndef _ELFMACROS_H_
#define _ELFMACROS_H_
@@ -741,8 +741,8 @@
#endif
diff -uNr ../orig/hotspot/agent/src/os/bsd/hsearch_r.c ./hotspot/agent/src/os/bsd/hsearch_r.c
---- ../orig/hotspot/agent/src/os/bsd/hsearch_r.c 2009-10-27 23:01:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/hsearch_r.c 1970-01-01 03:00:00.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2010-03-14 20:12:55.000000000 +0300
@@ -0,0 +1,217 @@
+/* Copyright (C) 1993,1995-1997,2002,2005,2007,2008
+ Free Software Foundation, Inc.
@@ -962,8 +962,8 @@
+ return 0;
+}
diff -uNr ../orig/hotspot/agent/src/os/bsd/hsearch_r.h ./hotspot/agent/src/os/bsd/hsearch_r.h
---- ../orig/hotspot/agent/src/os/bsd/hsearch_r.h 2009-10-27 23:01:13.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/hsearch_r.h 1970-01-01 03:00:00.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2010-03-14 20:12:55.000000000 +0300
@@ -0,0 +1,42 @@
+/* Declarations for System V style searching functions.
+ Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
@@ -1008,8 +1008,8 @@
+
+#endif /* _HSEARCH_R_H_ */
diff -uNr ../orig/hotspot/agent/src/os/bsd/libproc.h ./hotspot/agent/src/os/bsd/libproc.h
---- ../orig/hotspot/agent/src/os/bsd/libproc.h 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/libproc.h 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/libproc.h 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/libproc.h 2010-03-14 20:12:55.000000000 +0300
@@ -27,7 +27,8 @@
#include <unistd.h>
@@ -1069,8 +1069,8 @@
// get number of shared objects
int get_num_libs(struct ps_prochandle* ph);
diff -uNr ../orig/hotspot/agent/src/os/bsd/libproc_impl.c ./hotspot/agent/src/os/bsd/libproc_impl.c
---- ../orig/hotspot/agent/src/os/bsd/libproc_impl.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2009-10-21 21:24:06.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/libproc_impl.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-03-14 20:12:55.000000000 +0300
@@ -177,8 +177,11 @@
newlib->symtab = build_symtab(newlib->fd);
if (newlib->symtab == NULL) {
@@ -1161,8 +1161,8 @@
}
+
diff -uNr ../orig/hotspot/agent/src/os/bsd/libproc_impl.h ./hotspot/agent/src/os/bsd/libproc_impl.h
---- ../orig/hotspot/agent/src/os/bsd/libproc_impl.h 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/libproc_impl.h 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-03-14 20:12:55.000000000 +0300
@@ -47,7 +47,7 @@
typedef struct thread_info {
lwpid_t lwp_id;
@@ -1184,8 +1184,8 @@
// the ps_prochandle
diff -uNr ../orig/hotspot/agent/src/os/bsd/mapfile ./hotspot/agent/src/os/bsd/mapfile
---- ../orig/hotspot/agent/src/os/bsd/mapfile 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/mapfile 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/mapfile 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/mapfile 2010-03-14 20:12:55.000000000 +0300
@@ -41,15 +41,21 @@
Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0;
@@ -1213,8 +1213,8 @@
# used by attach test program
init_libproc;
diff -uNr ../orig/hotspot/agent/src/os/bsd/proc_service.h ./hotspot/agent/src/os/bsd/proc_service.h
---- ../orig/hotspot/agent/src/os/bsd/proc_service.h 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/proc_service.h 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/proc_service.h 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/proc_service.h 2010-03-14 20:12:55.000000000 +0300
@@ -22,6 +22,8 @@
*
*/
@@ -1239,8 +1239,8 @@
ps_err_e ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lid, const prfpregset_t *fpregs);
diff -uNr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd/ps_core.c
---- ../orig/hotspot/agent/src/os/bsd/ps_core.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/ps_core.c 2009-10-27 12:44:09.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/ps_core.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/ps_core.c 2010-03-14 20:12:55.000000000 +0300
@@ -142,6 +142,7 @@
map->next = ph->core->class_share_maps;
@@ -1465,8 +1465,8 @@
struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
if (ph == NULL) {
diff -uNr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd/ps_proc.c
---- ../orig/hotspot/agent/src/os/bsd/ps_proc.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2009-10-27 12:42:39.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/ps_proc.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/ps_proc.c 2010-03-14 20:12:55.000000000 +0300
@@ -22,20 +22,22 @@
*
*/
@@ -1957,8 +1957,8 @@
return ph;
}
diff -uNr ../orig/hotspot/agent/src/os/bsd/salibelf.c ./hotspot/agent/src/os/bsd/salibelf.c
---- ../orig/hotspot/agent/src/os/bsd/salibelf.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/salibelf.c 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/salibelf.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/salibelf.c 2010-03-14 20:12:55.000000000 +0300
@@ -25,6 +25,7 @@
#include "salibelf.h"
#include <stdlib.h>
@@ -1968,8 +1968,8 @@
extern void print_debug(const char*,...);
diff -uNr ../orig/hotspot/agent/src/os/bsd/symtab.c ./hotspot/agent/src/os/bsd/symtab.c
---- ../orig/hotspot/agent/src/os/bsd/symtab.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/symtab.c 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/symtab.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/symtab.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,13 +23,14 @@
*/
@@ -2065,8 +2065,8 @@
}
// the symbol table
diff -uNr ../orig/hotspot/agent/src/os/bsd/test.c ./hotspot/agent/src/os/bsd/test.c
---- ../orig/hotspot/agent/src/os/bsd/test.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/os/bsd/test.c 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/os/bsd/test.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/os/bsd/test.c 2010-03-14 20:12:55.000000000 +0300
@@ -44,7 +44,7 @@
}
@@ -2077,8 +2077,8 @@
}
}
diff -uNr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
---- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-03-14 20:12:55.000000000 +0300
@@ -30,10 +30,8 @@
import sun.jvm.hotspot.debugger.cdbg.*;
import sun.jvm.hotspot.debugger.x86.*;
@@ -2105,8 +2105,8 @@
throw new DebuggerException(cpu + " is not yet supported");
}
diff -uNr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
---- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-03-14 20:12:55.000000000 +0300
@@ -26,9 +26,7 @@
import sun.jvm.hotspot.debugger.*;
@@ -2129,8 +2129,8 @@
throw new RuntimeException("cpu " + cpu + " is not yet supported");
}
diff -uNr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java
---- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2009-10-14 10:13:12.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-02-17 06:11:03.000000000 +0300
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-03-14 20:12:55.000000000 +0300
@@ -37,6 +37,8 @@
import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess;
@@ -2155,8 +2155,8 @@
if (access == null) {
diff -uNr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java
---- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-03-14 20:12:55.000000000 +0300
@@ -28,37 +28,36 @@
private static String[] signalNames = {
"", /* No signal 0 */
@@ -2218,8 +2218,8 @@
public static String getSignalName(int sigNum) {
diff -uNr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java
---- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-03-14 20:08:07.000000000 +0300
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-03-14 20:12:55.000000000 +0300
@@ -32,33 +32,32 @@
"SIGQUIT", /* quit (ASCII FS) */
"SIGILL", /* illegal instruction (not reset when caught) */
@@ -2274,8 +2274,8 @@
public static String getSignalName(int sigNum) {
diff -uNr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
---- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2009-10-14 10:13:12.000000000 -0700
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-02-17 06:11:03.000000000 +0300
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-03-14 20:12:55.000000000 +0300
@@ -37,6 +37,14 @@
return "solaris";
} else if (os.equals("Linux")) {
@@ -2292,8 +2292,8 @@
return "win32";
} else {
diff -uNr ../orig/hotspot/make/Makefile ./hotspot/make/Makefile
---- ../orig/hotspot/make/Makefile 2009-10-14 10:13:13.000000000 -0700
-+++ ./hotspot/make/Makefile 2009-10-22 22:39:44.000000000 -0700
+--- ../orig/hotspot/make/Makefile 2010-02-17 06:11:04.000000000 +0300
++++ ./hotspot/make/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -265,6 +265,19 @@
# Shared Library
@@ -2323,8 +2323,8 @@
# Jar file (sa-jdi.jar)
$(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
diff -uNr ../orig/hotspot/make/bsd/Makefile ./hotspot/make/bsd/Makefile
---- ../orig/hotspot/make/bsd/Makefile 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/Makefile 2009-10-30 20:37:39.000000000 -0700
+--- ../orig/hotspot/make/bsd/Makefile 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -203,7 +203,10 @@
# Solaris 2.5.1, 2.6).
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
@@ -2338,8 +2338,8 @@
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
diff -uNr ../orig/hotspot/make/bsd/makefiles/buildtree.make ./hotspot/make/bsd/makefiles/buildtree.make
---- ../orig/hotspot/make/bsd/makefiles/buildtree.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/buildtree.make 2009-10-22 23:09:23.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/buildtree.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/buildtree.make 2010-03-14 20:12:55.000000000 +0300
@@ -277,10 +277,11 @@
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
{ \
@@ -2354,8 +2354,8 @@
env.csh: env.sh
diff -uNr ../orig/hotspot/make/bsd/makefiles/cscope.make ./hotspot/make/bsd/makefiles/cscope.make
---- ../orig/hotspot/make/bsd/makefiles/cscope.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/cscope.make 2009-10-22 23:09:31.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/cscope.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/cscope.make 2010-03-14 20:12:55.000000000 +0300
@@ -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.
@@ -2366,8 +2366,8 @@
endif
diff -uNr ../orig/hotspot/make/bsd/makefiles/defs.make ./hotspot/make/bsd/makefiles/defs.make
---- ../orig/hotspot/make/bsd/makefiles/defs.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/defs.make 2009-10-22 23:09:40.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/defs.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/defs.make 2010-03-14 20:12:55.000000000 +0300
@@ -28,6 +28,14 @@
SLASH_JAVA ?= /java
@@ -2442,8 +2442,8 @@
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
diff -uNr ../orig/hotspot/make/bsd/makefiles/gcc.make ./hotspot/make/bsd/makefiles/gcc.make
---- ../orig/hotspot/make/bsd/makefiles/gcc.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/gcc.make 2009-10-22 23:09:50.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/gcc.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/gcc.make 2010-03-14 20:12:55.000000000 +0300
@@ -22,12 +22,15 @@
#
#
@@ -2551,8 +2551,8 @@
#------------------------------------------------------------------------
# Debug flags
diff -uNr ../orig/hotspot/make/bsd/makefiles/jsig.make ./hotspot/make/bsd/makefiles/jsig.make
---- ../orig/hotspot/make/bsd/makefiles/jsig.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/jsig.make 2009-10-22 23:10:43.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/jsig.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/jsig.make 2010-03-14 20:12:55.000000000 +0300
@@ -26,7 +26,12 @@
# libjsig[_g].so: signal interposition library
@@ -2586,8 +2586,8 @@
install_jsig: $(LIBJSIG)
@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
diff -uNr ../orig/hotspot/make/bsd/makefiles/launcher.make ./hotspot/make/bsd/makefiles/launcher.make
---- ../orig/hotspot/make/bsd/makefiles/launcher.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/launcher.make 2009-10-22 23:11:00.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/launcher.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/launcher.make 2010-03-14 20:12:55.000000000 +0300
@@ -44,7 +44,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
@@ -2598,8 +2598,8 @@
endif
diff -uNr ../orig/hotspot/make/bsd/makefiles/sa.make ./hotspot/make/bsd/makefiles/sa.make
---- ../orig/hotspot/make/bsd/makefiles/sa.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/sa.make 2009-10-22 23:11:31.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/sa.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/sa.make 2010-03-14 20:12:55.000000000 +0300
@@ -42,8 +42,8 @@
# gnumake 3.78.1 does not accept the *s that
@@ -2612,8 +2612,8 @@
SA_CLASSDIR = $(GENERATED)/saclasses
diff -uNr ../orig/hotspot/make/bsd/makefiles/saproc.make ./hotspot/make/bsd/makefiles/saproc.make
---- ../orig/hotspot/make/bsd/makefiles/saproc.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/saproc.make 2009-10-22 23:14:56.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/saproc.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/saproc.make 2010-03-14 20:12:55.000000000 +0300
@@ -26,7 +26,12 @@
# libsaproc[_g].so: serviceability agent
@@ -2681,8 +2681,8 @@
install_saproc: checkAndBuildSA
diff -uNr ../orig/hotspot/make/bsd/makefiles/vm.make ./hotspot/make/bsd/makefiles/vm.make
---- ../orig/hotspot/make/bsd/makefiles/vm.make 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/makefiles/vm.make 2009-10-22 23:15:49.000000000 -0700
+--- ../orig/hotspot/make/bsd/makefiles/vm.make 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/makefiles/vm.make 2010-03-14 20:12:55.000000000 +0300
@@ -95,7 +95,7 @@
# Extra flags from gnumake's invocation or environment
CFLAGS += $(EXTRA_CFLAGS)
@@ -2744,8 +2744,8 @@
$(QUIETLY) { \
echo Linking vm...; \
diff -uNr ../orig/hotspot/make/bsd/platform_amd64 ./hotspot/make/bsd/platform_amd64
---- ../orig/hotspot/make/bsd/platform_amd64 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/platform_amd64 2009-10-27 10:42:02.000000000 -0700
+--- ../orig/hotspot/make/bsd/platform_amd64 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/platform_amd64 2010-03-14 20:12:55.000000000 +0300
@@ -12,4 +12,6 @@
compiler = gcc
@@ -2755,8 +2755,8 @@
+
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
diff -uNr ../orig/hotspot/make/bsd/platform_i486 ./hotspot/make/bsd/platform_i486
---- ../orig/hotspot/make/bsd/platform_i486 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/make/bsd/platform_i486 2009-10-27 10:42:19.000000000 -0700
+--- ../orig/hotspot/make/bsd/platform_i486 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/make/bsd/platform_i486 2010-03-14 20:12:55.000000000 +0300
@@ -12,4 +12,6 @@
compiler = gcc
@@ -2766,8 +2766,8 @@
+
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
diff -uNr ../orig/hotspot/make/defs.make ./hotspot/make/defs.make
---- ../orig/hotspot/make/defs.make 2009-10-14 10:13:13.000000000 -0700
-+++ ./hotspot/make/defs.make 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/make/defs.make 2010-02-17 06:11:04.000000000 +0300
++++ ./hotspot/make/defs.make 2010-03-14 20:12:55.000000000 +0300
@@ -119,13 +119,23 @@
# Windows should have OS predefined
ifeq ($(OS),)
@@ -2795,8 +2795,8 @@
OSNAME=solaris
endif
diff -uNr ../orig/hotspot/make/sa.files ./hotspot/make/sa.files
---- ../orig/hotspot/make/sa.files 2009-10-14 10:13:13.000000000 -0700
-+++ ./hotspot/make/sa.files 2009-10-22 23:23:20.000000000 -0700
+--- ../orig/hotspot/make/sa.files 2010-02-17 06:11:04.000000000 +0300
++++ ./hotspot/make/sa.files 2010-03-14 20:12:55.000000000 +0300
@@ -59,6 +59,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dbx/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dummy/*.java \
@@ -2818,8 +2818,8 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \
diff -uNr ../orig/hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp ./hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp
---- ../orig/hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp 2009-10-14 10:13:14.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp 2009-10-21 21:36:22.000000000 -0700
+--- ../orig/hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp 2010-02-17 06:11:05.000000000 +0300
++++ ./hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -110,7 +110,7 @@
virtual void pass_object() {
// pass address of from
@@ -2830,8 +2830,8 @@
_from -= Interpreter::stackElementSize();
}
diff -uNr ../orig/hotspot/src/cpu/x86/vm/jni_x86.h ./hotspot/src/cpu/x86/vm/jni_x86.h
---- ../orig/hotspot/src/cpu/x86/vm/jni_x86.h 2009-10-14 10:13:14.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/cpu/x86/vm/jni_x86.h 2010-02-17 06:11:05.000000000 +0300
++++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-03-14 20:12:55.000000000 +0300
@@ -26,7 +26,7 @@
#ifndef _JAVASOFT_JNI_MD_H_
#define _JAVASOFT_JNI_MD_H_
@@ -2842,8 +2842,8 @@
#define JNIIMPORT
#define JNICALL
diff -uNr ../orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
---- ../orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2009-10-14 10:13:14.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2009-10-21 21:43:09.000000000 -0700
+--- ../orig/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2010-02-17 06:11:05.000000000 +0300
++++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -472,7 +472,7 @@
// setup rax & rdx, remove return address & clear pending exception
__ pop(rdx);
@@ -2890,8 +2890,8 @@
__ jcc(Assembler::notZero, error);
diff -uNr ../orig/hotspot/src/cpu/x86/vm/x86_32.ad ./hotspot/src/cpu/x86/vm/x86_32.ad
---- ../orig/hotspot/src/cpu/x86/vm/x86_32.ad 2009-10-14 10:13:14.000000000 -0700
-+++ ./hotspot/src/cpu/x86/vm/x86_32.ad 2009-10-21 21:47:54.000000000 -0700
+--- ../orig/hotspot/src/cpu/x86/vm/x86_32.ad 2010-02-17 06:11:05.000000000 +0300
++++ ./hotspot/src/cpu/x86/vm/x86_32.ad 2010-03-14 20:12:55.000000000 +0300
@@ -3371,7 +3371,7 @@
masm.movptr(Address(boxReg, 0), 3) ; // results in ST-before-CAS penalty
masm.get_thread (scrReg) ;
@@ -2938,8 +2938,8 @@
if (VM_Version::supports_sse2() && 1 == FenceInstruction) {
masm.mfence();
diff -uNr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/launcher/java_md.c
---- ../orig/hotspot/src/os/bsd/launcher/java_md.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/launcher/java_md.c 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os/bsd/launcher/java_md.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/launcher/java_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -45,8 +45,15 @@
#include "version_comp.h"
#endif
@@ -3051,8 +3051,8 @@
#else
if (_launcher_debug) {
diff -uNr ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp
---- ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -179,32 +179,20 @@
struct sockaddr_un addr;
addr.sun_family = AF_UNIX;
@@ -3147,8 +3147,8 @@
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
diff -uNr ../orig/hotspot/src/os/bsd/vm/hpi_bsd.cpp ./hotspot/src/os/bsd/vm/hpi_bsd.cpp
---- ../orig/hotspot/src/os/bsd/vm/hpi_bsd.cpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2009-11-03 17:19:13.000000000 -0800
+--- ../orig/hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -28,6 +28,14 @@
# include <sys/param.h>
# include <dlfcn.h>
@@ -3179,8 +3179,8 @@
*(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */
diff -uNr ../orig/hotspot/src/os/bsd/vm/hpi_bsd.hpp ./hotspot/src/os/bsd/vm/hpi_bsd.hpp
---- ../orig/hotspot/src/os/bsd/vm/hpi_bsd.hpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2009-11-03 17:19:08.000000000 -0800
+--- ../orig/hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -36,7 +36,7 @@
// HPI_FileInterface
@@ -3232,8 +3232,8 @@
diff -uNr ../orig/hotspot/src/os/bsd/vm/jsig.c ./hotspot/src/os/bsd/vm/jsig.c
---- ../orig/hotspot/src/os/bsd/vm/jsig.c 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/jsig.c 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os/bsd/vm/jsig.c 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/jsig.c 2010-03-14 20:12:55.000000000 +0300
@@ -143,7 +143,8 @@
}
@@ -3245,8 +3245,8 @@
static int call_os_sigaction(int sig, const struct sigaction *act,
diff -uNr ../orig/hotspot/src/os/bsd/vm/jvm_bsd.cpp ./hotspot/src/os/bsd/vm/jvm_bsd.cpp
---- ../orig/hotspot/src/os/bsd/vm/jvm_bsd.cpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -138,44 +138,37 @@
struct siglabel siglabels[] = {
@@ -3304,8 +3304,8 @@
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
diff -uNr ../orig/hotspot/src/os/bsd/vm/jvm_bsd.h ./hotspot/src/os/bsd/vm/jvm_bsd.h
---- ../orig/hotspot/src/os/bsd/vm/jvm_bsd.h 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os/bsd/vm/jvm_bsd.h 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-03-14 20:12:55.000000000 +0300
@@ -51,7 +51,11 @@
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
@@ -3340,8 +3340,8 @@
// Reconciliation History
diff -uNr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.cpp ./hotspot/src/os/bsd/vm/osThread_bsd.cpp
---- ../orig/hotspot/src/os/bsd/vm/osThread_bsd.cpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -28,8 +28,8 @@
void OSThread::pd_initialize() {
@@ -3354,8 +3354,8 @@
_ucontext = NULL;
_expanding_stack = 0;
diff -uNr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp ./hotspot/src/os/bsd/vm/osThread_bsd.hpp
---- ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -36,6 +36,12 @@
private:
@@ -3436,8 +3436,8 @@
// Platform dependent initialization and cleanup
// ***************************************************************
diff -uNr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_bsd.cpp
---- ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2009-11-03 17:39:29.000000000 -0800
+--- ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -42,17 +42,39 @@
# include <sys/utsname.h>
# include <sys/socket.h>
@@ -3614,8 +3614,9 @@
* ...
* 7: The default directories, normally /lib and /usr/lib.
*/
+-#define DEFAULT_LIBPATH "/lib:/usr/lib"
+#ifndef DEFAULT_LIBPATH
- #define DEFAULT_LIBPATH "/lib:/usr/lib"
++#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib:/usr/local/lib"
+#endif
#define EXTENSIONS_DIR "/lib/ext"
@@ -4844,8 +4845,8 @@
// execve failed
_exit(-1);
diff -uNr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_bsd.hpp
---- ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2009-11-03 17:12:55.000000000 -0800
+--- ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
@@ -4992,8 +4993,8 @@
// Stack repair handling
diff -uNr ../orig/hotspot/src/os/bsd/vm/os_bsd.inline.hpp ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp
---- ../orig/hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -61,7 +61,15 @@
inline bool os::allocate_stack_guard_pages() {
@@ -5119,8 +5120,8 @@
#define RESTARTABLE(_cmd, _result) do { \
diff -uNr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
---- ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2009-10-22 22:27:56.000000000 -0700
+--- ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-03-14 20:12:55.000000000 +0300
@@ -21,6 +21,22 @@
# have any questions.
#
@@ -5328,8 +5329,8 @@
pushl %ebx # 4(%esp) : old %ebx
pushl %edi # 0(%esp) : old %edi
diff -uNr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s
---- ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-03-14 20:12:55.000000000 +0300
@@ -22,48 +22,70 @@
#
@@ -5479,8 +5480,8 @@
leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8
jbe acl_CopyRight
diff -uNr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp
---- ../orig/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -22,7 +22,29 @@
*
*/
@@ -5512,8 +5513,8 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
diff -uNr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
---- ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -44,23 +44,158 @@
# include <sys/wait.h>
# include <pwd.h>
@@ -6005,8 +6006,8 @@
st->cr();
st->cr();
diff -uNr ../orig/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp
---- ../orig/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -27,8 +27,10 @@
#ifndef AMD64
// map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp
@@ -6019,8 +6020,8 @@
#endif // !AMD64
diff -uNr ../orig/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp
---- ../orig/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2009-10-22 23:07:24.000000000 -0700
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-03-14 20:08:06.000000000 +0300
++++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -31,7 +31,7 @@
/******************************/ \
/* Threads (NOTE: incomplete) */ \
@@ -6031,8 +6032,8 @@
/* This must be the last entry, and must be present */ \
last_entry()
diff -uNr ../orig/hotspot/src/share/vm/adlc/adlc.hpp ./hotspot/src/share/vm/adlc/adlc.hpp
---- ../orig/hotspot/src/share/vm/adlc/adlc.hpp 2009-10-14 10:13:17.000000000 -0700
-+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2009-10-28 20:01:53.000000000 -0700
+--- ../orig/hotspot/src/share/vm/adlc/adlc.hpp 2010-02-17 06:11:07.000000000 +0300
++++ ./hotspot/src/share/vm/adlc/adlc.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -69,9 +69,9 @@
#endif
#endif // _WIN32
@@ -6046,8 +6047,8 @@
// Macros
#define uint32 unsigned int
diff -uNr ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep ./hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
---- ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep 2009-10-14 10:13:18.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep 2009-10-22 22:30:20.000000000 -0700
+--- ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep 2010-02-17 06:11:08.000000000 +0300
++++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep 2010-03-14 20:12:55.000000000 +0300
@@ -28,6 +28,7 @@
binaryTreeDictionary.cpp binaryTreeDictionary.hpp
binaryTreeDictionary.cpp globals.hpp
@@ -6057,8 +6058,8 @@
binaryTreeDictionary.hpp freeBlockDictionary.hpp
diff -uNr ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew ./hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew
---- ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2009-10-14 10:13:18.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2010-02-17 06:11:08.000000000 +0300
++++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2010-03-14 20:12:55.000000000 +0300
@@ -30,6 +30,8 @@
asParNewGeneration.cpp cmsGCAdaptivePolicyCounters.hpp
asParNewGeneration.cpp defNewGeneration.inline.hpp
@@ -6078,8 +6079,8 @@
parCardTableModRefBS.cpp virtualspace.hpp
diff -uNr ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge ./hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
---- ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2009-10-14 10:13:18.000000000 -0700
-+++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2010-02-17 06:11:08.000000000 +0300
++++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2010-03-14 20:12:55.000000000 +0300
@@ -306,6 +306,8 @@
psPermGen.cpp psMarkSweepDecorator.hpp
psPermGen.cpp psParallelCompact.hpp
@@ -6090,8 +6091,8 @@
psPermGen.hpp psOldGen.hpp
diff -uNr ../orig/hotspot/src/share/vm/includeDB_compiler2 ./hotspot/src/share/vm/includeDB_compiler2
---- ../orig/hotspot/src/share/vm/includeDB_compiler2 2009-10-14 10:13:19.000000000 -0700
-+++ ./hotspot/src/share/vm/includeDB_compiler2 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/includeDB_compiler2 2010-02-17 06:11:09.000000000 +0300
++++ ./hotspot/src/share/vm/includeDB_compiler2 2010-03-14 20:12:55.000000000 +0300
@@ -140,6 +140,7 @@
c2_globals_<os_family>.hpp macros.hpp
@@ -6109,8 +6110,8 @@
phase.hpp port.hpp
diff -uNr ../orig/hotspot/src/share/vm/includeDB_core ./hotspot/src/share/vm/includeDB_core
---- ../orig/hotspot/src/share/vm/includeDB_core 2009-10-14 10:13:19.000000000 -0700
-+++ ./hotspot/src/share/vm/includeDB_core 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/includeDB_core 2010-02-17 06:11:09.000000000 +0300
++++ ./hotspot/src/share/vm/includeDB_core 2010-03-14 20:12:55.000000000 +0300
@@ -473,7 +473,7 @@
cardTableModRefBS.cpp java.hpp
cardTableModRefBS.cpp mutexLocker.hpp
@@ -6130,8 +6131,8 @@
instanceKlass.hpp constantPoolOop.hpp
instanceKlass.hpp handles.hpp
diff -uNr ../orig/hotspot/src/share/vm/includeDB_features ./hotspot/src/share/vm/includeDB_features
---- ../orig/hotspot/src/share/vm/includeDB_features 2009-10-14 10:13:19.000000000 -0700
-+++ ./hotspot/src/share/vm/includeDB_features 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/includeDB_features 2010-02-17 06:11:09.000000000 +0300
++++ ./hotspot/src/share/vm/includeDB_features 2010-03-14 20:12:55.000000000 +0300
@@ -59,6 +59,8 @@
dump_<arch_model>.cpp assembler_<arch>.inline.hpp
@@ -6142,8 +6143,8 @@
forte.cpp collectedHeap.inline.hpp
forte.cpp debugInfoRec.hpp
diff -uNr ../orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
---- ../orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2009-10-14 10:13:19.000000000 -0700
-+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-02-17 06:11:09.000000000 +0300
++++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -74,7 +74,7 @@
// the incoming method. We could lose a line of trace output.
// This is acceptable in a debug-only feature.
@@ -6163,8 +6164,8 @@
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
diff -uNr ../orig/hotspot/src/share/vm/prims/forte.cpp ./hotspot/src/share/vm/prims/forte.cpp
---- ../orig/hotspot/src/share/vm/prims/forte.cpp 2009-10-14 10:13:21.000000000 -0700
-+++ ./hotspot/src/share/vm/prims/forte.cpp 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/prims/forte.cpp 2010-02-17 06:11:10.000000000 +0300
++++ ./hotspot/src/share/vm/prims/forte.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -626,6 +626,11 @@
// Method to let libcollector know about a dynamically loaded function.
// Because it is weakly bound, the calls become NOP's when the library
@@ -6186,8 +6187,8 @@
} // end extern "C"
diff -uNr ../orig/hotspot/src/share/vm/runtime/globals.hpp ./hotspot/src/share/vm/runtime/globals.hpp
---- ../orig/hotspot/src/share/vm/runtime/globals.hpp 2009-10-14 10:13:21.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/globals.hpp 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/runtime/globals.hpp 2010-02-17 06:11:10.000000000 +0300
++++ ./hotspot/src/share/vm/runtime/globals.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -312,7 +312,7 @@
/* UseMembar is theoretically a temp flag used for memory barrier \
* removal testing. It was supposed to be removed before FCS but has \
@@ -6198,8 +6199,8 @@
\
product(bool, PrintCommandLineFlags, false, \
diff -uNr ../orig/hotspot/src/share/vm/runtime/os.cpp ./hotspot/src/share/vm/runtime/os.cpp
---- ../orig/hotspot/src/share/vm/runtime/os.cpp 2009-10-14 10:13:21.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/os.cpp 2009-10-27 12:31:31.000000000 -0700
+--- ../orig/hotspot/src/share/vm/runtime/os.cpp 2010-02-17 06:11:10.000000000 +0300
++++ ./hotspot/src/share/vm/runtime/os.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -80,7 +80,12 @@
return NULL;
}
@@ -6214,8 +6215,8 @@
// If daylight savings time is in effect,
// we are 1 hour East of our time zone
diff -uNr ../orig/hotspot/src/share/vm/runtime/vm_version.cpp ./hotspot/src/share/vm/runtime/vm_version.cpp
---- ../orig/hotspot/src/share/vm/runtime/vm_version.cpp 2009-10-14 10:13:21.000000000 -0700
-+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/runtime/vm_version.cpp 2010-02-17 06:11:11.000000000 +0300
++++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -140,7 +140,8 @@
#define OS LINUX_ONLY("linux") \
@@ -6227,8 +6228,8 @@
#define CPU IA32_ONLY("x86") \
IA64_ONLY("ia64") \
diff -uNr ../orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
---- ../orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2009-10-14 10:13:22.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-02-17 06:11:11.000000000 +0300
++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -71,12 +71,25 @@
# include <sys/procfs.h>
# endif
@@ -6302,8 +6303,8 @@
inline int g_isnan(double f) { return isnan(f); }
#else
diff -uNr ../orig/hotspot/src/share/vm/utilities/macros.hpp ./hotspot/src/share/vm/utilities/macros.hpp
---- ../orig/hotspot/src/share/vm/utilities/macros.hpp 2009-10-14 10:13:22.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/macros.hpp 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/utilities/macros.hpp 2010-02-17 06:11:11.000000000 +0300
++++ ./hotspot/src/share/vm/utilities/macros.hpp 2010-03-14 20:12:55.000000000 +0300
@@ -154,6 +154,16 @@
#define X86_ONLY(code)
#endif
@@ -6322,8 +6323,8 @@
#define IA32_ONLY(code) code
#define NOT_IA32(code)
diff -uNr ../orig/hotspot/src/share/vm/utilities/ostream.cpp ./hotspot/src/share/vm/utilities/ostream.cpp
---- ../orig/hotspot/src/share/vm/utilities/ostream.cpp 2009-10-14 10:13:22.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2009-10-22 22:34:33.000000000 -0700
+--- ../orig/hotspot/src/share/vm/utilities/ostream.cpp 2010-02-17 06:11:11.000000000 +0300
++++ ./hotspot/src/share/vm/utilities/ostream.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -827,7 +827,7 @@
#ifndef PRODUCT
@@ -6334,8 +6335,8 @@
#include <sys/socket.h>
#include <netinet/in.h>
diff -uNr ../orig/hotspot/src/share/vm/utilities/vmError.cpp ./hotspot/src/share/vm/utilities/vmError.cpp
---- ../orig/hotspot/src/share/vm/utilities/vmError.cpp 2009-10-14 10:13:22.000000000 -0700
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/hotspot/src/share/vm/utilities/vmError.cpp 2010-02-17 06:11:11.000000000 +0300
++++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -31,13 +31,18 @@
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
"JAVA_COMPILER", "PATH", "USERNAME",
@@ -6378,8 +6379,8 @@
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
diff -uNr ../orig/jdk/make/com/sun/java/pack/Makefile ./jdk/make/com/sun/java/pack/Makefile
---- ../orig/jdk/make/com/sun/java/pack/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/com/sun/java/pack/Makefile 2009-10-22 22:40:08.000000000 -0700
+--- ../orig/jdk/make/com/sun/java/pack/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/com/sun/java/pack/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -61,6 +61,7 @@
@@ -6412,8 +6413,8 @@
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
diff -uNr ../orig/jdk/make/com/sun/security/auth/module/Makefile ./jdk/make/com/sun/security/auth/module/Makefile
---- ../orig/jdk/make/com/sun/security/auth/module/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/com/sun/security/auth/module/Makefile 2009-10-22 22:40:28.000000000 -0700
+--- ../orig/jdk/make/com/sun/security/auth/module/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -70,7 +70,7 @@
include FILES_c_solaris.gmk
endif # solaris
@@ -6424,8 +6425,8 @@
include FILES_export_unix.gmk
include FILES_c_unix.gmk
diff -uNr ../orig/jdk/make/com/sun/tools/attach/Exportedfiles.gmk ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk
---- ../orig/jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -43,5 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
endif
@@ -6437,8 +6438,8 @@
+ sun/tools/attach/BsdVirtualMachine.java
+endif
diff -uNr ../orig/jdk/make/com/sun/tools/attach/FILES_c.gmk ./jdk/make/com/sun/tools/attach/FILES_c.gmk
---- ../orig/jdk/make/com/sun/tools/attach/FILES_c.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -39,4 +39,7 @@
LinuxVirtualMachine.c
endif
@@ -6449,8 +6450,8 @@
+ BsdVirtualMachine.c
+endif
diff -uNr ../orig/jdk/make/com/sun/tools/attach/FILES_java.gmk ./jdk/make/com/sun/tools/attach/FILES_java.gmk
---- ../orig/jdk/make/com/sun/tools/attach/FILES_java.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -43,6 +43,11 @@
sun/tools/attach/LinuxAttachProvider.java
endif
@@ -6464,8 +6465,8 @@
# Files that need to be copied
#
diff -uNr ../orig/jdk/make/com/sun/tools/attach/Makefile ./jdk/make/com/sun/tools/attach/Makefile
---- ../orig/jdk/make/com/sun/tools/attach/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/com/sun/tools/attach/Makefile 2009-10-22 22:40:37.000000000 -0700
+--- ../orig/jdk/make/com/sun/tools/attach/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/com/sun/tools/attach/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -36,6 +36,9 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
@@ -6477,8 +6478,8 @@
#
diff -uNr ../orig/jdk/make/com/sun/tools/attach/mapfile-bsd ./jdk/make/com/sun/tools/attach/mapfile-bsd
---- ../orig/jdk/make/com/sun/tools/attach/mapfile-bsd 2009-10-22 23:07:25.000000000 -0700
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/com/sun/tools/attach/mapfile-bsd 2010-03-14 20:08:07.000000000 +0300
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-03-14 20:12:55.000000000 +0300
@@ -30,14 +30,12 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -6496,8 +6497,8 @@
*;
};
diff -uNr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
---- ../orig/jdk/make/common/Defs-bsd.gmk 2009-10-22 23:07:25.000000000 -0700
-+++ ./jdk/make/common/Defs-bsd.gmk 2009-10-27 14:30:43.000000000 -0700
+--- ../orig/jdk/make/common/Defs-bsd.gmk 2010-03-14 20:08:07.000000000 +0300
++++ ./jdk/make/common/Defs-bsd.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -43,12 +43,6 @@
# Get shared JDK settings
include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
@@ -6649,8 +6650,8 @@
# Japanese manpages
#
diff -uNr ../orig/jdk/make/common/Defs-linux.gmk ./jdk/make/common/Defs-linux.gmk
---- ../orig/jdk/make/common/Defs-linux.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/Defs-linux.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/Defs-linux.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/Defs-linux.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -301,7 +301,7 @@
override LIBTHREAD =
override MOOT_PRIORITIES = true
@@ -6661,8 +6662,8 @@
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
diff -uNr ../orig/jdk/make/common/Defs.gmk ./jdk/make/common/Defs.gmk
---- ../orig/jdk/make/common/Defs.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/Defs.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/Defs.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/Defs.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -188,6 +188,24 @@
_OUTPUTDIR=$(JDK_TOPDIR)/build/$(PLATFORM)-$(ARCH)
endif
@@ -6708,8 +6709,8 @@
LDLIBS_COMMON += $(EXTRA_LIBS)
diff -uNr ../orig/jdk/make/common/Program.gmk ./jdk/make/common/Program.gmk
---- ../orig/jdk/make/common/Program.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/Program.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/Program.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/Program.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -67,11 +67,27 @@
# Create a dependency on libjli (Java Launcher Infrastructure)
#
@@ -6768,12 +6769,12 @@
OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+endif
- # this may not be necessary...
- ifeq ($(PLATFORM), windows)
+ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
+ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
diff -uNr ../orig/jdk/make/common/Release.gmk ./jdk/make/common/Release.gmk
---- ../orig/jdk/make/common/Release.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/Release.gmk 2009-10-30 09:39:14.000000000 -0700
-@@ -144,14 +144,13 @@
+--- ../orig/jdk/make/common/Release.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/Release.gmk 2010-03-14 20:12:55.000000000 +0300
+@@ -145,14 +145,13 @@
tnameserv.1 \
unpack200.1
@@ -6789,7 +6790,7 @@
extcheck.1 \
idlj.1 \
jar.1 \
-@@ -190,6 +189,11 @@
+@@ -191,6 +190,11 @@
JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
endif # linux
@@ -6801,7 +6802,7 @@
define copy-man-pages
$(MKDIR) -p $1/man/man1
for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
-@@ -322,6 +326,12 @@
+@@ -323,6 +327,12 @@
SOURCE_DIRS += $(CLOSED_SRC)/share/classes
endif
@@ -6814,7 +6815,7 @@
#
# Specific files and directories that will be filtered out from above areas.
-@@ -636,6 +646,8 @@
+@@ -637,6 +647,8 @@
$(BOOT_JAVA_CMD) -jar $(JARSPLIT_JARFILE) \
$(TOTAL_JAR_FILELIST) \
-o $(RT_JAR_FILELIST) $(RES_JAR_FILELIST)
@@ -6823,7 +6824,7 @@
@$(java-vm-cleanup)
# Create the manifest file.
-@@ -979,7 +991,7 @@
+@@ -980,7 +992,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.
@@ -6832,7 +6833,7 @@
for d in $(SOURCE_DIRS); do \
$(RM) $(ABS_TEMPDIR)/src-files.list; \
($(CD) $$d && \
-@@ -992,7 +1004,7 @@
+@@ -993,7 +1005,7 @@
done ; \
) ; \
if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \
@@ -6842,8 +6843,8 @@
fi; \
done
diff -uNr ../orig/jdk/make/common/internal/BinaryPlugs.gmk ./jdk/make/common/internal/BinaryPlugs.gmk
---- ../orig/jdk/make/common/internal/BinaryPlugs.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/internal/BinaryPlugs.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/internal/BinaryPlugs.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -49,8 +49,6 @@
com/sun/jmx/snmp/SnmpDataTypeEnums.class \
com/sun/jmx/snmp/SnmpDefinitions.class \
@@ -6934,8 +6935,8 @@
import-binary-plugs-completed
diff -uNr ../orig/jdk/make/common/shared/Compiler-gcc.gmk ./jdk/make/common/shared/Compiler-gcc.gmk
---- ../orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/shared/Compiler-gcc.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -99,6 +99,24 @@
endif
@@ -6962,8 +6963,8 @@
# Settings specific to Solaris
diff -uNr ../orig/jdk/make/common/shared/Compiler.gmk ./jdk/make/common/shared/Compiler.gmk
---- ../orig/jdk/make/common/shared/Compiler.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/shared/Compiler.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/shared/Compiler.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/shared/Compiler.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -37,8 +37,8 @@
override CC_VERSION = sun
endif
@@ -6976,8 +6977,8 @@
endif
diff -uNr ../orig/jdk/make/common/shared/Defs-bsd.gmk ./jdk/make/common/shared/Defs-bsd.gmk
---- ../orig/jdk/make/common/shared/Defs-bsd.gmk 2009-10-22 23:07:25.000000000 -0700
-+++ ./jdk/make/common/shared/Defs-bsd.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/shared/Defs-bsd.gmk 2010-03-14 20:08:07.000000000 +0300
++++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -70,7 +70,7 @@
endef
@@ -7017,8 +7018,8 @@
# imported (or copied from) these import areas when needed.
diff -uNr ../orig/jdk/make/common/shared/Defs-java.gmk ./jdk/make/common/shared/Defs-java.gmk
---- ../orig/jdk/make/common/shared/Defs-java.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/shared/Defs-java.gmk 2009-10-29 20:39:14.000000000 -0700
+--- ../orig/jdk/make/common/shared/Defs-java.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/shared/Defs-java.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -42,7 +42,7 @@
# Suspect this may not be needed anymore.
JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
@@ -7029,8 +7030,8 @@
#
diff -uNr ../orig/jdk/make/common/shared/Defs-utils.gmk ./jdk/make/common/shared/Defs-utils.gmk
---- ../orig/jdk/make/common/shared/Defs-utils.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/shared/Defs-utils.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/shared/Defs-utils.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/shared/Defs-utils.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -80,6 +80,13 @@
endif
endif
@@ -7079,8 +7080,8 @@
+ endif
+endif
diff -uNr ../orig/jdk/make/common/shared/Defs.gmk ./jdk/make/common/shared/Defs.gmk
---- ../orig/jdk/make/common/shared/Defs.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/shared/Defs.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/shared/Defs.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/shared/Defs.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -143,7 +143,7 @@
echo older; \
else \
@@ -7091,8 +7092,8 @@
else \
echo newer; \
diff -uNr ../orig/jdk/make/common/shared/Platform.gmk ./jdk/make/common/shared/Platform.gmk
---- ../orig/jdk/make/common/shared/Platform.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/shared/Platform.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/shared/Platform.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/shared/Platform.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -276,6 +276,76 @@
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
endif
@@ -7210,8 +7211,8 @@
_USER1:=$(subst ', ,$(_USER))
_USER2:=$(subst ", ,$(_USER1))
diff -uNr ../orig/jdk/make/common/shared/Sanity-Settings.gmk ./jdk/make/common/shared/Sanity-Settings.gmk
---- ../orig/jdk/make/common/shared/Sanity-Settings.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/shared/Sanity-Settings.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/shared/Sanity-Settings.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -255,6 +255,7 @@
ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
@@ -7221,8 +7222,8 @@
ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_PATH)
diff -uNr ../orig/jdk/make/common/shared/Sanity.gmk ./jdk/make/common/shared/Sanity.gmk
---- ../orig/jdk/make/common/shared/Sanity.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/common/shared/Sanity.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/common/shared/Sanity.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/common/shared/Sanity.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -96,6 +96,11 @@
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
endif
@@ -7236,9 +7237,9 @@
_MAKE_VER :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1)
_ZIP_VER :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
diff -uNr ../orig/jdk/make/docs/Makefile ./jdk/make/docs/Makefile
---- ../orig/jdk/make/docs/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/docs/Makefile 2009-10-22 22:40:45.000000000 -0700
-@@ -232,7 +232,7 @@
+--- ../orig/jdk/make/docs/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/docs/Makefile 2010-03-14 20:12:55.000000000 +0300
+@@ -233,7 +233,7 @@
# you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR)
# being interpreted as an end of command (newline)
@@ -7248,8 +7249,8 @@
JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \
-encoding ascii \
diff -uNr ../orig/jdk/make/java/Makefile ./jdk/make/java/Makefile
---- ../orig/jdk/make/java/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/Makefile 2009-10-22 22:40:56.000000000 -0700
+--- ../orig/jdk/make/java/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -49,7 +49,7 @@
endif
endif # PLATFORM
@@ -7260,8 +7261,8 @@
endif # PLATFORM
diff -uNr ../orig/jdk/make/java/hpi/hpi_common.gmk ./jdk/make/java/hpi/hpi_common.gmk
---- ../orig/jdk/make/java/hpi/hpi_common.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/hpi/hpi_common.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/java/hpi/hpi_common.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/hpi/hpi_common.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -86,5 +86,9 @@
# Things that must be linked in.
#
@@ -7273,8 +7274,8 @@
endif
+endif
diff -uNr ../orig/jdk/make/java/hpi/native/Makefile ./jdk/make/java/hpi/native/Makefile
---- ../orig/jdk/make/java/hpi/native/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/hpi/native/Makefile 2009-10-22 22:41:04.000000000 -0700
+--- ../orig/jdk/make/java/hpi/native/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/hpi/native/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -72,11 +72,18 @@
ifeq ($(MOOT_PRIORITIES),true)
OTHER_CPPFLAGS += -DMOOT_PRIORITIES
@@ -7295,8 +7296,8 @@
OTHER_CPPFLAGS += -DHAVE_GETHRVTIME
endif
diff -uNr ../orig/jdk/make/java/instrument/Makefile ./jdk/make/java/instrument/Makefile
---- ../orig/jdk/make/java/instrument/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/instrument/Makefile 2009-10-22 22:41:09.000000000 -0700
+--- ../orig/jdk/make/java/instrument/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/instrument/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -102,6 +102,21 @@
# equivalent of strcasecmp is stricmp on Windows
CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
@@ -7328,8 +7329,8 @@
#
# Library to compile.
diff -uNr ../orig/jdk/make/java/java/Makefile ./jdk/make/java/java/Makefile
---- ../orig/jdk/make/java/java/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/java/Makefile 2009-10-22 22:41:16.000000000 -0700
+--- ../orig/jdk/make/java/java/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/java/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -167,8 +167,10 @@
# Is the altzone extern documented in ctime(3C) available?
#
@@ -7357,8 +7358,8 @@
#
# Rules.
diff -uNr ../orig/jdk/make/java/java/genlocales.gmk ./jdk/make/java/java/genlocales.gmk
---- ../orig/jdk/make/java/java/genlocales.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/java/genlocales.gmk 2009-11-04 09:30:45.000000000 -0800
+--- ../orig/jdk/make/java/java/genlocales.gmk 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/java/genlocales.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -7389,8 +7390,8 @@
@$(RM) $@.tmp.euro $@.tmp.noneuro;
diff -uNr ../orig/jdk/make/java/java/localegen.sh ./jdk/make/java/java/localegen.sh
---- ../orig/jdk/make/java/java/localegen.sh 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/java/localegen.sh 2009-11-04 09:34:06.000000000 -0800
+--- ../orig/jdk/make/java/java/localegen.sh 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/java/localegen.sh 2010-03-14 20:12:55.000000000 +0300
@@ -1,7 +1,7 @@
#!/bin/sh
@@ -7431,8 +7432,8 @@
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
diff -uNr ../orig/jdk/make/java/java_hprof_demo/Makefile ./jdk/make/java/java_hprof_demo/Makefile
---- ../orig/jdk/make/java/java_hprof_demo/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/java_hprof_demo/Makefile 2009-10-22 22:41:26.000000000 -0700
+--- ../orig/jdk/make/java/java_hprof_demo/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/java_hprof_demo/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -83,8 +83,10 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS += wsock32.lib winmm.lib
@@ -7445,8 +7446,8 @@
#
# Tell library.gmk to copy the txt file first
diff -uNr ../orig/jdk/make/java/jli/Makefile ./jdk/make/java/jli/Makefile
---- ../orig/jdk/make/java/jli/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/jli/Makefile 2009-10-22 22:41:33.000000000 -0700
+--- ../orig/jdk/make/java/jli/Makefile 2010-02-17 06:14:12.000000000 +0300
++++ ./jdk/make/java/jli/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -44,8 +44,10 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -7523,8 +7524,8 @@
+
diff -uNr ../orig/jdk/make/java/management/Makefile ./jdk/make/java/management/Makefile
---- ../orig/jdk/make/java/management/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/management/Makefile 2009-10-22 22:41:37.000000000 -0700
+--- ../orig/jdk/make/java/management/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/management/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -85,6 +85,11 @@
OTHER_INCLUDES += \
-I$(SHARE_SRC)/native/sun/management
@@ -7538,8 +7539,8 @@
OTHER_LDLIBS += $(JVMLIB)
endif
diff -uNr ../orig/jdk/make/java/net/FILES_c.gmk ./jdk/make/java/net/FILES_c.gmk
---- ../orig/jdk/make/java/net/FILES_c.gmk 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/net/FILES_c.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/java/net/FILES_c.gmk 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/net/FILES_c.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -43,6 +43,10 @@
FILES_c += linux_close.c
endif
@@ -7552,8 +7553,8 @@
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
diff -uNr ../orig/jdk/make/java/net/Makefile ./jdk/make/java/net/Makefile
---- ../orig/jdk/make/java/net/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/net/Makefile 2009-10-22 22:41:44.000000000 -0700
+--- ../orig/jdk/make/java/net/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/net/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -92,6 +92,12 @@
include $(BUILDDIR)/common/Library.gmk
@@ -7576,8 +7577,8 @@
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
diff -uNr ../orig/jdk/make/java/nio/Makefile ./jdk/make/java/nio/Makefile
---- ../orig/jdk/make/java/nio/Makefile 2009-10-14 10:17:14.000000000 -0700
-+++ ./jdk/make/java/nio/Makefile 2009-10-22 22:41:52.000000000 -0700
+--- ../orig/jdk/make/java/nio/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/nio/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -82,7 +82,7 @@
sun/nio/ch/WindowsSelectorImpl.java
endif # PLATFORM = windows
@@ -7620,8 +7621,8 @@
include $(BUILDDIR)/common/Library.gmk
diff -uNr ../orig/jdk/make/java/npt/Makefile ./jdk/make/java/npt/Makefile
---- ../orig/jdk/make/java/npt/Makefile 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/java/npt/Makefile 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/java/npt/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/npt/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -70,6 +70,18 @@
OTHER_LCF += -export:nptInitialize -export:nptTerminate
endif
@@ -7642,8 +7643,8 @@
# Add to ambient vpath so we pick up the library files
#
diff -uNr ../orig/jdk/make/java/redist/FILES.gmk ./jdk/make/java/redist/FILES.gmk
---- ../orig/jdk/make/java/redist/FILES.gmk 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/java/redist/FILES.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/java/redist/FILES.gmk 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/redist/FILES.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -38,6 +38,14 @@
$(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
@@ -7660,8 +7661,8 @@
# The oblique versions of the font are derived from the base versions
# and since 2D can do this derivation on the fly at run time there is no
diff -uNr ../orig/jdk/make/java/redist/Makefile ./jdk/make/java/redist/Makefile
---- ../orig/jdk/make/java/redist/Makefile 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/java/redist/Makefile 2009-10-22 22:41:58.000000000 -0700
+--- ../orig/jdk/make/java/redist/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/redist/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -312,7 +312,7 @@
$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
$(install-file)
@@ -7681,8 +7682,8 @@
# Import internal files (ones that are stashed in this source tree)
diff -uNr ../orig/jdk/make/java/security/Makefile ./jdk/make/java/security/Makefile
---- ../orig/jdk/make/java/security/Makefile 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/java/security/Makefile 2009-10-22 22:42:05.000000000 -0700
+--- ../orig/jdk/make/java/security/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/security/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -51,7 +51,15 @@
ifneq ($(ARCH_DATA_MODEL), 64)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
@@ -7700,8 +7701,8 @@
diff -uNr ../orig/jdk/make/java/zip/FILES_c.gmk ./jdk/make/java/zip/FILES_c.gmk
---- ../orig/jdk/make/java/zip/FILES_c.gmk 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/java/zip/FILES_c.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/java/zip/FILES_c.gmk 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/zip/FILES_c.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -30,6 +30,10 @@
Inflater.c \
ZipFile.c \
@@ -7722,8 +7723,8 @@
+ inffast.c
+endif
diff -uNr ../orig/jdk/make/java/zip/Makefile ./jdk/make/java/zip/Makefile
---- ../orig/jdk/make/java/zip/Makefile 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/java/zip/Makefile 2009-10-22 22:42:10.000000000 -0700
+--- ../orig/jdk/make/java/zip/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/java/zip/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -72,16 +72,24 @@
CPPFLAGS += -UDEBUG
endif
@@ -7750,9 +7751,21 @@
OTHER_LDLIBS = $(JVMLIB)
+endif
+
+diff -uNr ../orig/jdk/make/javax/crypto/Makefile ./jdk/make/javax/crypto/Makefile
+--- ../orig/jdk/make/javax/crypto/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/javax/crypto/Makefile 2010-03-14 20:12:55.000000000 +0300
+@@ -155,7 +155,7 @@
+ #
+
+ ifdef OPENJDK
+-all: build-jar install-jar build-policy install-limited
++all: build-jar install-jar build-policy install-unlimited
+ else # OPENJDK
+ ifeq ($(strip $(FILES_java)),)
+ all:
diff -uNr ../orig/jdk/make/javax/sound/FILES_c.gmk ./jdk/make/javax/sound/FILES_c.gmk
---- ../orig/jdk/make/javax/sound/FILES_c.gmk 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/javax/sound/FILES_c.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/javax/sound/FILES_c.gmk 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/javax/sound/FILES_c.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -34,6 +34,8 @@
FILES_linux =
@@ -7763,8 +7776,8 @@
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
diff -uNr ../orig/jdk/make/javax/sound/Makefile ./jdk/make/javax/sound/Makefile
---- ../orig/jdk/make/javax/sound/Makefile 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/javax/sound/Makefile 2009-10-22 22:42:17.000000000 -0700
+--- ../orig/jdk/make/javax/sound/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/javax/sound/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -107,6 +107,19 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
@@ -7786,8 +7799,8 @@
ifneq ($(ARCH), amd64)
# build with ports and direct audio
diff -uNr ../orig/jdk/make/javax/sound/SoundDefs.gmk ./jdk/make/javax/sound/SoundDefs.gmk
---- ../orig/jdk/make/javax/sound/SoundDefs.gmk 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/javax/sound/SoundDefs.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/javax/sound/SoundDefs.gmk 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
endif # PLATFORM linux
@@ -7800,8 +7813,8 @@
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
diff -uNr ../orig/jdk/make/jpda/back/Makefile ./jdk/make/jpda/back/Makefile
---- ../orig/jdk/make/jpda/back/Makefile 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/jpda/back/Makefile 2009-10-22 22:42:26.000000000 -0700
+--- ../orig/jdk/make/jpda/back/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/jpda/back/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -49,8 +49,10 @@
-I$(GENNATIVESRCDIR)/jdwp
@@ -7814,8 +7827,8 @@
#
# This turns off all assert() checking in the optimized library
diff -uNr ../orig/jdk/make/sun/awt/Makefile ./jdk/make/sun/awt/Makefile
---- ../orig/jdk/make/sun/awt/Makefile 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/sun/awt/Makefile 2009-10-22 22:43:07.000000000 -0700
+--- ../orig/jdk/make/sun/awt/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/sun/awt/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -129,6 +129,14 @@
OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
endif
@@ -7886,8 +7899,8 @@
endif
diff -uNr ../orig/jdk/make/sun/awt/mawt.gmk ./jdk/make/sun/awt/mawt.gmk
---- ../orig/jdk/make/sun/awt/mawt.gmk 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/sun/awt/mawt.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/sun/awt/mawt.gmk 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/sun/awt/mawt.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -174,7 +174,7 @@
OTHER_LDLIBS = $(LIBXM) -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
endif
@@ -7945,8 +7958,8 @@
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
diff -uNr ../orig/jdk/make/sun/font/Makefile ./jdk/make/sun/font/Makefile
---- ../orig/jdk/make/sun/font/Makefile 2009-10-14 10:17:15.000000000 -0700
-+++ ./jdk/make/sun/font/Makefile 2009-10-22 22:43:11.000000000 -0700
+--- ../orig/jdk/make/sun/font/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/sun/font/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -177,6 +177,15 @@
# Libraries to link, and other C flags.
#
@@ -7972,8 +7985,8 @@
endif # PLATFORM
diff -uNr ../orig/jdk/make/sun/image/generic/Makefile ./jdk/make/sun/image/generic/Makefile
---- ../orig/jdk/make/sun/image/generic/Makefile 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/sun/image/generic/Makefile 2009-10-22 22:43:17.000000000 -0700
+--- ../orig/jdk/make/sun/image/generic/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/sun/image/generic/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -69,5 +69,9 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib
@@ -7986,8 +7999,8 @@
+
diff -uNr ../orig/jdk/make/sun/jawt/Makefile ./jdk/make/sun/jawt/Makefile
---- ../orig/jdk/make/sun/jawt/Makefile 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/sun/jawt/Makefile 2009-10-22 22:43:25.000000000 -0700
+--- ../orig/jdk/make/sun/jawt/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/sun/jawt/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -98,9 +98,7 @@
#
# Other extra flags needed for compiling.
@@ -8018,8 +8031,8 @@
endif # PLATFORM
diff -uNr ../orig/jdk/make/sun/security/jgss/wrapper/Makefile ./jdk/make/sun/security/jgss/wrapper/Makefile
---- ../orig/jdk/make/sun/security/jgss/wrapper/Makefile 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2009-10-22 22:43:35.000000000 -0700
+--- ../orig/jdk/make/sun/security/jgss/wrapper/Makefile 2010-02-17 06:14:13.000000000 +0300
++++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -71,6 +71,10 @@
#
# Libraries to link
@@ -8033,8 +8046,8 @@
+ OTHER_LDLIBS = $(JVMLIB)
+endif
diff -uNr ../orig/jdk/make/sun/security/pkcs11/Makefile ./jdk/make/sun/security/pkcs11/Makefile
---- ../orig/jdk/make/sun/security/pkcs11/Makefile 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/sun/security/pkcs11/Makefile 2009-10-22 22:43:41.000000000 -0700
+--- ../orig/jdk/make/sun/security/pkcs11/Makefile 2010-02-17 06:14:14.000000000 +0300
++++ ./jdk/make/sun/security/pkcs11/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -155,7 +155,7 @@
#
# Libraries to link
@@ -8045,8 +8058,8 @@
else
OTHER_LDLIBS = -ldl $(JVMLIB)
diff -uNr ../orig/jdk/make/sun/security/smartcardio/Makefile ./jdk/make/sun/security/smartcardio/Makefile
---- ../orig/jdk/make/sun/security/smartcardio/Makefile 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/sun/security/smartcardio/Makefile 2009-10-22 22:43:46.000000000 -0700
+--- ../orig/jdk/make/sun/security/smartcardio/Makefile 2010-02-17 06:14:14.000000000 +0300
++++ ./jdk/make/sun/security/smartcardio/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -75,6 +75,10 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = $(JVMLIB) winscard.lib
@@ -8060,8 +8073,8 @@
OTHER_CFLAGS = -D__sun_jdk
endif
diff -uNr ../orig/jdk/make/sun/splashscreen/FILES_c.gmk ./jdk/make/sun/splashscreen/FILES_c.gmk
---- ../orig/jdk/make/sun/splashscreen/FILES_c.gmk 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/make/sun/splashscreen/FILES_c.gmk 2010-02-17 06:14:14.000000000 +0300
++++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-03-14 20:12:55.000000000 +0300
@@ -49,20 +49,6 @@
dgif_lib.c \
gif_err.c \
@@ -8105,8 +8118,8 @@
+ zutil.c
+endif
diff -uNr ../orig/jdk/make/sun/splashscreen/Makefile ./jdk/make/sun/splashscreen/Makefile
---- ../orig/jdk/make/sun/splashscreen/Makefile 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/sun/splashscreen/Makefile 2009-10-22 22:43:58.000000000 -0700
+--- ../orig/jdk/make/sun/splashscreen/Makefile 2010-02-17 06:14:14.000000000 +0300
++++ ./jdk/make/sun/splashscreen/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -61,10 +61,26 @@
CFLAGS += -DSPLASHSCREEN
@@ -8155,8 +8168,8 @@
ifeq ($(ARCH_DATA_MODEL), 64)
# 64-bit gcc has problems compiling MMX instructions.
diff -uNr ../orig/jdk/make/sun/xawt/Makefile ./jdk/make/sun/xawt/Makefile
---- ../orig/jdk/make/sun/xawt/Makefile 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/sun/xawt/Makefile 2009-10-22 22:44:03.000000000 -0700
+--- ../orig/jdk/make/sun/xawt/Makefile 2010-02-17 06:14:14.000000000 +0300
++++ ./jdk/make/sun/xawt/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -53,6 +53,11 @@
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif
@@ -8221,8 +8234,8 @@
CPPFLAGS += -DINTERNAL_BUILD
endif
diff -uNr ../orig/jdk/make/tools/freetypecheck/Makefile ./jdk/make/tools/freetypecheck/Makefile
---- ../orig/jdk/make/tools/freetypecheck/Makefile 2009-10-14 10:17:16.000000000 -0700
-+++ ./jdk/make/tools/freetypecheck/Makefile 2009-10-22 22:44:11.000000000 -0700
+--- ../orig/jdk/make/tools/freetypecheck/Makefile 2010-02-17 06:14:14.000000000 +0300
++++ ./jdk/make/tools/freetypecheck/Makefile 2010-03-14 20:12:55.000000000 +0300
@@ -60,8 +60,12 @@
#add runtime lib search path to ensure test will be runnable
ifeq ($(PLATFORM), solaris)
@@ -8239,8 +8252,8 @@
endif
diff -uNr ../orig/jdk/src/share/back/commonRef.c ./jdk/src/share/back/commonRef.c
---- ../orig/jdk/src/share/back/commonRef.c 2009-10-14 10:17:18.000000000 -0700
-+++ ./jdk/src/share/back/commonRef.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/back/commonRef.c 2010-02-17 06:14:15.000000000 +0300
++++ ./jdk/src/share/back/commonRef.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,6 +23,10 @@
* have any questions.
*/
@@ -8253,8 +8266,8 @@
#include "commonRef.h"
diff -uNr ../orig/jdk/src/share/bin/java.c ./jdk/src/share/bin/java.c
---- ../orig/jdk/src/share/bin/java.c 2009-10-14 10:17:18.000000000 -0700
-+++ ./jdk/src/share/bin/java.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/bin/java.c 2010-02-17 06:14:15.000000000 +0300
++++ ./jdk/src/share/bin/java.c 2010-03-14 20:12:55.000000000 +0300
@@ -104,6 +104,11 @@
static char *launchername;
jboolean _launcher_debug = JNI_FALSE;
@@ -8450,8 +8463,8 @@
FreeKnownVMs()
{
diff -uNr ../orig/jdk/src/share/bin/java.h ./jdk/src/share/bin/java.h
---- ../orig/jdk/src/share/bin/java.h 2009-10-14 10:17:18.000000000 -0700
-+++ ./jdk/src/share/bin/java.h 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/bin/java.h 2010-02-17 06:14:15.000000000 +0300
++++ ./jdk/src/share/bin/java.h 2010-03-14 20:12:55.000000000 +0300
@@ -91,11 +91,17 @@
void PrintMachineDependentOptions();
@@ -8473,8 +8486,8 @@
/* sun.java.launcher.* platform properties. */
void SetJavaLauncherPlatformProps(void);
diff -uNr ../orig/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
---- ../orig/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2009-10-14 10:17:19.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-02-17 06:14:16.000000000 +0300
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-03-14 20:12:55.000000000 +0300
@@ -477,6 +477,10 @@
String[] dirs = new String[] {
userHome + sep + ".themes",
@@ -8487,8 +8500,8 @@
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
diff -uNr ../orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
---- ../orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2009-10-14 10:17:20.000000000 -0700
-+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-02-17 06:14:17.000000000 +0300
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-03-14 20:12:55.000000000 +0300
@@ -78,6 +78,9 @@
*/
public long timeStamp ;
@@ -8500,8 +8513,8 @@
/**
diff -uNr ../orig/jdk/src/share/classes/java/awt/Font.java ./jdk/src/share/classes/java/awt/Font.java
---- ../orig/jdk/src/share/classes/java/awt/Font.java 2009-10-14 10:17:25.000000000 -0700
-+++ ./jdk/src/share/classes/java/awt/Font.java 2009-11-02 17:34:53.000000000 -0800
+--- ../orig/jdk/src/share/classes/java/awt/Font.java 2010-02-17 06:14:21.000000000 +0300
++++ ./jdk/src/share/classes/java/awt/Font.java 2010-03-14 20:12:55.000000000 +0300
@@ -445,18 +445,19 @@
*/
private AttributeValues getAttributeValues() {
@@ -8529,8 +8542,8 @@
return values;
diff -uNr ../orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java
---- ../orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-10-14 10:17:25.000000000 -0700
-+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-02-17 06:14:21.000000000 +0300
++++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-03-14 20:12:55.000000000 +0300
@@ -148,7 +148,12 @@
} else {
String osName = System.getProperty("os.name");
@@ -8546,9 +8559,9 @@
}
} else if (nm.equals("true")) {
diff -uNr ../orig/jdk/src/share/classes/java/util/TimeZone.java ./jdk/src/share/classes/java/util/TimeZone.java
---- ../orig/jdk/src/share/classes/java/util/TimeZone.java 2009-10-14 10:17:30.000000000 -0700
-+++ ./jdk/src/share/classes/java/util/TimeZone.java 2009-10-28 20:01:49.000000000 -0700
-@@ -779,15 +779,13 @@
+--- ../orig/jdk/src/share/classes/java/util/TimeZone.java 2010-02-17 06:14:25.000000000 +0300
++++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-03-14 20:12:55.000000000 +0300
+@@ -776,15 +776,13 @@
}
int gmtOffset = (hours * 60 + num) * 60 * 1000;
@@ -8566,8 +8579,8 @@
return zi;
}
diff -uNr ../orig/jdk/src/share/classes/sun/awt/FontConfiguration.java ./jdk/src/share/classes/sun/awt/FontConfiguration.java
---- ../orig/jdk/src/share/classes/sun/awt/FontConfiguration.java 2009-10-14 10:17:37.000000000 -0700
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-02-17 06:14:31.000000000 +0300
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-03-14 20:12:55.000000000 +0300
@@ -1073,7 +1073,7 @@
*/
HashMap<String, Boolean> existsMap;
@@ -8587,8 +8600,8 @@
}
}
diff -uNr ../orig/jdk/src/share/classes/sun/font/TrueTypeFont.java ./jdk/src/share/classes/sun/font/TrueTypeFont.java
---- ../orig/jdk/src/share/classes/sun/font/TrueTypeFont.java 2009-10-14 10:17:38.000000000 -0700
-+++ ./jdk/src/share/classes/sun/font/TrueTypeFont.java 2009-11-02 17:35:36.000000000 -0800
+--- ../orig/jdk/src/share/classes/sun/font/TrueTypeFont.java 2010-02-17 06:14:31.000000000 +0300
++++ ./jdk/src/share/classes/sun/font/TrueTypeFont.java 2010-03-14 20:12:55.000000000 +0300
@@ -159,6 +159,13 @@
private boolean supportsJA;
private boolean supportsCJK;
@@ -8700,8 +8713,8 @@
return name;
}
diff -uNr ../orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java ./jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java
---- ../orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-10-14 10:17:39.000000000 -0700
-+++ ./jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2010-02-17 06:14:32.000000000 +0300
++++ ./jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2010-03-14 20:12:55.000000000 +0300
@@ -76,7 +76,7 @@
public abstract class SunGraphicsEnvironment extends GraphicsEnvironment
implements FontSupport, DisplayChangedListener {
@@ -8740,8 +8753,8 @@
}
registerFontsInDir(jreFontDirName, true, Font2D.JRE_RANK,
diff -uNr ../orig/jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java ./jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java
---- ../orig/jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java 2009-10-14 10:17:40.000000000 -0700
-+++ ./jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java 2009-11-02 17:39:03.000000000 -0800
+--- ../orig/jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java 2010-02-17 06:14:32.000000000 +0300
++++ ./jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java 2010-03-14 20:12:55.000000000 +0300
@@ -96,7 +96,7 @@
bboxX1 = x1+1;
} else {
@@ -8752,8 +8765,8 @@
reallocRowInfo(alphaRows+1);
minTouched[alphaRows] = 0;
diff -uNr ../orig/jdk/src/share/classes/sun/print/PSPrinterJob.java ./jdk/src/share/classes/sun/print/PSPrinterJob.java
---- ../orig/jdk/src/share/classes/sun/print/PSPrinterJob.java 2009-10-14 10:17:44.000000000 -0700
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-02-17 06:14:36.000000000 +0300
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-03-14 20:12:55.000000000 +0300
@@ -1531,7 +1531,9 @@
pFlags |= NOSHEET;
ncomps+=1;
@@ -8766,8 +8779,8 @@
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
diff -uNr ../orig/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
---- ../orig/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2009-10-14 10:17:45.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2009-10-29 20:27:08.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2010-02-17 06:14:37.000000000 +0300
++++ ./jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2010-03-14 20:12:55.000000000 +0300
@@ -49,8 +49,12 @@
AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
public Boolean run() {
@@ -8784,8 +8797,8 @@
(USE_NATIVE_PROP));
}
diff -uNr ../orig/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
---- ../orig/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2009-10-14 10:17:45.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2009-10-29 20:27:08.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-02-17 06:14:37.000000000 +0300
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-03-14 20:12:55.000000000 +0300
@@ -82,7 +82,11 @@
String osname = System.getProperty("os.name");
if (osname.startsWith("SunOS")) {
@@ -8800,8 +8813,8 @@
}
}
diff -uNr ../orig/jdk/src/share/classes/sun/security/krb5/Config.java ./jdk/src/share/classes/sun/security/krb5/Config.java
---- ../orig/jdk/src/share/classes/sun/security/krb5/Config.java 2009-10-14 10:17:45.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/krb5/Config.java 2009-10-29 20:27:08.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/security/krb5/Config.java 2010-02-17 06:14:37.000000000 +0300
++++ ./jdk/src/share/classes/sun/security/krb5/Config.java 2010-03-14 20:12:55.000000000 +0300
@@ -711,7 +711,11 @@
}
} else if (osname.startsWith("SunOS")) {
@@ -8816,8 +8829,8 @@
}
}
diff -uNr ../orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java ./jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
---- ../orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2009-10-14 10:17:46.000000000 -0700
-+++ ./jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2009-10-29 20:27:08.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2010-02-17 06:14:37.000000000 +0300
++++ ./jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2010-03-14 20:12:55.000000000 +0300
@@ -383,8 +383,12 @@
String uidStr = null;
long uid = 0;
@@ -8834,16 +8847,16 @@
Class<?> c = Class.forName
("com.sun.security.auth.module.UnixSystem");
diff -uNr ../orig/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider
---- ../orig/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2009-10-14 10:17:48.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-02-17 06:14:40.000000000 +0300
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-03-14 20:12:55.000000000 +0300
@@ -30,3 +30,4 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[bsd]sun.tools.attach.BsdAttachProvider
diff -uNr ../orig/jdk/src/share/classes/sun/tools/jar/Main.java ./jdk/src/share/classes/sun/tools/jar/Main.java
---- ../orig/jdk/src/share/classes/sun/tools/jar/Main.java 2009-10-14 10:17:48.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2009-10-28 20:36:56.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/tools/jar/Main.java 2010-02-17 06:14:40.000000000 +0300
++++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-03-14 20:12:55.000000000 +0300
@@ -48,6 +48,7 @@
String zname = "";
String[] files;
@@ -8892,8 +8905,8 @@
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
diff -uNr ../orig/jdk/src/share/classes/sun/tools/jar/resources/jar.properties ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties
---- ../orig/jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2009-10-14 10:17:48.000000000 -0700
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-02-17 06:14:40.000000000 +0300
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-03-14 20:12:55.000000000 +0300
@@ -44,6 +44,8 @@
{0} : could not create directory
error.incorrect.length=\
@@ -8904,8 +8917,8 @@
added manifest
out.update.manifest=\
diff -uNr ../orig/jdk/src/share/hpi/include/hpi_impl.h ./jdk/src/share/hpi/include/hpi_impl.h
---- ../orig/jdk/src/share/hpi/include/hpi_impl.h 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/hpi/include/hpi_impl.h 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/hpi/include/hpi_impl.h 2010-02-17 06:14:42.000000000 +0300
++++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-03-14 20:12:55.000000000 +0300
@@ -138,7 +138,11 @@
int sysBind(int fd, struct sockaddr *him, int len);
int sysAccept(int fd, struct sockaddr *him, int *len);
@@ -8920,8 +8933,8 @@
int tolen);
ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags,
diff -uNr ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
---- ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-03-14 20:12:55.000000000 +0300
@@ -32,6 +32,10 @@
#include <unistd.h>
#endif
@@ -8948,8 +8961,8 @@
typedef LONGLONG jlong;
typedef DWORDLONG julong;
diff -uNr ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
---- ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-03-14 20:12:55.000000000 +0300
@@ -33,9 +33,14 @@
#include <limits.h>
#include <time.h>
@@ -8988,8 +9001,8 @@
}
diff -uNr ../orig/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
---- ../orig/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-03-14 20:12:55.000000000 +0300
@@ -33,7 +33,11 @@
#include <jni.h>
@@ -9003,8 +9016,8 @@
#include "DirectAudio.h"
#include "Utilities.h"
diff -uNr ../orig/jdk/src/share/native/com/sun/media/sound/Platform.c ./jdk/src/share/native/com/sun/media/sound/Platform.c
---- ../orig/jdk/src/share/native/com/sun/media/sound/Platform.c 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/com/sun/media/sound/Platform.c 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-03-14 20:12:55.000000000 +0300
@@ -99,5 +99,17 @@
return com_sun_media_sound_Platform_LIB_ALSA;
}
@@ -9024,8 +9037,8 @@
return 0;
}
diff -uNr ../orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h
---- ../orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-03-14 20:12:55.000000000 +0300
@@ -31,6 +31,7 @@
#define X_WINDOWS 1
#define X_SOLARIS 2
@@ -9054,8 +9067,8 @@
+
#endif // __SOUNDDEFS_INCLUDED__
diff -uNr ../orig/jdk/src/share/native/common/check_code.c ./jdk/src/share/native/common/check_code.c
---- ../orig/jdk/src/share/native/common/check_code.c 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/common/check_code.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/common/check_code.c 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/common/check_code.c 2010-03-14 20:12:55.000000000 +0300
@@ -1069,7 +1069,7 @@
* Make sure that branches don't go into the middle of nowhere.
*/
@@ -9118,8 +9131,8 @@
* on per-method byte code length.
*/
diff -uNr ../orig/jdk/src/share/native/java/io/io_util.h ./jdk/src/share/native/java/io/io_util.h
---- ../orig/jdk/src/share/native/java/io/io_util.h 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/java/io/io_util.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/java/io/io_util.h 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/java/io/io_util.h 2010-03-14 20:12:55.000000000 +0300
@@ -29,7 +29,15 @@
extern jfieldID IO_fd_fdID;
extern jfieldID IO_handle_fdID;
@@ -9138,8 +9151,8 @@
#define O_DSYNC (0x2000)
#endif
diff -uNr ../orig/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
---- ../orig/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-03-14 20:12:55.000000000 +0300
@@ -25,6 +25,10 @@
* have any questions.
*/
@@ -9166,8 +9179,8 @@
/*
* ANSI/POSIX
diff -uNr ../orig/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
---- ../orig/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2009-10-14 10:17:52.000000000 -0700
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-03-14 20:12:55.000000000 +0300
@@ -61,7 +61,7 @@
#define log1p jlog1p
#define expm1 jexpm1
@@ -9178,8 +9191,8 @@
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_acosh __j__ieee754_acosh
diff -uNr ../orig/jdk/src/share/native/java/util/zip/Inflater.c ./jdk/src/share/native/java/util/zip/Inflater.c
---- ../orig/jdk/src/share/native/java/util/zip/Inflater.c 2009-10-14 10:17:53.000000000 -0700
-+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/java/util/zip/Inflater.c 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-03-14 20:12:55.000000000 +0300
@@ -67,6 +67,10 @@
return jlong_zero;
} else {
@@ -9203,8 +9216,8 @@
JNIEXPORT void JNICALL
diff -uNr ../orig/jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h ./jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h
---- ../orig/jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h 2009-10-14 10:17:53.000000000 -0700
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h 2010-03-14 20:12:55.000000000 +0300
@@ -42,44 +42,49 @@
/* for _LP64 */
#include <sys/types.h>
@@ -9289,8 +9302,8 @@
#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
diff -uNr ../orig/jdk/src/share/native/sun/awt/debug/debug_util.h ./jdk/src/share/native/sun/awt/debug/debug_util.h
---- ../orig/jdk/src/share/native/sun/awt/debug/debug_util.h 2009-10-14 10:17:53.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/debug/debug_util.h 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-03-14 20:12:55.000000000 +0300
@@ -50,7 +50,9 @@
#include <stdio.h>
#include <string.h>
@@ -9302,8 +9315,8 @@
/* keep these after the other headers */
diff -uNr ../orig/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c
---- ../orig/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2009-10-14 10:17:53.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-03-14 20:12:55.000000000 +0300
@@ -24,7 +24,11 @@
*/
@@ -9317,8 +9330,8 @@
#include "sun_awt_image_BufImgSurfaceData.h"
diff -uNr ../orig/jdk/src/share/native/sun/awt/image/DataBufferNative.c ./jdk/src/share/native/sun/awt/image/DataBufferNative.c
---- ../orig/jdk/src/share/native/sun/awt/image/DataBufferNative.c 2009-10-14 10:17:53.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-02-17 06:14:43.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,7 +23,11 @@
* have any questions.
*/
@@ -9332,8 +9345,8 @@
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-03-14 20:12:55.000000000 +0300
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -9374,8 +9387,8 @@
#endif /* _NO_LONGLONG */
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2009-10-28 20:01:49.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-03-14 20:12:55.000000000 +0300
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -9416,8 +9429,8 @@
/***************************************************************/
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-03-14 20:12:55.000000000 +0300
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -9458,8 +9471,8 @@
/***************************************************************/
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-03-14 20:12:55.000000000 +0300
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -9500,8 +9513,8 @@
/***************************************************************/
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-03-14 20:12:55.000000000 +0300
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -9542,8 +9555,8 @@
/***************************************************************/
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-03-14 20:12:55.000000000 +0300
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -9584,8 +9597,8 @@
/***************************************************************/
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-03-14 20:12:55.000000000 +0300
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -9626,8 +9639,8 @@
/***************************************************************/
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-03-14 20:12:55.000000000 +0300
@@ -95,7 +95,7 @@
dst = dp[0];
if (ld_offset + size < 32) {
@@ -9848,8 +9861,8 @@
#else /* _LONGLONG */
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-03-14 20:12:55.000000000 +0300
@@ -168,7 +168,7 @@
}
@@ -10131,8 +10144,8 @@
dp[13] = t1;
dp[14] = t2;
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-03-14 20:12:55.000000000 +0300
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -10285,8 +10298,8 @@
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-03-14 20:12:55.000000000 +0300
@@ -30,7 +30,7 @@
typedef union {
mlib_d64 db;
@@ -10297,8 +10310,8 @@
#else
mlib_s32 int0, int1;
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-03-14 20:12:55.000000000 +0300
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
src0 = src1;
@@ -10398,8 +10411,8 @@
dp += SIZE;
sp += SIZE;
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-03-14 20:12:55.000000000 +0300
@@ -120,7 +120,7 @@
} \
}
@@ -11633,8 +11646,8 @@
dp[13] = t1;
dp[14] = t2;
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_image.h ./jdk/src/share/native/sun/awt/medialib/mlib_image.h
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_image.h 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-03-14 20:12:55.000000000 +0300
@@ -27,6 +27,11 @@
#ifndef MLIB_IMAGE_H
#define MLIB_IMAGE_H
@@ -11648,8 +11661,8 @@
#include <mlib_status.h>
#include <mlib_sys.h>
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_sys.c ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-03-14 20:12:55.000000000 +0300
@@ -26,9 +26,15 @@
#include <stdlib.h>
@@ -11681,8 +11694,8 @@
#endif /* _MSC_VER */
}
diff -uNr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h ./jdk/src/share/native/sun/awt/medialib/mlib_types.h
---- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-03-14 20:12:55.000000000 +0300
@@ -59,7 +59,10 @@
#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
@@ -11696,8 +11709,8 @@
#include <malloc.h> /* for ptrdiff_t */
#else
diff -uNr ../orig/jdk/src/share/native/sun/font/AccelGlyphCache.c ./jdk/src/share/native/sun/font/AccelGlyphCache.c
---- ../orig/jdk/src/share/native/sun/font/AccelGlyphCache.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,7 +23,11 @@
* have any questions.
*/
@@ -11711,8 +11724,8 @@
#include "AccelGlyphCache.h"
#include "Trace.h"
diff -uNr ../orig/jdk/src/share/native/sun/font/DrawGlyphList.c ./jdk/src/share/native/sun/font/DrawGlyphList.c
---- ../orig/jdk/src/share/native/sun/font/DrawGlyphList.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/font/DrawGlyphList.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-03-14 20:12:55.000000000 +0300
@@ -26,7 +26,11 @@
#include "jlong.h"
#include "math.h"
@@ -11726,8 +11739,8 @@
#include "fontscalerdefs.h"
#include "glyphblitting.h"
diff -uNr ../orig/jdk/src/share/native/sun/font/freetypeScaler.c ./jdk/src/share/native/sun/font/freetypeScaler.c
---- ../orig/jdk/src/share/native/sun/font/freetypeScaler.c 2009-10-14 10:17:54.000000000 -0700
-+++ ./jdk/src/share/native/sun/font/freetypeScaler.c 2009-11-02 17:27:40.000000000 -0800
+--- ../orig/jdk/src/share/native/sun/font/freetypeScaler.c 2010-02-17 06:14:44.000000000 +0300
++++ ./jdk/src/share/native/sun/font/freetypeScaler.c 2010-03-14 20:12:55.000000000 +0300
@@ -1291,7 +1291,7 @@
sunFontIDs.rect2DFloatClass,
sunFontIDs.rect2DFloatCtr4,
@@ -11738,8 +11751,8 @@
F26Dot6ToFloat(bbox.yMax-bbox.yMin));
}
diff -uNr ../orig/jdk/src/share/native/sun/font/sunFont.c ./jdk/src/share/native/sun/font/sunFont.c
---- ../orig/jdk/src/share/native/sun/font/sunFont.c 2009-10-14 10:17:55.000000000 -0700
-+++ ./jdk/src/share/native/sun/font/sunFont.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/font/sunFont.c 2010-02-17 06:14:45.000000000 +0300
++++ ./jdk/src/share/native/sun/font/sunFont.c 2010-03-14 20:12:55.000000000 +0300
@@ -24,7 +24,9 @@
*/
@@ -11751,8 +11764,8 @@
#include "gdefs.h"
#include "jlong.h"
diff -uNr ../orig/jdk/src/share/native/sun/java2d/SurfaceData.c ./jdk/src/share/native/sun/java2d/SurfaceData.c
---- ../orig/jdk/src/share/native/sun/java2d/SurfaceData.c 2009-10-14 10:17:55.000000000 -0700
-+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/java2d/SurfaceData.c 2010-02-17 06:14:45.000000000 +0300
++++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-03-14 20:12:55.000000000 +0300
@@ -28,7 +28,11 @@
#include "jni_util.h"
#include "Disposer.h"
@@ -11766,8 +11779,8 @@
/**
diff -uNr ../orig/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h
---- ../orig/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2009-10-14 10:17:55.000000000 -0700
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-02-17 06:14:45.000000000 +0300
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-03-14 20:12:55.000000000 +0300
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
#define OGLFuncs_h_Included
@@ -11779,8 +11792,8 @@
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
diff -uNr ../orig/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c
---- ../orig/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2009-10-14 10:17:55.000000000 -0700
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-02-17 06:14:45.000000000 +0300
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-03-14 20:12:55.000000000 +0300
@@ -25,7 +25,11 @@
#ifndef HEADLESS
@@ -11794,8 +11807,8 @@
#include "sun_java2d_pipe_BufferedOpCodes.h"
diff -uNr ../orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
---- ../orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2009-10-14 10:17:55.000000000 -0700
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-02-17 06:14:45.000000000 +0300
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-03-14 20:12:55.000000000 +0300
@@ -25,7 +25,11 @@
#ifndef HEADLESS
@@ -11809,8 +11822,8 @@
#include <jlong.h>
diff -uNr ../orig/jdk/src/share/transport/socket/socketTransport.c ./jdk/src/share/transport/socket/socketTransport.c
---- ../orig/jdk/src/share/transport/socket/socketTransport.c 2009-10-14 10:17:56.000000000 -0700
-+++ ./jdk/src/share/transport/socket/socketTransport.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/share/transport/socket/socketTransport.c 2010-02-17 06:14:46.000000000 +0300
++++ ./jdk/src/share/transport/socket/socketTransport.c 2010-03-14 20:12:55.000000000 +0300
@@ -65,6 +65,9 @@
#define HEADER_SIZE 11
#define MAX_DATA_SIZE 1000
@@ -11821,25 +11834,25 @@
/*
* Record the last error for this thread.
*/
-@@ -153,7 +156,7 @@
+@@ -155,7 +158,7 @@
}
buf = b;
buf += received;
-- n = dbgsysRecv(fd, buf, strlen(hello)-received, 0);
-+ n = recv_fully(fd, buf, strlen(hello)-received);
+- n = dbgsysRecv(fd, buf, helloLen-received, 0);
++ n = recv_fully(fd, buf, helloLen-received);
if (n == 0) {
setLastError(0, "handshake failed - connection prematurally closed");
return JDWPTRANSPORT_ERROR_IO_ERROR;
-@@ -179,7 +182,7 @@
- }
+@@ -180,7 +183,7 @@
+ return JDWPTRANSPORT_ERROR_IO_ERROR;
}
-- if (dbgsysSend(fd, hello, strlen(hello), 0) != (int)strlen(hello)) {
-+ if (send_fully(fd, hello, strlen(hello)) != (int)strlen(hello)) {
+- if (dbgsysSend(fd, (char*)hello, helloLen, 0) != helloLen) {
++ if (send_fully(fd, hello, helloLen) != helloLen) {
RETURN_IO_ERROR("send failed during handshake");
}
return JDWPTRANSPORT_ERROR_NONE;
-@@ -554,19 +557,19 @@
+@@ -555,19 +558,19 @@
/* Do one send for short packets, two for longer ones */
if (data_len <= MAX_DATA_SIZE) {
memcpy(header + HEADER_SIZE, data, data_len);
@@ -11863,7 +11876,7 @@
RETURN_IO_ERROR("send failed");
}
}
-@@ -574,13 +577,33 @@
+@@ -575,13 +578,33 @@
return JDWPTRANSPORT_ERROR_NONE;
}
@@ -11899,8 +11912,8 @@
} else if (res == 0) {
break; /* eof, return nbytes which is less than len */
diff -uNr ../orig/jdk/src/solaris/back/exec_md.c ./jdk/src/solaris/back/exec_md.c
---- ../orig/jdk/src/solaris/back/exec_md.c 2009-10-14 10:17:56.000000000 -0700
-+++ ./jdk/src/solaris/back/exec_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/back/exec_md.c 2010-02-17 06:14:46.000000000 +0300
++++ ./jdk/src/solaris/back/exec_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -30,7 +30,7 @@
#include "sys.h"
#include "util.h"
@@ -11911,8 +11924,8 @@
#define FORK() fork()
#else
diff -uNr ../orig/jdk/src/solaris/back/linker_md.c ./jdk/src/solaris/back/linker_md.c
---- ../orig/jdk/src/solaris/back/linker_md.c 2009-10-14 10:17:56.000000000 -0700
-+++ ./jdk/src/solaris/back/linker_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/back/linker_md.c 2010-02-17 06:14:46.000000000 +0300
++++ ./jdk/src/solaris/back/linker_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -48,6 +48,12 @@
#include "threads_md.h"
#endif
@@ -11939,9 +11952,18 @@
}
diff -uNr ../orig/jdk/src/solaris/back/util_md.h ./jdk/src/solaris/back/util_md.h
---- ../orig/jdk/src/solaris/back/util_md.h 2009-10-14 10:17:56.000000000 -0700
-+++ ./jdk/src/solaris/back/util_md.h 2009-10-28 20:01:48.000000000 -0700
-@@ -28,6 +28,7 @@
+--- ../orig/jdk/src/solaris/back/util_md.h 2010-02-17 06:14:46.000000000 +0300
++++ ./jdk/src/solaris/back/util_md.h 2010-03-14 20:12:55.000000000 +0300
+@@ -29,7 +29,7 @@
+ #include <stddef.h>
+
+ /* To get uintptr_t */
+-#ifdef LINUX
++#if defined(LINUX) || defined(_ALLBSD_SOURCE)
+ #include <stdint.h>
+ #else
+ /* The file stdint.h is not on Solaris 8 machines. */
+@@ -40,6 +40,7 @@
#include <limits.h>
#include <sys/types.h>
@@ -11949,7 +11971,7 @@
#ifdef _LP64
typedef unsigned long UNSIGNED_JLONG;
-@@ -43,7 +44,7 @@
+@@ -55,7 +56,7 @@
/* On little endian machines, convert java big endian numbers. */
@@ -11959,8 +11981,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)))
diff -uNr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
---- ../orig/jdk/src/solaris/bin/java_md.c 2009-10-14 10:17:56.000000000 -0700
-+++ ./jdk/src/solaris/bin/java_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/bin/java_md.c 2010-02-17 06:14:46.000000000 +0300
++++ ./jdk/src/solaris/bin/java_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -24,6 +24,7 @@
*/
@@ -12176,8 +12198,8 @@
#define MAX_PID_STR_SZ 20
diff -uNr ../orig/jdk/src/solaris/bin/java_md.h ./jdk/src/solaris/bin/java_md.h
---- ../orig/jdk/src/solaris/bin/java_md.h 2009-10-14 10:17:56.000000000 -0700
-+++ ./jdk/src/solaris/bin/java_md.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/bin/java_md.h 2010-02-17 06:14:46.000000000 +0300
++++ ./jdk/src/solaris/bin/java_md.h 2010-03-14 20:12:55.000000000 +0300
@@ -58,10 +58,14 @@
#include <sys/time.h>
#define CounterGet() (gethrtime()/1000)
@@ -12195,8 +12217,8 @@
/*
* Function prototypes.
diff -uNr ../orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java ./jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
---- ../orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-10-14 10:17:57.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-02-17 06:14:46.000000000 +0300
++++ ./jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-03-14 20:12:55.000000000 +0300
@@ -403,7 +403,7 @@
if (fontID != null) {
fileName = (String)fontNameMap.get(fontID);
@@ -12216,8 +12238,8 @@
}
fontdirs = (String[])fontConfigDirs.toArray(new String[0]);
diff -uNr ../orig/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
---- ../orig/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2009-10-14 10:17:57.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-03-14 20:12:55.000000000 +0300
@@ -119,7 +119,11 @@
}
@@ -12232,8 +12254,8 @@
static final int UNINITIALIZED = -1;
diff -uNr ../orig/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java
---- ../orig/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2009-10-22 23:07:25.000000000 -0700
-+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-03-14 20:08:07.000000000 +0300
++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-03-14 20:12:55.000000000 +0300
@@ -38,9 +38,6 @@
*/
public class BsdVirtualMachine extends HotSpotVirtualMachine {
@@ -12338,8 +12360,8 @@
}
}
diff -uNr ../orig/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
---- ../orig/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2009-10-14 10:17:57.000000000 -0700
-+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -33,7 +33,7 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -12386,8 +12408,8 @@
#else
/* Just using &Agent_OnLoad will get the first external symbol with
diff -uNr ../orig/jdk/src/solaris/hpi/include/interrupt.h ./jdk/src/solaris/hpi/include/interrupt.h
---- ../orig/jdk/src/solaris/hpi/include/interrupt.h 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/include/interrupt.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/include/interrupt.h 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-03-14 20:12:55.000000000 +0300
@@ -75,7 +75,7 @@
* N_INTERRUPTS - The number of interrupt channels. These
* are numbered from 0 to (N_INTERRUPTS - 1).
@@ -12409,8 +12431,8 @@
/* Thread implementation dependent interrupt dispatcher. */
void intrDispatchMD(int sig, siginfo_t *info, void *uc);
diff -uNr ../orig/jdk/src/solaris/hpi/include/largefile.h ./jdk/src/solaris/hpi/include/largefile.h
---- ../orig/jdk/src/solaris/hpi/include/largefile.h 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/include/largefile.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/include/largefile.h 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/include/largefile.h 2010-03-14 20:12:55.000000000 +0300
@@ -34,6 +34,10 @@
#include "largefile_linux.h"
#endif
@@ -12423,8 +12445,8 @@
* Prototypes for wrappers that we define. These wrapper functions
* are low-level I/O routines that will use 64 bit versions if
diff -uNr ../orig/jdk/src/solaris/hpi/include/largefile_bsd.h ./jdk/src/solaris/hpi/include/largefile_bsd.h
---- ../orig/jdk/src/solaris/hpi/include/largefile_bsd.h 2009-10-22 23:07:25.000000000 -0700
-+++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/include/largefile_bsd.h 2010-03-14 20:08:07.000000000 +0300
++++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-03-14 20:12:55.000000000 +0300
@@ -23,14 +23,28 @@
* have any questions.
*/
@@ -12462,8 +12484,8 @@
+
+#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */
diff -uNr ../orig/jdk/src/solaris/hpi/native_threads/include/threads_md.h ./jdk/src/solaris/hpi/native_threads/include/threads_md.h
---- ../orig/jdk/src/solaris/hpi/native_threads/include/threads_md.h 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-03-14 20:12:55.000000000 +0300
@@ -36,6 +36,8 @@
#define N_TRACED_REGS 12
#elif i386
@@ -12511,8 +12533,8 @@
#ifdef __linux__
extern thread_key_t intrJmpbufkey;
diff -uNr ../orig/jdk/src/solaris/hpi/native_threads/src/condvar_md.c ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c
---- ../orig/jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -58,7 +58,7 @@
{
int err;
@@ -12523,8 +12545,8 @@
#else
err = cond_destroy((cond_t *) condvar);
diff -uNr ../orig/jdk/src/solaris/hpi/native_threads/src/monitor_md.c ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c
---- ../orig/jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -147,7 +147,7 @@
mid->monitor_owner = self;
mid->entry_count = 1;
@@ -12535,8 +12557,8 @@
mid->entry_count++;
return SYS_OK;
diff -uNr ../orig/jdk/src/solaris/hpi/native_threads/src/sys_api_td.c ./jdk/src/solaris/hpi/native_threads/src/sys_api_td.c
---- ../orig/jdk/src/solaris/hpi/native_threads/src/sys_api_td.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/native_threads/src/sys_api_td.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/native_threads/src/sys_api_td.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/native_threads/src/sys_api_td.c 2010-03-14 20:12:55.000000000 +0300
@@ -39,6 +39,10 @@
#include <sys/ioctl.h>
#endif
@@ -12560,8 +12582,8 @@
#undef CLOSEIO
#else
diff -uNr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
---- ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2009-10-22 23:07:25.000000000 -0700
-+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-03-14 20:08:07.000000000 +0300
++++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,79 +23,44 @@
* have any questions.
*/
@@ -13438,8 +13460,8 @@
- print_lwps();
}
diff -uNr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c ./jdk/src/solaris/hpi/native_threads/src/threads_md.c
---- ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -54,6 +54,10 @@
#error That can NOT possibly be right.
#endif
@@ -13522,8 +13544,8 @@
info.isMP = (cpus < 0) ? 1 : (cpus > 1);
info.name = "native threads";
diff -uNr ../orig/jdk/src/solaris/hpi/src/linker_md.c ./jdk/src/solaris/hpi/src/linker_md.c
---- ../orig/jdk/src/solaris/hpi/src/linker_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/src/linker_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/src/linker_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -44,11 +44,19 @@
#include "threads_md.h"
#endif
@@ -13591,8 +13613,8 @@
/*
* This is a bit of bulletproofing to catch the commonly occurring
diff -uNr ../orig/jdk/src/solaris/hpi/src/memory_md.c ./jdk/src/solaris/hpi/src/memory_md.c
---- ../orig/jdk/src/solaris/hpi/src/memory_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/src/memory_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/src/memory_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -50,12 +50,24 @@
#include <stdlib.h>
#include <stdio.h> /* For perror() */
@@ -13683,8 +13705,8 @@
#else
ret = requestedAddr;
diff -uNr ../orig/jdk/src/solaris/hpi/src/system_md.c ./jdk/src/solaris/hpi/src/system_md.c
---- ../orig/jdk/src/solaris/hpi/src/system_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/hpi/src/system_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/hpi/src/system_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/hpi/src/system_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -41,6 +41,7 @@
#include <dlfcn.h>
@@ -13739,8 +13761,8 @@
if (delete != 0) {
unlink(path);
diff -uNr ../orig/jdk/src/solaris/instrument/EncodingSupport_md.c ./jdk/src/solaris/instrument/EncodingSupport_md.c
---- ../orig/jdk/src/solaris/instrument/EncodingSupport_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/instrument/EncodingSupport_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -28,7 +28,10 @@
#include <string.h>
#include <ctype.h>
@@ -13771,8 +13793,8 @@
/* Open conversion descriptors */
iconvToPlatform = iconv_open(codeset, "UTF-8");
diff -uNr ../orig/jdk/src/solaris/javavm/export/jvm_md.h ./jdk/src/solaris/javavm/export/jvm_md.h
---- ../orig/jdk/src/solaris/javavm/export/jvm_md.h 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/javavm/export/jvm_md.h 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-03-14 20:12:55.000000000 +0300
@@ -39,7 +39,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
@@ -13798,8 +13820,8 @@
/* Signals */
diff -uNr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c
---- ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -32,10 +32,16 @@
#include <sys/types.h>
@@ -13963,8 +13985,8 @@
JNIEXPORT jlong JNICALL
diff -uNr ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c
---- ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -41,6 +41,11 @@
#include "java_io_FileSystem.h"
#include "java_io_UnixFileSystem.h"
@@ -14021,8 +14043,8 @@
if (stat(path, &sb) == 0) {
diff -uNr ../orig/jdk/src/solaris/native/java/io/canonicalize_md.c ./jdk/src/solaris/native/java/io/canonicalize_md.c
---- ../orig/jdk/src/solaris/native/java/io/canonicalize_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/io/canonicalize_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -33,7 +33,9 @@
#include <sys/stat.h>
#include <errno.h>
@@ -14034,8 +14056,8 @@
/* Note: The comments in this file use the terminology
diff -uNr ../orig/jdk/src/solaris/native/java/io/io_util_md.c ./jdk/src/solaris/native/java/io/io_util_md.c
---- ../orig/jdk/src/solaris/native/java/io/io_util_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/io/io_util_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -36,7 +36,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
FD fd;
@@ -14046,8 +14068,8 @@
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
diff -uNr ../orig/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
---- ../orig/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -28,6 +28,11 @@
#include "jni.h"
#include "jni_util.h"
@@ -14089,8 +14111,8 @@
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
diff -uNr ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c
---- ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -40,7 +40,11 @@
#include <stdlib.h>
#include <sys/types.h>
@@ -14294,8 +14316,8 @@
Give the child sides of the pipes the right fileno's.
Closing pipe fds here is redundant, since closeDescriptors()
diff -uNr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/solaris/native/java/lang/java_props_md.c
---- ../orig/jdk/src/solaris/native/java/lang/java_props_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/lang/java_props_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,7 +23,7 @@
* have any questions.
*/
@@ -14430,8 +14452,8 @@
return &sprops;
}
diff -uNr ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c
---- ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-03-14 20:12:55.000000000 +0300
@@ -35,17 +35,293 @@
#include <stdlib.h>
#include <ctype.h>
@@ -14789,8 +14811,8 @@
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
diff -uNr ../orig/jdk/src/solaris/native/java/net/Inet6AddressImpl.c ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c
---- ../orig/jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-03-14 20:12:55.000000000 +0300
@@ -32,6 +32,9 @@
#include <strings.h>
#include <stdlib.h>
@@ -14841,8 +14863,8 @@
return (*env)->NewStringUTF(env, hostname);
}
diff -uNr ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c ./jdk/src/solaris/native/java/net/NetworkInterface.c
---- ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,13 +23,13 @@
* have any questions.
*/
@@ -15120,8 +15142,8 @@
strcpy(if2.ifr_name, name_utf);
diff -uNr ../orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
---- ../orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,12 +23,12 @@
* have any questions.
*/
@@ -15229,8 +15251,8 @@
}
}
diff -uNr ../orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c ./jdk/src/solaris/native/java/net/PlainSocketImpl.c
---- ../orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-03-14 20:12:55.000000000 +0300
@@ -528,9 +528,11 @@
if (connect_rv == JVM_IO_INTR) {
JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
@@ -15244,8 +15266,8 @@
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ConnectException",
"Connection refused");
diff -uNr ../orig/jdk/src/solaris/native/java/net/bsd_close.c ./jdk/src/solaris/native/java/net/bsd_close.c
---- ../orig/jdk/src/solaris/native/java/net/bsd_close.c 2009-10-22 23:07:25.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/net/bsd_close.c 2010-03-14 20:08:07.000000000 +0300
++++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-03-14 20:12:55.000000000 +0300
@@ -57,7 +57,7 @@
/*
* Signal to unblock thread
@@ -15256,8 +15278,8 @@
/*
* The fd table and the number of file descriptors
diff -uNr ../orig/jdk/src/solaris/native/java/net/net_util_md.c ./jdk/src/solaris/native/java/net/net_util_md.c
---- ../orig/jdk/src/solaris/native/java/net/net_util_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/net/net_util_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -34,6 +34,15 @@
#include <stdlib.h>
#include <dlfcn.h>
@@ -15429,8 +15451,8 @@
}
diff -uNr ../orig/jdk/src/solaris/native/java/net/net_util_md.h ./jdk/src/solaris/native/java/net/net_util_md.h
---- ../orig/jdk/src/solaris/native/java/net/net_util_md.h 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/net/net_util_md.h 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-03-14 20:12:55.000000000 +0300
@@ -37,7 +37,7 @@
#endif
@@ -15441,8 +15463,8 @@
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
diff -uNr ../orig/jdk/src/solaris/native/java/nio/MappedByteBuffer.c ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c
---- ../orig/jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-03-14 20:12:55.000000000 +0300
@@ -38,7 +38,11 @@
jlong address, jlong len)
{
@@ -15468,8 +15490,8 @@
jlong offset = lAddress % pageSize;
diff -uNr ../orig/jdk/src/solaris/native/java/util/FileSystemPreferences.c ./jdk/src/solaris/native/java/util/FileSystemPreferences.c
---- ../orig/jdk/src/solaris/native/java/util/FileSystemPreferences.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-03-14 20:12:55.000000000 +0300
@@ -47,8 +47,11 @@
return (jint) result;
}
@@ -15508,8 +15530,8 @@
if (rc < 0) {
close(fd);
diff -uNr ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c ./jdk/src/solaris/native/java/util/TimeZone_md.c
---- ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-03-14 20:15:42.000000000 +0300
@@ -31,7 +31,7 @@
#include <errno.h>
#include <stddef.h>
@@ -15519,24 +15541,16 @@
#include <string.h>
#include <dirent.h>
#include <sys/stat.h>
-@@ -49,11 +49,14 @@
+@@ -49,7 +49,7 @@
#define fileclose fclose
#endif
-#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
-+#ifdef __linux__
- static const char *sysconfig_clock_file = "/etc/sysconfig/clock";
-+#endif
-+
- static const char *zoneinfo_dir = "/usr/share/zoneinfo";
--static const char *defailt_zoneinfo_file = "/etc/localtime";
-+static const char *default_zoneinfo_file = "/etc/localtime";
-
- /*
- * Returns a point to the zone ID portion of the given zoneinfo file
-@@ -199,7 +202,9 @@
+ static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
+ static const char *ZONEINFO_DIR = "/usr/share/zoneinfo";
+@@ -199,7 +199,9 @@
int fd;
char *buf;
size_t size;
@@ -15544,9 +15558,9 @@
+#ifdef __linux__
/*
- * First, try the ZONE entry in /etc/sysconfig/clock. However, the
- * ZONE entry is not set up after initial Red Hat Linux
-@@ -254,14 +259,18 @@
+ * Try reading the /etc/timezone file for Debian distros. There's
+ * no spec of the file format available. This parsing assumes that
+@@ -223,6 +225,7 @@
return tz;
}
}
@@ -15554,43 +15568,40 @@
/*
* Next, try /etc/localtime to find the zone ID.
- */
-- if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
-+ if (lstat(default_zoneinfo_file, &statbuf) == -1) {
+@@ -231,6 +234,9 @@
return NULL;
}
-+ strlcpy(zoneinfo_file, default_zoneinfo_file, PATH_MAX+1);
++ strlcpy(zoneinfo_file, DEFAULT_ZONEINFO_FILE, PATH_MAX+1);
+
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
/*
* If it's a symlink, get the link name and its zone ID part. (The
* older versions of timeconfig created a symlink as described in
-@@ -270,21 +279,25 @@
+@@ -239,21 +245,25 @@
* from /etc/localtime.)
*/
if (S_ISLNK(statbuf.st_mode)) {
- char linkbuf[PATH_MAX+1];
int len;
-- if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
-+ if ((len = readlink(default_zoneinfo_file, zoneinfo_file, sizeof(zoneinfo_file)-1)) == -1) {
+- if ((len = readlink(DEFAULT_ZONEINFO_FILE, linkbuf, sizeof(linkbuf)-1)) == -1) {
++ if ((len = readlink(DEFAULT_ZONEINFO_FILE, zoneinfo_file, sizeof(zoneinfo_file)-1)) == -1) {
jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
-- defailt_zoneinfo_file);
-+ default_zoneinfo_file);
+ DEFAULT_ZONEINFO_FILE);
return NULL;
}
- linkbuf[len] = '\0';
- tz = getZoneName(linkbuf);
-+ zoneinfo_file[len] = '\0';
-+ tz = getZoneName(zoneinfo_file);
++ zoneinfo_file[len] = '\0';
++ tz = getZoneName(zoneinfo_file);
if (tz != NULL) {
tz = strdup(tz);
-+ return tz;
-+ } else {
-+ if (lstat(zoneinfo_file, &statbuf) == -1) {
-+ return NULL;
-+ }
++ return tz;
++ } else {
++ if (lstat(zoneinfo_file, &statbuf) == -1) {
++ retuen NULL;
++ }
}
- return tz;
}
@@ -15598,16 +15609,16 @@
/*
* If it's a regular file, we need to find out the same zoneinfo file
-@@ -295,7 +308,7 @@
+@@ -264,7 +274,7 @@
if (buf == NULL) {
return NULL;
}
-- if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
+- if ((fd = open(DEFAULT_ZONEINFO_FILE, O_RDONLY)) == -1) {
+ if ((fd = open(zoneinfo_file, O_RDONLY)) == -1) {
free((void *) buf);
return NULL;
}
-@@ -524,7 +537,7 @@
+@@ -493,7 +503,7 @@
tz = getenv("TZ");
@@ -15616,7 +15627,7 @@
if (tz == NULL) {
#else
#ifdef __solaris__
-@@ -563,19 +576,32 @@
+@@ -532,19 +542,32 @@
{
time_t offset;
char sign, buf[16];
@@ -15654,8 +15665,8 @@
sign, (int)(offset/3600), (int)((offset%3600)/60));
return strdup(buf);
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c
---- ../orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-03-14 20:12:55.000000000 +0300
@@ -25,6 +25,7 @@
#include <jni.h>
@@ -15679,8 +15690,8 @@
return JNI_FALSE;
}
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/VDrawingArea.c ./jdk/src/solaris/native/sun/awt/VDrawingArea.c
---- ../orig/jdk/src/solaris/native/sun/awt/VDrawingArea.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-03-14 20:12:55.000000000 +0300
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -15694,8 +15705,8 @@
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/X11Color.c ./jdk/src/solaris/native/sun/awt/X11Color.c
---- ../orig/jdk/src/solaris/native/sun/awt/X11Color.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/X11Color.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-03-14 20:12:55.000000000 +0300
@@ -33,7 +33,9 @@
#include <math.h>
#include <sys/time.h>
@@ -15707,8 +15718,8 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/XDrawingArea.c ./jdk/src/solaris/native/sun/awt/XDrawingArea.c
---- ../orig/jdk/src/solaris/native/sun/awt/XDrawingArea.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-03-14 20:12:55.000000000 +0300
@@ -30,7 +30,11 @@
#include <Xm/XmP.h>
@@ -15722,8 +15733,8 @@
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_Font.c ./jdk/src/solaris/native/sun/awt/awt_Font.c
---- ../orig/jdk/src/solaris/native/sun/awt/awt_Font.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_Font.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-03-14 20:12:55.000000000 +0300
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
altstyle = "roman";
@@ -15734,8 +15745,8 @@
family = "lucida";
}
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
---- ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-03-14 20:12:55.000000000 +0300
@@ -40,6 +40,7 @@
#include <jni.h>
#include <jni_util.h>
@@ -15861,8 +15872,8 @@
J2dRlsTraceLn(J2D_TRACE_ERROR,
"X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c
---- ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-03-14 20:12:55.000000000 +0300
@@ -69,7 +69,7 @@
XIMPreeditDrawCallbackStruct *);
static void PreeditCaretCallback(XIC, XPointer,
@@ -16103,8 +16114,8 @@
adjustStatusWindow(window);
AWT_UNLOCK();
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
---- ../orig/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-03-14 20:12:55.000000000 +0300
@@ -260,7 +260,11 @@
}
}
@@ -16118,8 +16129,8 @@
JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
"(Ljava/lang/String;)V",
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_MToolkit.c ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c
---- ../orig/jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-03-14 20:12:55.000000000 +0300
@@ -63,8 +63,9 @@
extern JavaVM *jvm;
@@ -16141,8 +16152,8 @@
#endif
xembed_eventHandler(&xev);
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_Mlib.c ./jdk/src/solaris/native/sun/awt/awt_Mlib.c
---- ../orig/jdk/src/solaris/native/sun/awt/awt_Mlib.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-03-14 20:12:55.000000000 +0300
@@ -32,6 +32,7 @@
#include <dlfcn.h>
#include "jni.h"
@@ -16166,8 +16177,8 @@
if (handle == NULL) {
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_Robot.c ./jdk/src/solaris/native/sun/awt/awt_Robot.c
---- ../orig/jdk/src/solaris/native/sun/awt/awt_Robot.c 2009-10-14 10:17:58.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-03-14 20:12:55.000000000 +0300
@@ -45,7 +45,7 @@
#include "wsutils.h"
#include "list.h"
@@ -16178,8 +16189,8 @@
#endif
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_util.h ./jdk/src/solaris/native/sun/awt/awt_util.h
---- ../orig/jdk/src/solaris/native/sun/awt/awt_util.h 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_util.h 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-03-14 20:12:55.000000000 +0300
@@ -187,15 +187,20 @@
#ifdef __solaris__
extern Widget awt_util_getXICStatusAreaWindow(Widget w);
@@ -16203,8 +16214,8 @@
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_wm.c ./jdk/src/solaris/native/sun/awt/awt_wm.c
---- ../orig/jdk/src/solaris/native/sun/awt/awt_wm.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_wm.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-03-14 20:12:55.000000000 +0300
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -16303,8 +16314,8 @@
}
else {
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/awt_wm.h ./jdk/src/solaris/native/sun/awt/awt_wm.h
---- ../orig/jdk/src/solaris/native/sun/awt/awt_wm.h 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2009-10-28 20:01:48.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/awt_wm.h 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-03-14 20:12:55.000000000 +0300
@@ -45,7 +45,10 @@
KDE2_WM,
SAWFISH_WM,
@@ -16318,8 +16329,8 @@
extern void awt_wm_init(void);
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/extutil.h ./jdk/src/solaris/native/sun/awt/extutil.h
---- ../orig/jdk/src/solaris/native/sun/awt/extutil.h 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/extutil.h 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-03-14 20:12:55.000000000 +0300
@@ -58,7 +58,7 @@
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -16336,8 +16347,8 @@
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/native/sun/awt/fontpath.c
---- ../orig/jdk/src/solaris/native/sun/awt/fontpath.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/fontpath.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-03-14 20:12:55.000000000 +0300
@@ -23,7 +23,7 @@
* have any questions.
*/
@@ -16496,8 +16507,8 @@
return NULL;
}
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/gtk2_interface.c ./jdk/src/solaris/native/sun/awt/gtk2_interface.c
---- ../orig/jdk/src/solaris/native/sun/awt/gtk2_interface.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-02-17 06:14:47.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-03-14 20:12:55.000000000 +0300
@@ -30,8 +30,9 @@
#include <string.h>
#include "gtk2_interface.h"
@@ -16510,8 +16521,8 @@
#define G_TYPE_INVALID G_TYPE_MAKE_FUNDAMENTAL (0)
#define G_TYPE_NONE G_TYPE_MAKE_FUNDAMENTAL (1)
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/list.c ./jdk/src/solaris/native/sun/awt/list.c
---- ../orig/jdk/src/solaris/native/sun/awt/list.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/list.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/list.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/list.c 2010-03-14 20:12:55.000000000 +0300
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -16525,8 +16536,8 @@
diff -uNr ../orig/jdk/src/solaris/native/sun/awt/robot_common.c ./jdk/src/solaris/native/sun/awt/robot_common.c
---- ../orig/jdk/src/solaris/native/sun/awt/robot_common.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/awt/robot_common.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-03-14 20:12:55.000000000 +0300
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
#endif
@@ -16538,8 +16549,8 @@
/*
diff -uNr ../orig/jdk/src/solaris/native/sun/font/X11FontScaler.c ./jdk/src/solaris/native/sun/font/X11FontScaler.c
---- ../orig/jdk/src/solaris/native/sun/font/X11FontScaler.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-03-14 20:12:55.000000000 +0300
@@ -32,7 +32,11 @@
* into X11FontScaler_md.c, which is compiled into another library.
*/
@@ -16553,8 +16564,8 @@
#include <sys/utsname.h>
diff -uNr ../orig/jdk/src/solaris/native/sun/font/X11TextRenderer.c ./jdk/src/solaris/native/sun/font/X11TextRenderer.c
---- ../orig/jdk/src/solaris/native/sun/font/X11TextRenderer.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-03-14 20:12:55.000000000 +0300
@@ -39,7 +39,11 @@
#include "GraphicsPrimitiveMgr.h"
#include "glyphblitting.h"
@@ -16568,8 +16579,8 @@
JNIEXPORT void JNICALL AWTDrawGlyphList
diff -uNr ../orig/jdk/src/solaris/native/sun/java2d/j2d_md.h ./jdk/src/solaris/native/sun/java2d/j2d_md.h
---- ../orig/jdk/src/solaris/native/sun/java2d/j2d_md.h 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-03-14 20:12:55.000000000 +0300
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -16586,8 +16597,8 @@
typedef unsigned char jubyte;
typedef unsigned short jushort;
diff -uNr ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
---- ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-03-14 20:12:55.000000000 +0300
@@ -66,6 +66,10 @@
* MLIB_EDGE_SRC_PADDED
*/
@@ -16694,8 +16705,8 @@
}
else { /* aligned */
diff -uNr ../orig/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c
---- ../orig/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-03-14 20:12:55.000000000 +0300
@@ -794,7 +794,7 @@
static int initialized;
static int usevis = JNI_TRUE;
@@ -16706,8 +16717,8 @@
#else
# define ULTRA_CHIP "sun4u"
diff -uNr ../orig/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h
---- ../orig/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-03-14 20:12:55.000000000 +0300
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
@@ -16729,8 +16740,8 @@
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
diff -uNr ../orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
---- ../orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-03-14 20:12:55.000000000 +0300
@@ -32,6 +32,7 @@
#include "gdefs.h"
@@ -16749,8 +16760,8 @@
dgaAvailable = JNI_FALSE;
if (lib != NULL) {
diff -uNr ../orig/jdk/src/solaris/native/sun/jdga/dgalock.c ./jdk/src/solaris/native/sun/jdga/dgalock.c
---- ../orig/jdk/src/solaris/native/sun/jdga/dgalock.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/jdga/dgalock.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-03-14 20:12:55.000000000 +0300
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
@@ -16774,8 +16785,8 @@
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
diff -uNr ../orig/jdk/src/solaris/native/sun/management/FileSystemImpl.c ./jdk/src/solaris/native/sun/management/FileSystemImpl.c
---- ../orig/jdk/src/solaris/native/sun/management/FileSystemImpl.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-03-14 20:12:55.000000000 +0300
@@ -26,6 +26,10 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -16788,8 +16799,8 @@
#include "jni_util.h"
#include "sun_management_FileSystemImpl.h"
diff -uNr ../orig/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c
---- ../orig/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-03-14 20:12:55.000000000 +0300
@@ -33,7 +33,7 @@
#include <strings.h>
#endif
@@ -16800,8 +16811,8 @@
#endif
diff -uNr ../orig/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
---- ../orig/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-03-14 20:12:55.000000000 +0300
@@ -26,11 +26,12 @@
#include "jni.h"
#include "jni_util.h"
@@ -16829,8 +16840,8 @@
}
if (gconf_ver > 0) {
diff -uNr ../orig/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
---- ../orig/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-03-14 20:12:55.000000000 +0300
@@ -35,7 +35,7 @@
#include <string.h>
#include <errno.h>
@@ -16881,8 +16892,8 @@
#endif
diff -uNr ../orig/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c
---- ../orig/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-03-14 20:12:55.000000000 +0300
@@ -26,15 +26,21 @@
#include "jni.h"
#include "jni_util.h"
@@ -17010,8 +17021,8 @@
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
diff -uNr ../orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c ./jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c
---- ../orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c 2010-03-14 20:12:55.000000000 +0300
@@ -32,8 +32,12 @@
#include <sys/socket.h>
#include <fcntl.h>
@@ -17026,8 +17037,8 @@
static int preCloseFD = -1; /* File descriptor to which we dup other fd's
before closing them for real */
diff -uNr ../orig/jdk/src/solaris/native/sun/nio/ch/FileKey.c ./jdk/src/solaris/native/sun/nio/ch/FileKey.c
---- ../orig/jdk/src/solaris/native/sun/nio/ch/FileKey.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-03-14 20:12:55.000000000 +0300
@@ -30,6 +30,10 @@
#include "nio_util.h"
#include "sun_nio_ch_FileKey.h"
@@ -17040,8 +17051,8 @@
static jfieldID key_st_ino; /* id for FileKey.st_ino */
diff -uNr ../orig/jdk/src/solaris/native/sun/nio/ch/Net.c ./jdk/src/solaris/native/sun/nio/ch/Net.c
---- ../orig/jdk/src/solaris/native/sun/nio/ch/Net.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/nio/ch/Net.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-03-14 20:12:55.000000000 +0300
@@ -140,8 +140,31 @@
SOCKADDR sa;
int sa_len = SOCKADDR_LEN;
@@ -17184,8 +17195,8 @@
xn = JNU_JAVANETPKG "ConnectException";
break;
diff -uNr ../orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
---- ../orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-03-14 20:12:55.000000000 +0300
@@ -26,7 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
@@ -17197,8 +17208,8 @@
/* standard GSS method names (ordering is from mapfile) */
diff -uNr ../orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
---- ../orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -28,12 +28,19 @@
#include <string.h>
@@ -17242,8 +17253,8 @@
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
diff -uNr ../orig/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
---- ../orig/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -64,7 +64,9 @@
#include <assert.h>
@@ -17255,8 +17266,8 @@
#include <jni.h>
diff -uNr ../orig/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
---- ../orig/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -29,7 +29,9 @@
#include <assert.h>
@@ -17268,8 +17279,8 @@
#include <winscard.h>
diff -uNr ../orig/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c
---- ../orig/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2009-10-22 23:07:25.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-03-14 20:08:07.000000000 +0300
++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-03-14 20:12:55.000000000 +0300
@@ -35,10 +35,10 @@
#include <dirent.h>
#include <ctype.h>
@@ -17575,8 +17586,8 @@
+ }
+}
diff -uNr ../orig/jdk/src/solaris/native/sun/xawt/XWindow.c ./jdk/src/solaris/native/sun/xawt/XWindow.c
---- ../orig/jdk/src/solaris/native/sun/xawt/XWindow.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/xawt/XWindow.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-03-14 20:12:55.000000000 +0300
@@ -228,10 +228,10 @@
{java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
@@ -17602,8 +17613,8 @@
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
diff -uNr ../orig/jdk/src/solaris/native/sun/xawt/awt_Desktop.c ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c
---- ../orig/jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-03-14 20:12:55.000000000 +0300
@@ -24,6 +24,7 @@
*/
@@ -17631,8 +17642,8 @@
#ifdef INTERNAL_BUILD
fprintf(stderr, "can not load libgnome-2.so\n");
diff -uNr ../orig/jdk/src/solaris/npt/npt_md.h ./jdk/src/solaris/npt/npt_md.h
---- ../orig/jdk/src/solaris/npt/npt_md.h 2009-10-14 10:17:59.000000000 -0700
-+++ ./jdk/src/solaris/npt/npt_md.h 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/npt/npt_md.h 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/npt/npt_md.h 2010-03-14 20:12:55.000000000 +0300
@@ -32,9 +32,10 @@
#include <string.h>
#include <errno.h>
@@ -17656,8 +17667,8 @@
_sym = dlsym(_handle, "nptInitialize"); \
if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
diff -uNr ../orig/jdk/src/solaris/transport/socket/socket_md.c ./jdk/src/solaris/transport/socket/socket_md.c
---- ../orig/jdk/src/solaris/transport/socket/socket_md.c 2009-10-14 10:18:00.000000000 -0700
-+++ ./jdk/src/solaris/transport/socket/socket_md.c 2009-10-28 20:01:47.000000000 -0700
+--- ../orig/jdk/src/solaris/transport/socket/socket_md.c 2010-02-17 06:14:48.000000000 +0300
++++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-03-14 20:12:55.000000000 +0300
@@ -36,7 +36,7 @@
#ifdef __solaris__
#include <thread.h>
@@ -17677,8 +17688,8 @@
dbgsysTlsAlloc() {
pthread_key_t key;
diff -uNr ../orig/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java ./jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java
---- ../orig/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java 2009-10-14 10:18:04.000000000 -0700
-+++ ./jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java 2009-11-02 17:27:40.000000000 -0800
+--- ../orig/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java 2010-02-17 06:14:52.000000000 +0300
++++ ./jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java 2010-03-14 20:12:55.000000000 +0300
@@ -22,7 +22,7 @@
*/
/* @test
@@ -17706,8 +17717,8 @@
}
}
diff -uNr ../orig/langtools/src/share/classes/com/sun/tools/javah/Util.java ./langtools/src/share/classes/com/sun/tools/javah/Util.java
---- ../orig/langtools/src/share/classes/com/sun/tools/javah/Util.java 2009-10-14 10:18:43.000000000 -0700
-+++ ./langtools/src/share/classes/com/sun/tools/javah/Util.java 2009-10-28 20:01:54.000000000 -0700
+--- ../orig/langtools/src/share/classes/com/sun/tools/javah/Util.java 2010-02-17 06:15:22.000000000 +0300
++++ ./langtools/src/share/classes/com/sun/tools/javah/Util.java 2010-03-14 20:12:55.000000000 +0300
@@ -180,6 +180,14 @@
os = "win32";
} else if (os.indexOf("Linux") >= 0) {
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list