- Update to b17 promoted build [1]

- Fix font rendering and update cacerts file - Add support for fastdebug jdk - Cleanup/Enhance the port [2] Submitted by: maintainer [1], ale [2] Approved by: maintainer
author: Alex Dupre <ale@FreeBSD.org> 2010-01-16 19:34:32 +0000
committer: Alex Dupre <ale@FreeBSD.org> 2010-01-16 19:34:32 +0000
commit: ab853e1dfcaf4917b2a4d9bd0cd5e253a953e962 (patch)
tree: 4fec05e8b272ec3128e50a62c5e2e711646b1a8a
parent: Make sa-compile support conditional. (diff)
5 files changed, 2871 insertions, 2555 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index fa63571c9c27..9867113ba7ad 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openjdk6
-PORTVERSION=	b16
-PORTREVISION=	2
+PORTVERSION=	b17
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,}
@@ -17,13 +16,16 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ANTFILE}:ant
 MAINTAINER=	openjdk@getsnappy.com
 COMMENT=	Sun\'s java 6 virtual machine release under the GPL v2
 
-RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
+RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
+		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 
-OPENJDK_BUILDDATE=24_apr_2009
+BUILD_NUMBER=	${PORTVERSION:S/b//}
+OPENJDK_BUILDDATE=	14_oct_2009
 
-OPTIONS=	DEBUG   "Enable debugging support"	off \
-		IPV6    "Enable IPv6 support"	off \
-		POLICY  "Install the Unlimited Strength Policy Files"	off
+OPTIONS=	DEBUG "Enable legacy debugging support" off \
+		FASTDEBUG "Include fastdebug build" off \
+		IPV6 "Enable IPv6 support" off \
+		POLICY "Install the Unlimited Strength Policy Files" off
 
 # java extracts directly to the cwd
 WRKSRC=		${WRKDIR}
@@ -53,7 +55,7 @@ CATEGORIES+=	ipv6
 .endif
 
 # avoid ARCH in MAKEFLAGS, breaks build
-NOPRECIOUSMAKEVARS= yes
+NOPRECIOUSMAKEVARS=	yes
 
 ONLY_FOR_ARCHS=	amd64 i386
 
@@ -75,13 +77,31 @@ BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jdk16
 .endif
 
 MAKE_ENV=	LANG=C LC_ALL=C \
+		ARCH=${ARCH} \
+		ARCH_DATA_MODEL=64 \
+		LIBARCH=${ARCH} \
+		PLATFORM=bsd \
+		OS_NAME=freebsd \
+		ALT_JDK_IMPORT_PATH=${BOOTSTRAPJDKDIR} \
 		ALT_BOOTDIR=${BOOTSTRAPJDKDIR} \
+		ALT_CUPS_HEADERS_PATH=${LOCALBASE}/include \
+		ALT_CUPS_LIB_PATH=${LOCALBASE}/lib \
 		ALT_FREETYPE_HEADERS_PATH=${LOCALBASE}/include \
 		ALT_FREETYPE_LIB_PATH=${LOCALBASE}/lib \
 		ALT_X11_PATH=${LOCALBASE} \
 		ALT_PACKAGE_PATH=${LOCALBASE} \
 		ANT_HOME=${WRKDIR}/apache-ant-${ANTVERSION} \
-		NO_DOCS=true
+		BUILD_NUMBER=${BUILD_NUMBER} \
+		HS_BUILD_NUMBER=${BUILD_NUMBER} \
+		NO_DOCS=true \
+		MILESTONE=fcs
+
+# disable FASTDEBUG_BUILD by default to improve compile time.
+.if defined(WITH_FASTDEBUG)
+MAKE_ENV+=	SKIP_FASTDEBUG_BUILD=false
+.else
+MAKE_ENV+=	SKIP_FASTDEBUG_BUILD=true
+.endif
 
 .if !defined(WITH_IPV6)
 MAKE_ENV+=	DONT_ENABLE_IPV6="YES"
@@ -94,16 +114,16 @@ OPENJDK_OSARCH=	bsd-${ARCH:S/i386/i586/}-debug
 OPENJDK_OSARCH=	bsd-${ARCH:S/i386/i586/}
 .endif
 
-# perhaps we could check to see how many processors are availble and set this equivelent to that
-MAKE_ENV+=	HOTSPOT_BUILD_JOBS=4
+BUILD_JOBS_NUMBER!=	${SYSCTL} -n kern.smp.cpus
+MAKE_ENV+=	HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER}
 
-COPYDIRS= \
+COPYDIRS=	\
 	hotspot/src/os/linux/launcher \
 	hotspot/src/os/linux/vm \
 	hotspot/src/os_cpu/linux_x86/vm \
-	hotspot/build/linux \
-	hotspot/build/linux/makefiles \
 	hotspot/agent/src/os/linux \
+	hotspot/make/linux \
+	hotspot/make/linux/makefiles \
 	hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux \
 	hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64 \
 	hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86 \
@@ -112,7 +132,7 @@ COPYDIRS= \
 	hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86 \
 	jdk/src/linux/doc/man
 
-COPYFILES= \
+COPYFILES=	\
 	corba/make/common/Defs-linux.gmk \
 	corba/make/common/shared/Defs-linux.gmk \
 	hotspot/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java \
@@ -124,7 +144,6 @@ COPYFILES= \
 	jdk/make/sun/awt/mapfile-vers-linux \
 	jdk/make/tools/sharing/classlist.linux \
 	jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux \
-	jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties \
 	jdk/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java \
 	jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java \
 	jdk/src/solaris/hpi/include/largefile_linux.h \
@@ -149,8 +168,10 @@ post-extract:
 	@${SED} 's/solaris/bsd/g; s/Solaris/Bsd/g' \
 		< ${WRKDIR}/jdk/src/solaris/hpi/native_threads/src/threads_solaris.c \
 		> ${WRKDIR}/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c
-	@${CP} ${WRKDIR}/jdk/src/share/lib/security/java.security \
-		${WRKDIR}/jdk/src/share/lib/security/java.security-openbsd
+	@${CP} ${FILESDIR}/fontconfig.properties \
+		${WRKDIR}/jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties
+	@${CP} ${FILESDIR}/cacerts \
+		${WRKDIR}/jdk/src/share/lib/security/cacerts
 
 .if defined(WITH_POLICY)
 post-patch:
@@ -161,8 +182,10 @@ post-patch:
 do-install:
 	${MKDIR} ${PREFIX}/openjdk6/
 	${CP} -Rp ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/ ${PREFIX}/openjdk6/
-	${INSTALL_DATA} ${FILESDIR}/cacerts \
-	      ${PREFIX}/openjdk6/jre/lib/security/cacerts
+.if defined(WITH_FASTDEBUG)
+	${MKDIR} ${PREFIX}/openjdk6-fastdebug/
+	${CP} -Rp ${WRKSRC}/build/${OPENJDK_OSARCH}-fastdebug/j2sdk-image/ ${PREFIX}/openjdk6-fastdebug/
+.endif
 	@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java" >> ${TMPPLIST}
 	@${FIND} -s ${PREFIX}/openjdk6 -not -type d | \
 		${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST}
@@ -170,9 +193,21 @@ do-install:
 	@${FIND} ${PREFIX}/openjdk6 -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 	@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm '${PREFIX}/openjdk6/bin/java # OpenJDK6'" >> ${TMPPLIST}
+.if defined(WITH_FASTDEBUG)
+	@${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java" >> ${TMPPLIST}
+	@${FIND} -s ${PREFIX}/openjdk6-fastdebug -not -type d | \
+		${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST}
+	@${ECHO} "@exec mkdir ${PREFIX}/openjdk6-fastdebug/jre/lib/applet" >> ${TMPPLIST}
+	@${FIND} ${PREFIX}/openjdk6-fastdebug -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	@${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm '${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6'" >> ${TMPPLIST}
+.endif
 
 post-install:
 	# Register the VM
 	"${LOCALBASE}/bin/registervm" "${PREFIX}/openjdk6/bin/java # OpenJDK6"
+.if defined(WITH_FASTDEBUG)
+	"${LOCALBASE}/bin/registervm" "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/java/openjdk6/distinfo b/java/openjdk6/distinfo
index 88ef2859263e..568edf635d21 100644
--- a/java/openjdk6/distinfo
+++ b/java/openjdk6/distinfo
@@ -1,6 +1,6 @@
-MD5 (openjdk-6-src-b16-24_apr_2009.tar.gz) = 850a29b70206bc7fa083cd26acc781f3
-SHA256 (openjdk-6-src-b16-24_apr_2009.tar.gz) = 96159489d8b70db275c125b627c6e6912e6c078279d76b968d2e0969359c9420
-SIZE (openjdk-6-src-b16-24_apr_2009.tar.gz) = 49174493
+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 (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 --git a/java/openjdk6/files/cacerts b/java/openjdk6/files/cacerts
index 8f554ff8d158..5f998d1b7517 100644
--- a/java/openjdk6/files/cacerts
+++ b/java/openjdk6/files/cacerts
diff --git a/java/openjdk6/files/fontconfig.properties b/java/openjdk6/files/fontconfig.properties
new file mode 100644
index 000000000000..571d65280dd2
--- /dev/null
+++ b/java/openjdk6/files/fontconfig.properties
@@ -0,0 +1,188 @@
+# 
+# Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# Version
+
+# Uses FreeBSD Ports Tree fonts and file paths.
+version=1
+
+# Component Font Mappings
+
+dialog.plain.latin-1=DejaVu Sans
+dialog.plain.japanese-x0208=Sazanami Gothic
+dialog.plain.korean=Baekmuk Gulim
+dialog.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialog.bold.latin-1=DejaVu Sans Bold
+dialog.bold.japanese-x0208=Sazanami Gothic
+dialog.bold.korean=Baekmuk Gulim
+dialog.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialog.italic.latin-1=DejaVu Sans Oblique
+dialog.italic.japanese-x0208=Sazanami Gothic
+dialog.italic.korean=Baekmuk Gulim
+dialog.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
+dialog.bolditalic.japanese-x0208=Sazanami Gothic
+dialog.bolditalic.korean=Baekmuk Gulim
+dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+
+sansserif.plain.latin-1=DejaVu Sans
+sansserif.plain.japanese-x0208=Sazanami Gothic
+sansserif.plain.korean=Baekmuk Gulim
+sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+
+sansserif.bold.latin-1=DejaVu Sans Bold
+sansserif.bold.japanese-x0208=Sazanami Gothic
+sansserif.bold.korean=Baekmuk Gulim
+sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+
+sansserif.italic.latin-1=DejaVu Sans Oblique
+sansserif.italic.japanese-x0208=Sazanami Gothic
+sansserif.italic.korean=Baekmuk Gulim
+sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
+sansserif.bolditalic.japanese-x0208=Sazanami Gothic
+sansserif.bolditalic.korean=Baekmuk Gulim
+sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+
+serif.plain.latin-1=DejaVu Serif
+serif.plain.japanese-x0208=Sazanami Mincho
+serif.plain.korean=Baekmuk Batang
+serif.plain.chinese-big5=AR PL ZenKai Uni
+serif.plain.chinese-gb18030=AR PL ZenKai Uni
+
+serif.bold.latin-1=DejaVu Serif Bold
+serif.bold.japanese-x0208=Sazanami Mincho
+serif.bold.korean=Baekmuk Batang
+serif.bold.chinese-big5=AR PL ZenKai Uni
+serif.bold.chinese-gb18030=AR PL ZenKai Uni
+
+serif.italic.latin-1=DejaVu Serif Oblique
+serif.italic.japanese-x0208=Sazanami Mincho
+serif.italic.korean=Baekmuk Batang
+serif.italic.chinese-big5=AR PL ZenKai Uni
+serif.italic.chinese-gb18030=AR PL ZenKai Uni
+
+serif.bolditalic.latin-1=DejaVu Serif Bold Oblique
+serif.bolditalic.japanese-x0208=Sazanami Mincho
+serif.bolditalic.korean=Baekmuk Batang
+serif.bolditalic.chinese-big5=AR PL ZenKai Uni
+serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni
+
+
+monospaced.plain.latin-1=DejaVu Sans Mono
+monospaced.plain.japanese-x0208=Sazanami Gothic
+monospaced.plain.korean=Baekmuk Gulim
+monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+
+monospaced.bold.latin-1=DejaVu Sans Mono Bold
+monospaced.bold.japanese-x0208=Sazanami Gothic
+monospaced.bold.korean=Baekmuk Gulim
+monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+
+monospaced.italic.latin-1=DejaVu Sans Mono Oblique
+monospaced.italic.japanese-x0208=Sazanami Gothic
+monospaced.italic.korean=Baekmuk Gulim
+monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+monospaced.bolditalic.japanese-x0208=Sazanami Gothic
+monospaced.bolditalic.korean=Baekmuk Gulim
+monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+
+dialoginput.plain.latin-1=DejaVu Sans Mono
+dialoginput.plain.japanese-x0208=Sazanami Gothic
+dialoginput.plain.korean=Baekmuk Gulim
+dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialoginput.bold.latin-1=DejaVu Sans Mono Bold
+dialoginput.bold.japanese-x0208=Sazanami Gothic
+dialoginput.bold.korean=Baekmuk Gulim
+dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
+dialoginput.italic.japanese-x0208=Sazanami Gothic
+dialoginput.italic.korean=Baekmuk Gulim
+dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
+dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
+dialoginput.bolditalic.korean=Baekmuk Gulim
+dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni
+dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni
+
+# Search Sequences
+
+sequence.allfonts=latin-1
+sequence.allfonts.Big5=chinese-big5,latin-1
+sequence.allfonts.x-euc-jp-bsd=japanese-x0208,latin-1
+sequence.allfonts.EUC-KR=korean,latin-1
+sequence.allfonts.GB18030=chinese-gb18030,latin-1
+sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean
+
+# Font File Names
+
+filename.DejaVu_Sans=/usr/local/lib/X11/fonts/dejavu/DejaVuSans.ttf
+filename.DejaVu_Sans_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf
+filename.DejaVu_Sans_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-Oblique.ttf
+filename.DejaVu_Sans_Bold_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSans-BoldOblique.ttf
+
+filename.DejaVu_Sans_Mono=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono.ttf
+filename.DejaVu_Sans_Mono_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-Bold.ttf
+filename.DejaVu_Sans_Mono_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-Oblique.ttf
+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
+
+filename.DejaVu_Serif=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif.ttf
+filename.DejaVu_Serif_Bold=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-Bold.ttf
+filename.DejaVu_Serif_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-Oblique.ttf
+filename.DejaVu_Serif_Bold_Oblique=/usr/local/lib/X11/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
+
+filename.Sazanami_Gothic=/usr/local/lib/X11/fonts/TTF/sazanami-gothic.ttf
+filename.Sazanami_Mincho=/usr/local/lib/X11/fonts/TTF/sazanami-mincho.ttf
+filename.AR_PL_ShanHeiSun_Uni=/usr/local/share/fonts/TrueType/minguni.ttf
+#filename.AR_PL_ZenKai_Uni=/usr/local/lib/X11/fonts/chinese/TrueType/ukai.ttf
+#filename.Baekmuk_Gulim=/usr/local/lib/X11/fonts/korean/TrueType/gulim.ttf
+filename.Baekmuk_Batang=/usr/local/lib/X11/fonts/TrueType/UnBatang.ttf
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index 976c23c9fadb..4f047ac9e689 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -1,29 +1,28 @@
-/*
- * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-diff -uNpr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.gmk
---- ../orig/corba/make/common/Defs-bsd.gmk	2009-05-14 23:40:16.000000000 -0400
-+++ ./corba/make/common/Defs-bsd.gmk	2009-05-14 23:41:33.000000000 -0400
+diff -uNr ../orig/Makefile ./Makefile
+--- ../orig/Makefile	2009-10-14 10:12:12.000000000 -0700
++++ ./Makefile	2009-10-22 22:37:21.000000000 -0700
+@@ -159,6 +159,18 @@
+   clobber:: deploy-clobber
+ endif
+ 
++# Add location of iconv headers & libs
++ifeq ($(PLATFORM), bsd)
++  ifeq ($(OS_VENDOR), Apple)
++    OTHER_LDLIBS += -liconv
++  else
++    ifneq ($(OS_NAME), netbsd)
++      CPPFLAGS += -I$(PACKAGE_PATH)/include
++      OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
++    endif
++  endif
++endif
++
+ #
+ # 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
 @@ -40,18 +40,12 @@
  # Get shared JDK settings
  include $(BUILDDIR)/common/shared/Defs.gmk
@@ -44,7 +43,7 @@ diff -uNpr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.g
  PLATFORM_INCLUDE      = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
  
  # suffix used for make dependencies files.
-@@ -94,6 +88,10 @@ endif
+@@ -94,6 +88,10 @@
  #    as the default.
  CFLAGS_REQUIRED_amd64   += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
  CFLAGS_REQUIRED_i586    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
@@ -55,7 +54,7 @@ diff -uNpr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.g
  CFLAGS_REQUIRED_ia64    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
  CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
  LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
-@@ -168,7 +166,7 @@ ifeq ($(FASTDEBUG), true)
+@@ -168,7 +166,7 @@
    CXXFLAGS_DBG	+= $(CC_LOWER_OPT)
  endif
  
@@ -64,7 +63,7 @@ diff -uNpr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.g
  		  -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
  
  ifeq ($(ARCH_DATA_MODEL), 64)
-@@ -178,33 +176,15 @@ endif
+@@ -178,33 +176,15 @@
  CPPFLAGS_OPT    = 
  CPPFLAGS_DBG    = -DDEBUG
  
@@ -102,7 +101,7 @@ diff -uNpr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.g
  
  #
  # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
-@@ -235,13 +215,9 @@ endif
+@@ -235,13 +215,9 @@
  #
  LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
  
@@ -119,7 +118,7 @@ diff -uNpr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.g
  endif
  
  #
-@@ -270,7 +246,9 @@ override HAVE_ALTZONE            = false
+@@ -270,7 +246,9 @@
  override HAVE_FILIOH             = false
  override HAVE_GETHRTIME          = false
  override HAVE_GETHRVTIME         = false
@@ -129,7 +128,7 @@ diff -uNpr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.g
  override LEX_LIBRARY             = -lfl
  ifeq ($(STATIC_CXX),true)
  override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-@@ -281,13 +259,9 @@ override LIBPOSIX4               =
+@@ -281,13 +259,9 @@
  override LIBSOCKET               =
  override LIBTHREAD               =
  override MOOT_PRIORITIES         = true
@@ -145,10 +144,10 @@ diff -uNpr ../orig/corba/make/common/Defs-bsd.gmk ./corba/make/common/Defs-bsd.g
  override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
  override SUN_CMM_SUBDIR          =
  override THREADS_FLAG            = native
-diff -uNpr ../orig/corba/make/common/Defs-linux.gmk ./corba/make/common/Defs-linux.gmk
---- ../orig/corba/make/common/Defs-linux.gmk	2009-04-24 03:30:19.000000000 -0400
-+++ ./corba/make/common/Defs-linux.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -282,7 +282,7 @@ override LIBSOCKET               =
+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
+@@ -282,7 +282,7 @@
  override LIBTHREAD               =
  override MOOT_PRIORITIES         = true
  override NO_INTERRUPTIBLE_IO     = true
@@ -157,10 +156,10 @@ diff -uNpr ../orig/corba/make/common/Defs-linux.gmk ./corba/make/common/Defs-lin
  ifeq ($(ARCH), amd64)
  override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
  else
-diff -uNpr ../orig/corba/make/common/Defs.gmk ./corba/make/common/Defs.gmk
---- ../orig/corba/make/common/Defs.gmk	2009-04-24 03:30:19.000000000 -0400
-+++ ./corba/make/common/Defs.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -53,6 +53,24 @@ endif
+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
+@@ -53,6 +53,24 @@
  
  _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
  
@@ -185,7 +184,7 @@ diff -uNpr ../orig/corba/make/common/Defs.gmk ./corba/make/common/Defs.gmk
  #
  # Get platform definitions
  #
-@@ -97,6 +115,9 @@ ifdef PROGRAM
+@@ -97,6 +115,9 @@
      LDLIBS_COMMON = -ldl
    endif
  
@@ -195,10 +194,10 @@ diff -uNpr ../orig/corba/make/common/Defs.gmk ./corba/make/common/Defs.gmk
  endif # PROGRAM
  
  LDLIBS_COMMON += $(EXTRA_LIBS)
-diff -uNpr ../orig/corba/make/common/Mapfile-vers.gmk ./corba/make/common/Mapfile-vers.gmk
---- ../orig/corba/make/common/Mapfile-vers.gmk	2009-04-24 03:30:19.000000000 -0400
-+++ ./corba/make/common/Mapfile-vers.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -77,7 +77,7 @@ endif
+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
+@@ -77,7 +77,7 @@
  endif # PLATFORM
  
  
@@ -207,10 +206,10 @@ diff -uNpr ../orig/corba/make/common/Mapfile-vers.gmk ./corba/make/common/Mapfil
  
  ifeq ($(VARIANT), OPT)
    # OPT build MUST have a mapfile?
-diff -uNpr ../orig/corba/make/common/shared/Compiler-gcc.gmk ./corba/make/common/shared/Compiler-gcc.gmk
---- ../orig/corba/make/common/shared/Compiler-gcc.gmk	2009-04-24 03:30:19.000000000 -0400
-+++ ./corba/make/common/shared/Compiler-gcc.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -99,6 +99,24 @@ ifeq ($(PLATFORM), linux)
+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
+@@ -94,6 +94,24 @@
  
  endif
  
@@ -235,10 +234,10 @@ diff -uNpr ../orig/corba/make/common/shared/Compiler-gcc.gmk ./corba/make/common
  ifeq ($(PLATFORM), solaris)
  
    # Settings specific to Solaris
-diff -uNpr ../orig/corba/make/common/shared/Compiler.gmk ./corba/make/common/shared/Compiler.gmk
---- ../orig/corba/make/common/shared/Compiler.gmk	2009-04-24 03:30:19.000000000 -0400
-+++ ./corba/make/common/shared/Compiler.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -42,6 +42,11 @@ ifeq ($(PLATFORM), linux)
+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
+@@ -42,6 +42,11 @@
    override CC_VERSION = gcc
  endif
  
@@ -250,10 +249,10 @@ diff -uNpr ../orig/corba/make/common/shared/Compiler.gmk ./corba/make/common/sha
  # Get the compiler specific settings
  include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk
  
-diff -uNpr ../orig/corba/make/common/shared/Defs-bsd.gmk ./corba/make/common/shared/Defs-bsd.gmk
---- ../orig/corba/make/common/shared/Defs-bsd.gmk	2009-05-14 23:40:16.000000000 -0400
-+++ ./corba/make/common/shared/Defs-bsd.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -54,7 +54,7 @@ $(shell if [ "$1" != "" -a -d "$1" ]; th
+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
+@@ -54,7 +54,7 @@
  endef
  
  # Location on system where jdk installs might be
@@ -262,7 +261,7 @@ diff -uNpr ../orig/corba/make/common/shared/Defs-bsd.gmk ./corba/make/common/sha
  
  # UNIXCOMMAND_PATH: path to where the most common Unix commands are.
  #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-@@ -107,7 +107,7 @@ endif
+@@ -107,7 +107,7 @@
  ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
    DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
  else
@@ -271,10 +270,22 @@ diff -uNpr ../orig/corba/make/common/shared/Defs-bsd.gmk ./corba/make/common/sha
  endif
  
  # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-diff -uNpr ../orig/corba/make/common/shared/Defs-utils.gmk ./corba/make/common/shared/Defs-utils.gmk
---- ../orig/corba/make/common/shared/Defs-utils.gmk	2009-04-24 03:30:19.000000000 -0400
-+++ ./corba/make/common/shared/Defs-utils.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -53,6 +53,13 @@ ifeq ($(PLATFORM),linux)
+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
+@@ -38,7 +38,7 @@
+   #   Suspect this may not be needed anymore.
+   JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
+ else
+-  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
++  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m
+ endif
+ 
+ # 
+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
+@@ -53,6 +53,13 @@
    UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
  endif
  
@@ -288,7 +299,7 @@ diff -uNpr ../orig/corba/make/common/shared/Defs-utils.gmk ./corba/make/common/s
  ifeq ($(PLATFORM),solaris)
    UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
    UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
-@@ -209,3 +216,32 @@ ifeq ($(PLATFORM),solaris)
+@@ -199,3 +206,32 @@
    ECHO           = /usr/bin/echo
  endif
  
@@ -321,10 +332,10 @@ diff -uNpr ../orig/corba/make/common/shared/Defs-utils.gmk ./corba/make/common/s
 +    TAR        = $(UTILS_USR_BIN_PATH)tar
 +  endif
 +endif
-diff -uNpr ../orig/corba/make/common/shared/Platform.gmk ./corba/make/common/shared/Platform.gmk
---- ../orig/corba/make/common/shared/Platform.gmk	2009-04-24 03:30:19.000000000 -0400
-+++ ./corba/make/common/shared/Platform.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -262,6 +262,76 @@ ifeq ($(SYSTEM_UNAME), Linux)
+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
+@@ -262,6 +262,76 @@
    MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
  endif
  
@@ -401,7 +412,7 @@ diff -uNpr ../orig/corba/make/common/shared/Platform.gmk ./corba/make/common/sha
  # Windows with and without CYGWIN will be slightly different
  ifeq ($(SYSTEM_UNAME), Windows_NT)
    PLATFORM = windows
-@@ -373,7 +443,14 @@ endif
+@@ -373,7 +443,14 @@
  #    build machines and adjustments will be made to prevent excessing
  #    system swapping during the build.
  #    If we don't know, assume 512. Subtract 128 from MB for VM MAX.
@@ -417,7 +428,7 @@ diff -uNpr ../orig/corba/make/common/shared/Platform.gmk ./corba/make/common/sha
  ifneq ($(MB_OF_MEMORY),)
    LOW_MEMORY_MACHINE := $(shell \
      if [ $(MB_OF_MEMORY) -le 512 ] ; then \
-@@ -385,7 +462,7 @@ ifneq ($(MB_OF_MEMORY),)
+@@ -385,7 +462,7 @@
      if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
        expr $(MB_OF_MEMORY) '-' 128 ; \
      else \
@@ -426,10 +437,10 @@ diff -uNpr ../orig/corba/make/common/shared/Platform.gmk ./corba/make/common/sha
      fi)
    MIN_VM_MEMORY := $(shell \
      if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
-diff -uNpr ../orig/corba/make/sun/corba/core/Makefile ./corba/make/sun/corba/core/Makefile
---- ../orig/corba/make/sun/corba/core/Makefile	2009-04-24 03:30:19.000000000 -0400
-+++ ./corba/make/sun/corba/core/Makefile	2009-05-14 23:41:33.000000000 -0400
-@@ -53,11 +53,19 @@ include $(CORBA_JMK_DIRECTORY)sun_corba.
+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
+@@ -53,11 +53,19 @@
  ifdef STANDALONE_CORBA_WS
  # FIXUP: What is this all about?
  OTHER_LDFLAGS=-L$(BOOTDIR)/jre/lib/$(ARCH) -L$(BOOTDIR)/jre/lib/$(LIBARCH)/native_threads -ljvm
@@ -449,10 +460,10 @@ diff -uNpr ../orig/corba/make/sun/corba/core/Makefile ./corba/make/sun/corba/cor
  
  
  FILES_c = ioser.c
-diff -uNpr ../orig/hotspot/agent/make/Makefile ./hotspot/agent/make/Makefile
---- ../orig/hotspot/agent/make/Makefile	2009-04-24 03:30:48.000000000 -0400
-+++ ./hotspot/agent/make/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -52,6 +52,9 @@ sun.jvm.hotspot.code \
+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
+@@ -52,6 +52,9 @@
  sun.jvm.hotspot.compiler \
  sun.jvm.hotspot.debugger \
  sun.jvm.hotspot.debugger.amd64 \
@@ -462,7 +473,7 @@ diff -uNpr ../orig/hotspot/agent/make/Makefile ./hotspot/agent/make/Makefile
  sun.jvm.hotspot.debugger.cdbg \
  sun.jvm.hotspot.debugger.cdbg.basic \
  sun.jvm.hotspot.debugger.cdbg.basic.amd64 \
-@@ -94,6 +97,9 @@ sun.jvm.hotspot.memory \
+@@ -94,6 +97,9 @@
  sun.jvm.hotspot.oops \
  sun.jvm.hotspot.runtime \
  sun.jvm.hotspot.runtime.amd64 \
@@ -472,7 +483,7 @@ diff -uNpr ../orig/hotspot/agent/make/Makefile ./hotspot/agent/make/Makefile
  sun.jvm.hotspot.runtime.ia64 \
  sun.jvm.hotspot.runtime.linux \
  sun.jvm.hotspot.runtime.linux_amd64 \
-@@ -143,6 +149,9 @@ sun/jvm/hotspot/code/*.java \
+@@ -143,6 +149,9 @@
  sun/jvm/hotspot/compiler/*.java \
  sun/jvm/hotspot/debugger/*.java \
  sun/jvm/hotspot/debugger/amd64/*.java \
@@ -482,7 +493,7 @@ diff -uNpr ../orig/hotspot/agent/make/Makefile ./hotspot/agent/make/Makefile
  sun/jvm/hotspot/debugger/cdbg/*.java \
  sun/jvm/hotspot/debugger/cdbg/basic/*.java \
  sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
-@@ -178,6 +187,9 @@ sun/jvm/hotspot/memory/*.java \
+@@ -178,6 +187,9 @@
  sun/jvm/hotspot/oops/*.java \
  sun/jvm/hotspot/runtime/*.java \
  sun/jvm/hotspot/runtime/amd64/*.java \
@@ -492,18 +503,18 @@ diff -uNpr ../orig/hotspot/agent/make/Makefile ./hotspot/agent/make/Makefile
  sun/jvm/hotspot/runtime/ia64/*.java \
  sun/jvm/hotspot/runtime/linux/*.java \
  sun/jvm/hotspot/runtime/linux_amd64/*.java \
-diff -uNpr ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c
---- ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c	2009-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c	2009-05-14 23:41:34.000000000 -0400
-@@ -25,6 +25,7 @@
-  *  
+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
+@@ -22,6 +22,7 @@
+  *
   */
  
 +#include <stdlib.h>
  #include <jni.h>
  #include "libproc.h"
  
-@@ -76,7 +77,7 @@ JNIEXPORT void JNICALL Java_sun_jvm_hots
+@@ -73,7 +74,7 @@
    (JNIEnv *env, jclass cls) {
    jclass listClass;
  
@@ -512,7 +523,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c ./hotspot/agent/s
       THROW_NEW_DEBUGGER_EXCEPTION("can't initialize libproc");
    }
  
-@@ -278,7 +279,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_jv
+@@ -275,7 +276,7 @@
    bufPtr = (*env)->GetByteArrayElements(env, array, &isCopy);
    CHECK_EXCEPTION_(0);
  
@@ -521,7 +532,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c ./hotspot/agent/s
    (*env)->ReleaseByteArrayElements(env, array, bufPtr, 0);
    return (err == PS_OK)? array : 0;
  }
-@@ -286,11 +287,10 @@ JNIEXPORT jbyteArray JNICALL Java_sun_jv
+@@ -283,11 +284,10 @@
  JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0
    (JNIEnv *env, jobject this_obj, jint lwp_id) {
  
@@ -534,10 +545,10 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c ./hotspot/agent/s
  
    struct ps_prochandle* ph = get_proc_handle(env, this_obj);
    if (get_lwp_regs(ph, lwp_id, &gregs) != true) {
-@@ -320,26 +320,27 @@ JNIEXPORT jlongArray JNICALL Java_sun_jv
+@@ -317,21 +317,21 @@
  #ifdef i386
  #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg
-   
+ 
 -  regs[REG_INDEX(GS)]  = (uintptr_t) gregs.xgs;
 -  regs[REG_INDEX(FS)]  = (uintptr_t) gregs.xfs;
 -  regs[REG_INDEX(ES)]  = (uintptr_t) gregs.xes;
@@ -571,13 +582,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c ./hotspot/agent/s
  
  #endif /* i386 */
  
- #if ia64
-   regs = (*env)->GetLongArrayElements(env, array, &isCopy);
-+  int i;
-   for (i = 0; i < NPRGREG; i++ ) {
-     regs[i] = 0xDEADDEAD;
-   }
-@@ -348,31 +349,31 @@ JNIEXPORT jlongArray JNICALL Java_sun_jv
+@@ -345,31 +345,31 @@
  #ifdef amd64
  #define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg
  
@@ -634,9 +639,9 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c ./hotspot/agent/s
  
  #endif /* amd64 */
  
-diff -uNpr ../orig/hotspot/agent/src/os/bsd/Makefile ./hotspot/agent/src/os/bsd/Makefile
---- ../orig/hotspot/agent/src/os/bsd/Makefile	2009-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/Makefile	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -22,7 +22,7 @@
  #  
  #
@@ -646,7 +651,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/Makefile ./hotspot/agent/src/os/bsd/
  GCC      = gcc
  
  JAVAH    = ${JAVA_HOME}/bin/javah
-@@ -32,15 +32,16 @@ SOURCES  = salibelf.c   \
+@@ -32,15 +32,16 @@
  	libproc_impl.c  \
  	ps_proc.c       \
  	ps_core.c       \
@@ -667,7 +672,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/Makefile ./hotspot/agent/src/os/bsd/
  
  LIBSA = $(ARCH)/libsaproc.so
  
-@@ -49,8 +50,7 @@ all: $(LIBSA)
+@@ -49,8 +50,7 @@
  BsdDebuggerLocal.o: BsdDebuggerLocal.c
  	$(JAVAH) -jni -classpath ../../../build/classes  \
  		sun.jvm.hotspot.debugger.x86.X86ThreadContext \
@@ -677,7 +682,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/Makefile ./hotspot/agent/src/os/bsd/
  	$(GCC) $(CFLAGS) $<
  
  .c.obj:
-@@ -64,14 +64,15 @@ $(LIBSA): $(OBJS) mapfile
+@@ -64,14 +64,15 @@
  	if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi
  	$(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
  
@@ -697,21 +702,21 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/Makefile ./hotspot/agent/src/os/bsd/
 +	rm -f test.o
 +	-rmdir $(ARCH)
  
-diff -uNpr ../orig/hotspot/agent/src/os/bsd/elfmacros.h ./hotspot/agent/src/os/bsd/elfmacros.h
---- ../orig/hotspot/agent/src/os/bsd/elfmacros.h	2009-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/elfmacros.h	2009-05-14 23:41:34.000000000 -0400
-@@ -28,16 +28,19 @@
+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
+@@ -25,16 +25,19 @@
  #ifndef _ELFMACROS_H_
  #define _ELFMACROS_H_
  
 +#define ELF_NHDR	Elf_Note
 +
  #if defined(_LP64)
- #define ELF_EHDR    	Elf64_Ehdr
- #define ELF_SHDR 	Elf64_Shdr
- #define ELF_PHDR    	Elf64_Phdr
+ #define ELF_EHDR        Elf64_Ehdr
+ #define ELF_SHDR        Elf64_Shdr
+ #define ELF_PHDR        Elf64_Phdr
  #define ELF_SYM         Elf64_Sym
--#define ELF_NHDR	Elf64_Nhdr
+-#define ELF_NHDR        Elf64_Nhdr
  #define ELF_DYN         Elf64_Dyn
  #define ELF_ADDR        Elf64_Addr
  
@@ -721,11 +726,11 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/elfmacros.h ./hotspot/agent/src/os/b
  
  #else
  
-@@ -45,11 +48,12 @@
- #define ELF_SHDR 	Elf32_Shdr
- #define ELF_PHDR 	Elf32_Phdr
- #define ELF_SYM 	Elf32_Sym
--#define ELF_NHDR 	Elf32_Nhdr
+@@ -42,11 +45,12 @@
+ #define ELF_SHDR        Elf32_Shdr
+ #define ELF_PHDR        Elf32_Phdr
+ #define ELF_SYM         Elf32_Sym
+-#define ELF_NHDR        Elf32_Nhdr
  #define ELF_DYN         Elf32_Dyn
  #define ELF_ADDR        Elf32_Addr
  
@@ -733,11 +738,11 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/elfmacros.h ./hotspot/agent/src/os/b
  #define ELF_ST_TYPE     ELF32_ST_TYPE
 +#endif
  
- #endif 
+ #endif
  
-diff -uNpr ../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	1969-12-31 19:00:00.000000000 -0500
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -0,0 +1,217 @@
 +/* Copyright (C) 1993,1995-1997,2002,2005,2007,2008
 +   Free Software Foundation, Inc.
@@ -956,9 +961,9 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/hsearch_r.c ./hotspot/agent/src/os/b
 +  *retval = NULL;
 +  return 0;
 +}
-diff -uNpr ../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	1969-12-31 19:00:00.000000000 -0500
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -0,0 +1,42 @@
 +/* Declarations for System V style searching functions.
 +   Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
@@ -1002,10 +1007,10 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/hsearch_r.h ./hotspot/agent/src/os/b
 +extern void hdestroy_r (struct hsearch_data *__htab);
 +
 +#endif /* _HSEARCH_R_H_ */
-diff -uNpr ../orig/hotspot/agent/src/os/bsd/libproc.h ./hotspot/agent/src/os/bsd/libproc.h
---- ../orig/hotspot/agent/src/os/bsd/libproc.h	2009-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/libproc.h	2009-05-14 23:41:34.000000000 -0400
-@@ -30,7 +30,8 @@
+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
+@@ -27,7 +27,8 @@
  
  #include <unistd.h>
  #include <stdint.h>
@@ -1015,18 +1020,18 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/libproc.h ./hotspot/agent/src/os/bsd
  
  #if defined(sparc) || defined(sparcv9)
  /*
-@@ -53,14 +54,11 @@ Please note that the bulk of the functio
- adds Pgrab__ and some missing stuff. We hide the difference b/w live process and core 
+@@ -50,14 +51,11 @@
+ adds Pgrab__ and some missing stuff. We hide the difference b/w live process and core
  file by this interface.
  
 -1. pthread_id unique in both NPTL & BsdThreads. We store this in
--OSThread::_pthread_id in JVM code. 
+-OSThread::_pthread_id in JVM code.
 +1. pthread_id is unique. We store this in OSThread::_pthread_id in JVM code.
  
 -2. All threads see the same pid when they call getpid() under NPTL.
 -Threads receive different pid under BsdThreads. We used to save the result of
 -::getpid() call in OSThread::_thread_id. This way uniqueness of OSThread::_thread_id
--was lost under NPTL. Now, we store the result of ::gettid() call in 
+-was lost under NPTL. Now, we store the result of ::gettid() call in
 -OSThread::_thread_id. Because gettid returns actual pid of thread (lwp id), this is
 +2. All threads see the same pid when they call getpid().
 +We used to save the result of ::getpid() call in OSThread::_thread_id.
@@ -1034,7 +1039,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/libproc.h ./hotspot/agent/src/os/bsd
  unique again. We therefore use OSThread::_thread_id as unique identifier.
  
  3. There is a unique LWP id under both thread libraries. libthread_db  maps pthread_id
-@@ -77,19 +75,6 @@ combination of ptrace and /proc calls.
+@@ -74,19 +72,6 @@
  
  *************************************************************************************/
  
@@ -1053,39 +1058,41 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/libproc.h ./hotspot/agent/src/os/bsd
 -
  // This C bool type must be int for compatibility with Bsd calls and
  // it would be a mistake to equivalence it to C++ bool on many platforms
-   
-@@ -121,7 +106,7 @@ int get_num_threads(struct ps_prochandle
+ 
+@@ -118,7 +103,7 @@
  lwpid_t get_lwp_id(struct ps_prochandle* ph, int index);
  
  // get regs for a given lwp
 -bool get_lwp_regs(struct ps_prochandle* ph, lwpid_t lid, struct user_regs_struct* regs);
 +bool get_lwp_regs(struct ps_prochandle* ph, lwpid_t lid, struct reg* regs);
  
- // get number of shared objects 
+ // get number of shared objects
  int get_num_libs(struct ps_prochandle* ph);
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/libproc_impl.c	2009-05-14 23:41:34.000000000 -0400
-@@ -181,6 +181,9 @@ lib_info* add_lib_info_fd(struct ps_proc
+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
+@@ -177,8 +177,11 @@
+    newlib->symtab = build_symtab(newlib->fd);
     if (newlib->symtab == NULL) {
        print_debug("symbol table build failed for %s\n", newlib->name);
-    }
-+   else {
++   } else {
 +      print_debug("built symbol table for %s\n", newlib->name);
-+   }
+    }
  
++
     // even if symbol table building fails, we add the lib_info.
     // This is because we may need to read from the ELF file for core file
-@@ -275,7 +278,7 @@ static int thread_db_callback(const td_t
+    // address read functionality. lookup_symbol checks for NULL symtab.
+@@ -272,7 +275,7 @@
  
    print_debug("thread_db : pthread %d (lwp %d)\n", ti.ti_tid, ti.ti_lid);
-   
+ 
 -  if (ptr->callback(ptr->ph, ti.ti_tid, ti.ti_lid) != true)
 +  if (ptr->callback(ptr->ph, (pthread_t)ti.ti_tid, ti.ti_lid) != true)
      return TD_ERR;
  
    return TD_OK;
-@@ -327,7 +330,7 @@ lwpid_t get_lwp_id(struct ps_prochandle*
+@@ -324,7 +327,7 @@
  }
  
  // get regs for a given lwp
@@ -1094,32 +1101,20 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/libproc_impl.c ./hotspot/agent/src/o
    return ph->ops->get_lwp_regs(ph, lwp_id, regs);
  }
  
-@@ -378,11 +381,6 @@ bool find_lib(struct ps_prochandle* ph, 
- //--------------------------------------------------------------------------
+@@ -376,9 +379,9 @@
  // proc service functions
  
--// get process id
+ // get process id
 -pid_t ps_getpid(struct ps_prochandle *ph) {
 -   return ph->pid;
 -}
--
++// pid_t ps_getpid(struct ps_prochandle *ph) {
++//    return ph->pid;
++// }
+ 
  // ps_pglobal_lookup() looks up the symbol sym_name in the symbol table
  // of the load object object_name in the target process identified by ph.
- // It returns the symbol's value as an address in the target process in
-@@ -395,17 +393,33 @@ ps_err_e ps_pglobal_lookup(struct ps_pro
- }
- 
- // read "size" bytes info "buf" from address "addr"
--ps_err_e ps_pdread(struct ps_prochandle *ph, psaddr_t  addr,
-+ps_err_e ps_pread(struct ps_prochandle *ph, psaddr_t  addr,
-                    void *buf, size_t size) {
-   return ph->ops->p_pread(ph, (uintptr_t) addr, buf, size)? PS_OK: PS_ERR;
- }
- 
- // write "size" bytes of data to debuggee at address "addr"
--ps_err_e ps_pdwrite(struct ps_prochandle *ph, psaddr_t addr,
-+ps_err_e ps_pwrite(struct ps_prochandle *ph, psaddr_t addr,
-                     const void *buf, size_t size) {
+@@ -403,6 +406,24 @@
    return ph->ops->p_pwrite(ph, (uintptr_t)addr, buf, size)? PS_OK: PS_ERR;
  }
  
@@ -1139,29 +1134,36 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/libproc_impl.c ./hotspot/agent/src/o
 +  va_end(alist);
 +}
 +
++
++
  // ------------------------------------------------------------------------
  // Functions below this point are not yet implemented. They are here only
  // to make the linker happy.
-@@ -430,9 +444,12 @@ ps_err_e ps_lgetregs(struct ps_prochandl
-   return PS_OK;
+@@ -428,7 +449,18 @@
  }
  
--// new libthread_db of NPTL seem to require this symbol
+ // new libthread_db of NPTL seem to require this symbol
 -ps_err_e ps_get_thread_area() {
 -  print_debug("ps_get_thread_area not implemented\n");
++//ps_err_e ps_get_thread_area() {
++//  print_debug("ps_get_thread_area not implemented\n");
++//  return PS_OK;
++//}
++
 +ps_err_e ps_lstop(struct ps_prochandle *ph, lwpid_t lid) {
 +  print_debug("ps_lstop not implemented\n");
-   return PS_OK;
- }
- 
-+ps_err_e ps_pcontinue(struct ps_prochandle *ph) {
-+  print_debug("ps_pcontinue not implemented\n");
 +  return PS_OK;
 +}
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/libproc_impl.h	2009-05-14 23:41:34.000000000 -0400
-@@ -50,7 +50,7 @@ typedef struct lib_info {
++
++ps_err_e ps_pcontinue(struct ps_prochandle *ph) {
++  print_debug("ps_pcontinue not implemented\n");
+   return PS_OK;
+ }
++
+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
+@@ -47,7 +47,7 @@
  typedef struct thread_info {
     lwpid_t                  lwp_id;
     pthread_t                pthread_id; // not used cores, always -1
@@ -1170,7 +1172,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/libproc_impl.h ./hotspot/agent/src/o
     struct thread_info*      next;
  } thread_info;
  
-@@ -74,7 +74,9 @@ typedef struct ps_prochandle_ops {
+@@ -71,7 +71,9 @@
     bool (*p_pwrite)(struct ps_prochandle *ph,
              uintptr_t addr, const char *buf , size_t size);
     // get integer regset of a thread
@@ -1181,10 +1183,10 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/libproc_impl.h ./hotspot/agent/src/o
  } ps_prochandle_ops;
  
  // the ps_prochandle
-diff -uNpr ../orig/hotspot/agent/src/os/bsd/mapfile ./hotspot/agent/src/os/bsd/mapfile
---- ../orig/hotspot/agent/src/os/bsd/mapfile	2009-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/mapfile	2009-05-14 23:41:34.000000000 -0400
-@@ -43,15 +43,21 @@ SUNWprivate_1.1 {
+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
+@@ -41,15 +41,21 @@
  		Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0;
  	
  		# proc_service.h functions - to be used by libthread_db
@@ -1210,11 +1212,11 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/mapfile ./hotspot/agent/src/os/bsd/m
  
                  # used by attach test program
                  init_libproc;
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/proc_service.h	2009-05-14 23:41:34.000000000 -0400
-@@ -25,6 +25,8 @@
-  *  
+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
+@@ -22,6 +22,8 @@
+  *
   */
  
 +#error Should be using system proc_service.h
@@ -1222,11 +1224,11 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/proc_service.h ./hotspot/agent/src/o
  #ifndef _PROC_SERVICE_H_
  #define _PROC_SERVICE_H_
  
-@@ -58,11 +60,11 @@ ps_err_e ps_pglobal_lookup(struct ps_pro
+@@ -55,11 +57,11 @@
                      const char *sym_name, psaddr_t *sym_addr);
  
  // read "size" bytes of data from debuggee at address "addr"
--ps_err_e ps_pdread(struct ps_prochandle *ph, psaddr_t  addr, 
+-ps_err_e ps_pdread(struct ps_prochandle *ph, psaddr_t  addr,
 +ps_err_e ps_pread(struct ps_prochandle *ph, psaddr_t  addr, 
                     void *buf, size_t size);
  
@@ -1236,10 +1238,10 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/proc_service.h ./hotspot/agent/src/o
                      const void *buf, size_t size);
  
  ps_err_e ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lid, const prfpregset_t *fpregs);
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/ps_core.c	2009-05-14 23:41:34.000000000 -0400
-@@ -145,6 +145,7 @@ static map_info* add_class_share_map_inf
+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
+@@ -142,6 +142,7 @@
  
     map->next = ph->core->class_share_maps;
     ph->core->class_share_maps = map;
@@ -1247,7 +1249,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
  }
  
  // Return the map_info for the given virtual address.  We keep a sorted
-@@ -243,7 +244,7 @@ struct FileMapHeader {
+@@ -240,7 +241,7 @@
  
  static bool read_int(struct ps_prochandle* ph, uintptr_t addr, int* pvalue) {
     int i;
@@ -1256,7 +1258,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
        *pvalue = i;
        return true;
     } else {
-@@ -253,7 +254,7 @@ static bool read_int(struct ps_prochandl
+@@ -250,7 +251,7 @@
  
  static bool read_pointer(struct ps_prochandle* ph, uintptr_t addr, uintptr_t* pvalue) {
     uintptr_t uip;
@@ -1265,19 +1267,19 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
        *pvalue = uip;
        return true;
     } else {
-@@ -267,7 +268,7 @@ static bool read_string(struct ps_procha
+@@ -264,7 +265,7 @@
     char  c = ' ';
  
     while (c != '\0') {
 -     if (ps_pdread(ph, (psaddr_t) addr, &c, sizeof(char)) != PS_OK)
 +     if (ps_pread(ph, (psaddr_t) addr, &c, sizeof(char)) != PS_OK)
           return false;
-       if (i < size - 1) 
+       if (i < size - 1)
           buf[i] = c;
-@@ -507,24 +508,30 @@ static bool core_write_data(struct ps_pr
+@@ -504,12 +505,12 @@
  }
  
- static bool core_get_lwp_regs(struct ps_prochandle* ph, lwpid_t lwp_id, 
+ static bool core_get_lwp_regs(struct ps_prochandle* ph, lwpid_t lwp_id,
 -                          struct user_regs_struct* regs) {
 +                          struct reg* regs) {
     // for core we have cached the lwp regs from NOTE section
@@ -1289,31 +1291,23 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
         return true;
       }
       thr = thr->next;
-    }
+@@ -517,6 +518,13 @@
     return false;
  }
+ 
 +
 +static bool core_get_lwp_info(struct ps_prochandle *ph, lwpid_t lwp_id, void *linfo) {
 +   print_debug("core_get_lwp_info not implemented\n");
 +   return false;
 +}
-                           
++
++
  static ps_prochandle_ops core_ops = {
--   release:  core_release,
--   p_pread:  core_read_data,
--   p_pwrite: core_write_data,
--   get_lwp_regs: core_get_lwp_regs
-+   .release=  core_release,
-+   .p_pread=  core_read_data,
-+   .p_pwrite= core_write_data,
-+   .get_lwp_regs= core_get_lwp_regs,
-+   .get_lwp_info= core_get_lwp_info
- };
- 
- // read regs and create thread from NT_PRSTATUS entries from core file
-@@ -539,52 +546,52 @@ static bool core_handle_prstatus(struct 
+    .release=  core_release,
+    .p_pread=  core_read_data,
+@@ -536,52 +544,52 @@
        return false;
-     
+ 
     // copy regs
 -   memcpy(&newthr->regs, prstat->pr_reg, sizeof(struct user_regs_struct));
 +   memcpy(&newthr->regs, &prstat->pr_reg, sizeof(struct reg));
@@ -1324,8 +1318,8 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
        // print the regset
 -      print_debug("\teax = 0x%x\n", newthr->regs.eax);
 -      print_debug("\tebx = 0x%x\n", newthr->regs.ebx);
--      print_debug("\tecx = 0x%x\n", newthr->regs.ecx); 
--      print_debug("\tedx = 0x%x\n", newthr->regs.edx); 
+-      print_debug("\tecx = 0x%x\n", newthr->regs.ecx);
+-      print_debug("\tedx = 0x%x\n", newthr->regs.edx);
 -      print_debug("\tesp = 0x%x\n", newthr->regs.esp);
 -      print_debug("\tebp = 0x%x\n", newthr->regs.ebp);
 -      print_debug("\tesi = 0x%x\n", newthr->regs.esi);
@@ -1401,8 +1395,8 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
  #endif
     }
  
-@@ -826,7 +833,7 @@ static bool read_shared_lib_info(struct 
-    
+@@ -823,7 +831,7 @@
+ 
     dyn.d_tag = DT_NULL;
     while (dyn.d_tag != DT_DEBUG) {
 -      if (ps_pdread(ph, (psaddr_t) addr, &dyn, sizeof(ELF_DYN)) != PS_OK) {
@@ -1410,19 +1404,19 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
           print_debug("can't read debug info from _DYNAMIC\n");
           return false;
        }
-@@ -836,19 +843,23 @@ static bool read_shared_lib_info(struct 
+@@ -833,19 +841,23 @@
     // we have got Dyn entry with DT_DEBUG
     debug_base = dyn.d_un.d_ptr;
     // at debug_base we have struct r_debug. This has first link map in r_map field
--   if (ps_pdread(ph, (psaddr_t) debug_base + FIRST_LINK_MAP_OFFSET, 
+-   if (ps_pdread(ph, (psaddr_t) debug_base + FIRST_LINK_MAP_OFFSET,
 +   if (ps_pread(ph, (psaddr_t) debug_base + FIRST_LINK_MAP_OFFSET, 
- 		 &first_link_map_addr, sizeof(uintptr_t)) != PS_OK) {
+                  &first_link_map_addr, sizeof(uintptr_t)) != PS_OK) {
        print_debug("can't read first link map address\n");
        return false;
     }
  
     // read ld_base address from struct r_debug
--   if (ps_pdread(ph, (psaddr_t) debug_base + LD_BASE_OFFSET, &ld_base_addr, 
+-   if (ps_pdread(ph, (psaddr_t) debug_base + LD_BASE_OFFSET, &ld_base_addr,
 +   // XXX: There is no r_ldbase member on BSD
 +/*
 +   if (ps_pread(ph, (psaddr_t) debug_base + LD_BASE_OFFSET, &ld_base_addr, 
@@ -1436,33 +1430,33 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
  
     print_debug("interpreter base address is 0x%lx\n", ld_base_addr);
  
-@@ -870,14 +881,14 @@ static bool read_shared_lib_info(struct 
+@@ -867,14 +879,14 @@
        // address mentioned in shared object and the actual virtual base where runtime
        // linker loaded it. We use "base diff" in read_lib_segments call below.
-   
+ 
 -      if (ps_pdread(ph, (psaddr_t) link_map_addr + LINK_MAP_ADDR_OFFSET,
 +      if (ps_pread(ph, (psaddr_t) link_map_addr + LINK_MAP_ADDR_OFFSET,
                     &lib_base_diff, sizeof(uintptr_t)) != PS_OK) {
- 	 print_debug("can't read shared object base address diff\n");
+          print_debug("can't read shared object base address diff\n");
           return false;
        }
  
        // read address of the name
--      if (ps_pdread(ph, (psaddr_t) link_map_addr + LINK_MAP_NAME_OFFSET, 
+-      if (ps_pdread(ph, (psaddr_t) link_map_addr + LINK_MAP_NAME_OFFSET,
 +      if (ps_pread(ph, (psaddr_t) link_map_addr + LINK_MAP_NAME_OFFSET, 
                      &lib_name_addr, sizeof(uintptr_t)) != PS_OK) {
- 	 print_debug("can't read address of shared object name\n");
+          print_debug("can't read address of shared object name\n");
           return false;
-@@ -921,7 +932,7 @@ static bool read_shared_lib_info(struct 
+@@ -918,7 +930,7 @@
        }
-       
+ 
        // read next link_map address
 -      if (ps_pdread(ph, (psaddr_t) link_map_addr + LINK_MAP_NEXT_OFFSET,
 +      if (ps_pread(ph, (psaddr_t) link_map_addr + LINK_MAP_NEXT_OFFSET,
                          &link_map_addr, sizeof(uintptr_t)) != PS_OK) {
           print_debug("can't read next link in link_map\n");
           return false;
-@@ -935,7 +946,6 @@ static bool read_shared_lib_info(struct 
+@@ -932,7 +944,6 @@
  struct ps_prochandle* Pgrab_core(const char* exec_file, const char* core_file) {
     ELF_EHDR core_ehdr;
     ELF_EHDR exec_ehdr;
@@ -1470,11 +1464,11 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_core.c ./hotspot/agent/src/os/bsd
  
     struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
     if (ph == NULL) {
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c	2009-05-15 09:49:29.000000000 -0400
-@@ -25,20 +25,22 @@
-  *  
+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
+@@ -22,20 +22,22 @@
+  *
   */
  
 +#include <limits.h>
@@ -1499,12 +1493,12 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
 -
 -#ifndef __WALL
 -#define __WALL          0x40000000  // Copied from /usr/include/bsd/wait.h
--#endif 
+-#endif
 +#include "elfmacros.h"
  
  // This file has the libproc implementation specific to live process
  // For core files, refer to ps_core.c
-@@ -57,46 +59,46 @@ static inline uintptr_t align(uintptr_t 
+@@ -54,46 +56,46 @@
  // before calling process_read_data.
  
  static bool process_read_data(struct ps_prochandle* ph, uintptr_t addr, char *buf, size_t size) {
@@ -1526,9 +1520,9 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
        return false;
      }
      for (; aligned_addr != addr; aligned_addr++, ptr++);
--    for (; ((intptr_t)aligned_addr % sizeof(long)) && aligned_addr < end_addr; 
+-    for (; ((intptr_t)aligned_addr % sizeof(long)) && aligned_addr < end_addr;
 +    for (; ((intptr_t)aligned_addr % sizeof(int)) && aligned_addr < end_addr; 
-         aligned_addr++) 
+         aligned_addr++)
         *(buf++) = *(ptr++);
    }
  
@@ -1540,10 +1534,9 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
    for (i = 0; i < words; i++) {
      errno = 0;
 -    rslt = ptrace(PTRACE_PEEKDATA, ph->pid, aligned_addr, 0);
--    if (errno) { 
--      print_debug("ptrace(PTRACE_PEEKDATA, ..) failed for %d bytes @ %lx\n", size, addr);
 +    rslt = ptrace(PT_READ_D, ph->pid, (caddr_t) aligned_addr, 0);
-+    if (errno) {
+     if (errno) {
+-      print_debug("ptrace(PTRACE_PEEKDATA, ..) failed for %d bytes @ %lx\n", size, addr);
 +      print_debug("ptrace(PT_READ_D, ..) failed for %d bytes @ %lx\n", size, addr);
        return false;
      }
@@ -1565,8 +1558,8 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
 +      print_debug("ptrace(PT_READ_D, ..) failed for %d bytes @ %lx\n", size, addr);
        return false;
      }
-     for (; aligned_addr != end_addr; aligned_addr++) 
-@@ -111,45 +113,28 @@ static bool process_write_data(struct ps
+     for (; aligned_addr != end_addr; aligned_addr++)
+@@ -108,45 +110,28 @@
    return false;
  }
  
@@ -1605,7 +1598,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
 -#else
 - print_debug("ptrace(PTRACE_GETREGS, ...) not supported\n");
 - return false;
--#endif 
+-#endif
 +}
 +
 +// fill in ptrace_lwpinfo for lid
@@ -1623,18 +1616,18 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
      print_debug("ptrace(PTRACE_ATTACH, ..) failed for %d\n", pid);
      return false;
    } else {
-@@ -158,10 +143,6 @@ static bool ptrace_attach(pid_t pid) {
+@@ -155,10 +140,6 @@
      do {
-       // Wait for debuggee to stop. 
+       // Wait for debuggee to stop.
        ret = waitpid(pid, &status, 0);
 -      if (ret == -1 && errno == ECHILD) {
 -        // try cloned process.
 -        ret = waitpid(pid, &status, __WALL);
 -      }
        if (ret >= 0) {
- 	if (WIFSTOPPED(status)) {
- 	  // Debuggee stopped.
-@@ -194,85 +175,222 @@ static bool ptrace_attach(pid_t pid) {
+         if (WIFSTOPPED(status)) {
+           // Debuggee stopped.
+@@ -191,85 +172,222 @@
  // functions for obtaining library information
  // -------------------------------------------------------
  
@@ -1649,18 +1642,18 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
 -   int i;
 -   for(i = 0; i < n; i++) ptrs[i] = NULL;
 -   if (str == NULL || n < 1 ) return 0;
--   
+-
 -   i = 0;
 -
 -   // skipping leading blanks
 -   while(*str&&*str==delim) str++;
--   
+-
 -   while(*str&&i<n){
 -     ptrs[i++] = str;
 -     while(*str&&*str!=delim) str++;
 -     while(*str&&*str==delim) *(str++) = new_delim;
 -   }
--   
+-
 -   return i;
 +// callback for read_thread_info
 +static bool add_new_thread(struct ps_prochandle* ph, pthread_t pthread_id, lwpid_t lwp_id) {
@@ -1850,7 +1843,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
 +
 +  free(freep);
 +
-+  return true;
+   return true;
 +#else
 +  char *l_name;
 +  struct link_map *lmap;
@@ -1906,7 +1899,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
 +  free (l_name);
 +  free (lmap);
 +
-   return true;
++  return true;
 +#endif
  }
  
@@ -1917,8 +1910,8 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
      print_debug("ptrace(PTRACE_DETACH, ..) failed for %d\n", pid);
      return false;
    } else {
-@@ -280,24 +398,16 @@ static bool ptrace_detach(pid_t pid) {
-   } 
+@@ -277,17 +395,8 @@
+   }
  }
  
 -// detach all pids of a ps_prochandle
@@ -1936,19 +1929,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
  }
  
  static ps_prochandle_ops process_ops = {
--  release:  process_cleanup,
--  p_pread:  process_read_data,
--  p_pwrite: process_write_data,
--  get_lwp_regs: process_get_lwp_regs
-+  .release=  process_cleanup,
-+  .p_pread=  process_read_data,
-+  .p_pwrite= process_write_data,
-+  .get_lwp_regs= process_get_lwp_regs,
-+  .get_lwp_info= process_get_lwp_info
- };
- 
- // attach to the process. One and only one exposed stuff
-@@ -324,21 +434,14 @@ struct ps_prochandle* Pgrab(pid_t pid) {
+@@ -321,21 +430,14 @@
    // read library info and symbol tables, must do this before attaching threads,
    // as the symbols in the pthread library will be used to figure out
    // the list of threads within the same process.
@@ -1958,7 +1939,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
 +     free(ph);
 +     return NULL;
 +  }
-  
+ 
    // read thread info
    read_thread_info(ph, add_new_thread);
  
@@ -1975,10 +1956,10 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/ps_proc.c ./hotspot/agent/src/os/bsd
 -  }
    return ph;
  }
-diff -uNpr ../orig/hotspot/agent/src/os/bsd/salibelf.c ./hotspot/agent/src/os/bsd/salibelf.c
---- ../orig/hotspot/agent/src/os/bsd/salibelf.c	2009-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/salibelf.c	2009-05-14 23:41:34.000000000 -0400
-@@ -28,6 +28,7 @@
+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
+@@ -25,6 +25,7 @@
  #include "salibelf.h"
  #include <stdlib.h>
  #include <unistd.h>
@@ -1986,10 +1967,10 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/salibelf.c ./hotspot/agent/src/os/bs
  
  extern void print_debug(const char*,...);
  
-diff -uNpr ../orig/hotspot/agent/src/os/bsd/symtab.c ./hotspot/agent/src/os/bsd/symtab.c
---- ../orig/hotspot/agent/src/os/bsd/symtab.c	2009-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/symtab.c	2009-05-14 23:41:34.000000000 -0400
-@@ -26,13 +26,14 @@
+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
+@@ -23,13 +23,14 @@
   */
  
  #include <unistd.h>
@@ -2005,7 +1986,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/symtab.c ./hotspot/agent/src/os/bsd/
  
  // ----------------------------------------------------
  // functions for symbol lookups
-@@ -59,7 +60,6 @@ typedef struct symtab {
+@@ -56,7 +57,6 @@
  // read symbol table from given fd.
  struct symtab* build_symtab(int fd) {
    ELF_EHDR ehdr;
@@ -2013,7 +1994,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/symtab.c ./hotspot/agent/src/os/bsd/
    struct symtab* symtab = NULL;
  
    // Reading of elf header
-@@ -68,18 +68,22 @@ struct symtab* build_symtab(int fd) {
+@@ -65,18 +65,22 @@
    ELF_SHDR* shbuf = NULL;
    ELF_SHDR* cursct = NULL;
    ELF_PHDR* phbuf = NULL;
@@ -2037,7 +2018,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/symtab.c ./hotspot/agent/src/os/bsd/
      goto quit;
    }
  
-@@ -88,23 +92,35 @@ struct symtab* build_symtab(int fd) {
+@@ -85,23 +89,35 @@
    scn_cache = (struct elf_section *)
                calloc(ehdr.e_shnum * sizeof(struct elf_section), 1);
    if (scn_cache == NULL) {
@@ -2053,7 +2034,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/symtab.c ./hotspot/agent/src/os/bsd/
 +        cursct->sh_type == SHT_DYNSYM) {
        if ( (scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) {
 +         print_debug("can't read section_data\n");
-          goto quit; 
+          goto quit;
        }
      }
 +    if (cursct->sh_type == SHT_SYMTAB)
@@ -2075,7 +2056,7 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/symtab.c ./hotspot/agent/src/os/bsd/
        ELF_SYM  *syms;
        int j, n, rslt;
        size_t size;
-@@ -116,6 +132,7 @@ struct symtab* build_symtab(int fd) {
+@@ -113,6 +129,7 @@
        // guarantee(symtab == NULL, "multiple symtab");
        symtab = (struct symtab*)calloc(1, sizeof(struct symtab));
        if (symtab == NULL) {
@@ -2083,168 +2064,22 @@ diff -uNpr ../orig/hotspot/agent/src/os/bsd/symtab.c ./hotspot/agent/src/os/bsd/
           goto quit;
        }
        // the symbol table
-diff -uNpr ../orig/hotspot/agent/src/os/bsd/test.c ./hotspot/agent/src/os/bsd/test.c
---- ../orig/hotspot/agent/src/os/bsd/test.c	2009-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/os/bsd/test.c	2009-05-14 23:41:34.000000000 -0400
-@@ -47,7 +47,7 @@ int main(int argc, char** argv) {
+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
+@@ -44,7 +44,7 @@
        }
-   
+ 
        default: {
 -        printf("usage %s <pid> or %s <exec file> <core file>\n");
 +        fprintf(stderr, "usage %s <pid> or %s <exec file> <core file>\n");
          return 1;
        }
     }
-diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java
---- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	2009-04-24 03:30:48.000000000 -0400
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java	2009-05-14 23:41:34.000000000 -0400
-@@ -28,6 +28,7 @@ import java.io.PrintStream;
- import java.net.*;
- import java.rmi.*;
- import sun.jvm.hotspot.debugger.*;
-+import sun.jvm.hotspot.debugger.bsd.*;
- import sun.jvm.hotspot.debugger.dbx.*;
- import sun.jvm.hotspot.debugger.proc.*;
- import sun.jvm.hotspot.debugger.remote.*;
-@@ -337,6 +338,8 @@ public class HotSpotAgent {
-                 setupDebuggerWin32();
-             } else if (os.equals("linux")) {
-                 setupDebuggerLinux();
-+            } else if (os.equals("bsd")) {
-+                setupDebuggerBsd();
-             } else {
-                 // Add support for more operating systems here
-                 throw new DebuggerException("Operating system " + os + " not yet supported");
-@@ -392,6 +395,10 @@ public class HotSpotAgent {
-                 db = new HotSpotTypeDataBase(machDesc,
-                 new LinuxVtblAccess(debugger, jvmLibNames),
-                 debugger, jvmLibNames);
-+            } else if (os.equals("bsd")) {
-+                db = new HotSpotTypeDataBase(machDesc,
-+                new BsdVtblAccess(debugger, jvmLibNames),
-+                debugger, jvmLibNames);
-             } else {
-                 throw new DebuggerException("OS \"" + os + "\" not yet supported (no VtblAccess yet)");
-             }
-@@ -557,6 +564,8 @@ public class HotSpotAgent {
-             setupJVMLibNamesWin32();
-         } else if (os.equals("linux")) {
-             setupJVMLibNamesLinux();
-+        } else if (os.equals("bsd")) {
-+            setupJVMLibNamesBsd();
-         } else {
-             throw new RuntimeException("Unknown OS type");
-         }
-@@ -638,6 +647,31 @@ public class HotSpotAgent {
-         jvmLibNames = new String[] { "libjvm.so", "libjvm_g.so" };
-     }
-     
-+    //
-+    // BSD
-+    //
-+ 
-+    private void setupDebuggerBsd() {
-+        setupJVMLibNamesBsd();
-+
-+        if (cpu.equals("x86")) {
-+            machDesc = new MachineDescriptionIntelX86();
-+        } else if (cpu.equals("amd64")) {
-+            machDesc = new MachineDescriptionAMD64();
-+        } else {
-+            throw new DebuggerException("BSD only supported on x86/amd64");
-+        }
-+
-+        BsdDebuggerLocal dbg = new BsdDebuggerLocal(machDesc, !isServer);
-+        debugger = dbg;
-+
-+        attachDebugger();
-+    }
-+ 
-+    private void setupJVMLibNamesBsd() {
-+        jvmLibNames = new String[] { "libjvm.so", "libjvm_g.so" };
-+    }
-+ 
-     /** Convenience routine which should be called by per-platform
-       debugger setup. Should not be called when startupMode is
-       REMOTE_MODE. */
-diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java
---- ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	2009-04-24 03:30:49.000000000 -0400
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java	2009-05-14 23:41:34.000000000 -0400
-@@ -29,6 +29,7 @@ import java.net.*;
- import java.rmi.*;
- import sun.jvm.hotspot.*;
- import sun.jvm.hotspot.debugger.*;
-+import sun.jvm.hotspot.debugger.bsd.*;
- import sun.jvm.hotspot.debugger.dbx.*;
- import sun.jvm.hotspot.debugger.proc.*;
- import sun.jvm.hotspot.debugger.cdbg.*;
-@@ -516,6 +517,8 @@ public class BugSpotAgent {
-                 setupDebuggerWin32();
-             } else if (os.equals("linux")) {
-                 setupDebuggerLinux();
-+            } else if (os.equals("bsd")) {
-+                setupDebuggerBsd();
-             } else {
-                 // Add support for more operating systems here
-                 throw new DebuggerException("Operating system " + os + " not yet supported");
-@@ -567,6 +570,9 @@ public class BugSpotAgent {
-             } else if (os.equals("linux")) {
-                 db = new HotSpotTypeDataBase(machDesc, new LinuxVtblAccess(debugger, jvmLibNames),
-                 debugger, jvmLibNames);
-+            } else if (os.equals("bsd")) {
-+                db = new HotSpotTypeDataBase(machDesc, new BsdVtblAccess(debugger, jvmLibNames),
-+                debugger, jvmLibNames);
-             } else {
-                 throw new DebuggerException("OS \"" + os + "\" not yet supported (no VtblAccess implemented yet)");
-             }
-@@ -739,6 +745,8 @@ public class BugSpotAgent {
-             setupJVMLibNamesWin32();
-         } else if (os.equals("linux")) {
-             setupJVMLibNamesLinux();
-+        } else if (os.equals("bsd")) {
-+            setupJVMLibNamesBsd();
-         } else {
-             throw new RuntimeException("Unknown OS type");
-         }
-@@ -822,6 +830,34 @@ public class BugSpotAgent {
-         setupJVMLibNamesSolaris();
-     }
-     
-+    //
-+    // BSD
-+    //
-+
-+    private void setupDebuggerBsd() {
-+        setupJVMLibNamesBsd();
-+
-+        if (cpu.equals("x86")) {
-+            machDesc = new MachineDescriptionIntelX86();
-+        } else if (cpu.equals("amd64")) {
-+            machDesc = new MachineDescriptionAMD64();
-+        } else {
-+            throw new DebuggerException("Bsd only supported on x86/amd64");
-+        }
-+
-+        // Note we do not use a cache for the local debugger in server
-+        // mode; it will be taken care of on the client side (once remote
-+        // debugging is implemented).
-+
-+        debugger = new BsdDebuggerLocal(machDesc, !isServer);
-+        attachDebugger();
-+    }
-+
-+    private void setupJVMLibNamesBsd() {
-+        // same as solaris
-+        setupJVMLibNamesSolaris();
-+    }
-+
-     /** Convenience routine which should be called by per-platform
-       debugger setup. Should not be called when startupMode is
-       REMOTE_MODE. */
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java	2009-05-14 23:41:34.000000000 -0400
-@@ -30,10 +30,8 @@ import sun.jvm.hotspot.debugger.*;
+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
+@@ -30,10 +30,8 @@
  import sun.jvm.hotspot.debugger.cdbg.*;
  import sun.jvm.hotspot.debugger.x86.*;
  import sun.jvm.hotspot.debugger.amd64.*;
@@ -2255,7 +2090,7 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/
  import sun.jvm.hotspot.utilities.*;
  
  class BsdCDebugger implements CDebugger {
-@@ -99,13 +97,6 @@ class BsdCDebugger implements CDebugger 
+@@ -99,13 +97,6 @@
         Address pc  = context.getRegisterAsAddress(AMD64ThreadContext.RIP);
         if (pc == null) return null;
         return new BsdAMD64CFrame(dbg, rbp, pc);
@@ -2269,10 +2104,10 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/
      } else {
         throw new DebuggerException(cpu + " is not yet supported");
      }
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java	2009-05-14 23:41:34.000000000 -0400
-@@ -26,9 +26,7 @@ package sun.jvm.hotspot.debugger.bsd;
+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
+@@ -26,9 +26,7 @@
  
  import sun.jvm.hotspot.debugger.*;
  import sun.jvm.hotspot.debugger.bsd.amd64.*;
@@ -2282,7 +2117,7 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/
  
  class BsdThreadContextFactory {
     static ThreadContext createThreadContext(BsdDebugger dbg) {
-@@ -37,10 +35,6 @@ class BsdThreadContextFactory {
+@@ -37,10 +35,6 @@
           return new BsdX86ThreadContext(dbg);
        } else if (cpu.equals("amd64")) {
           return new BsdAMD64ThreadContext(dbg);
@@ -2293,10 +2128,10 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/
        } else {
           throw new RuntimeException("cpu " + cpu + " is not yet supported");
        }
-diff -uNpr ../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-04-24 03:30:51.000000000 -0400
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java	2009-05-14 23:41:34.000000000 -0400
-@@ -37,6 +37,8 @@ import sun.jvm.hotspot.runtime.linux_x86
+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
+@@ -37,6 +37,8 @@
  import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
  import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess;
  import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess;
@@ -2305,7 +2140,7 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threa
  import sun.jvm.hotspot.utilities.*;
  
  public class Threads {
-@@ -90,7 +92,12 @@ public class Threads {
+@@ -90,7 +92,12 @@
              } else if (cpu.equals("sparc")) {
                  access = new LinuxSPARCJavaThreadPDAccess();
              }
@@ -2317,12 +2152,12 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threa
 +                access = new BsdAMD64JavaThreadPDAccess();
 +            }
          }
-         
+ 
          if (access == null) {
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java	2009-05-15 09:51:39.000000000 -0400
-@@ -28,37 +28,36 @@ public class BsdSignals {
+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
+@@ -28,37 +28,36 @@
    private static String[] signalNames = {
      "",           /* No signal 0 */
      "SIGHUP",     /* hangup */
@@ -2382,10 +2217,10 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/B
    };
  
    public static String getSignalName(int sigNum) {
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java	2009-05-14 23:41:34.000000000 -0400
-@@ -32,33 +32,32 @@ public class BsdSignals {
+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
+@@ -32,33 +32,32 @@
      "SIGQUIT",    /* quit (ASCII FS) */
      "SIGILL",     /* illegal instruction (not reset when caught) */
      "SIGTRAP",    /* trace trap (not reset when caught) */
@@ -2438,10 +2273,10 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x
    };
  
    public static String getSignalName(int sigNum) {
-diff -uNpr ../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-04-24 03:30:51.000000000 -0400
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java	2009-05-14 23:41:34.000000000 -0400
-@@ -37,6 +37,14 @@ public class PlatformInfo {
+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
+@@ -37,6 +37,14 @@
        return "solaris";
      } else if (os.equals("Linux")) {
        return "linux";
@@ -2456,23 +2291,56 @@ diff -uNpr ../orig/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/Pla
      } else if (os.startsWith("Windows")) {
        return "win32";
      } else {
-diff -uNpr ../orig/hotspot/build/bsd/Makefile ./hotspot/build/bsd/Makefile
---- ../orig/hotspot/build/bsd/Makefile	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/Makefile	2009-05-14 23:41:33.000000000 -0400
-@@ -198,7 +198,8 @@ checks: check_os_version check_j2se_vers
+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
+@@ -265,6 +265,19 @@
+ 
+ # Shared Library
+ ifneq ($(OSNAME),windows)
++ifeq ($(OSNAME),bsd)
++# BSD-specific LIBRARY_SUFFIX build option
++$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
++	$(install-file)
++$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
++	$(install-file)
++$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
++	$(install-file)
++$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
++	$(install-file)
++$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
++	$(install-file)
++else
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
+ 	$(install-file)
+ $(EXPORT_CLIENT_DIR)/%.so:       $(C1_DIR)/%.so
+@@ -276,6 +289,7 @@
+ $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
+ 	$(install-file)
+ endif
++endif
+ 
+ # 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
+@@ -203,7 +203,10 @@
  # Solaris 2.5.1, 2.6).
  # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
  
 -SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
-+#SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
-+DISABLE_HOTSPOT_OS_VERSION_CHECK = ok
++#SUPPORTED_OS_VERSION = 6.% 7.% 8.%
++# Decided to allow all versions here, and limit using FreeBSD java/openjdk6
++# Makefile
++SUPPORTED_OS_VERSION = %
  OS_VERSION := $(shell uname -r)
  EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
  
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/buildtree.make ./hotspot/build/bsd/makefiles/buildtree.make
---- ../orig/hotspot/build/bsd/makefiles/buildtree.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/buildtree.make	2009-05-14 23:41:33.000000000 -0400
-@@ -273,10 +273,11 @@ env.sh: $(BUILDTREE_MAKE)
+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
+@@ -277,10 +277,11 @@
  	[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
  	{ \
  	echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
@@ -2485,10 +2353,10 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/buildtree.make ./hotspot/build/bs
  	) > $@
  
  env.csh: env.sh
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/cscope.make ./hotspot/build/bsd/makefiles/cscope.make
---- ../orig/hotspot/build/bsd/makefiles/cscope.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/cscope.make	2009-05-14 23:41:33.000000000 -0400
-@@ -72,7 +72,7 @@ endif
+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
+@@ -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.
  ifndef	CS_OS
@@ -2497,9 +2365,9 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/cscope.make ./hotspot/build/bsd/m
  CS_PRUNE_OS	= $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
  endif
  
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/defs.make ./hotspot/build/bsd/makefiles/defs.make
---- ../orig/hotspot/build/bsd/makefiles/defs.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/defs.make	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -28,6 +28,14 @@
  
  SLASH_JAVA ?= /java
@@ -2515,7 +2383,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/defs.make ./hotspot/build/bsd/mak
  # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
  ARCH:=$(shell uname -m)
  PATH_SEP = :
-@@ -79,6 +87,31 @@ ifeq ($(ARCH), x86_64) 
+@@ -79,6 +87,31 @@
    endif
  endif
  
@@ -2547,7 +2415,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/defs.make ./hotspot/build/bsd/mak
  # i686
  ifeq ($(ARCH), i686)
    ARCH_DATA_MODEL  = 32
-@@ -95,19 +128,13 @@ VM_DEBUG=jvmg
+@@ -95,19 +128,13 @@
  EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
  EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
@@ -2573,9 +2441,9 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/defs.make ./hotspot/build/bsd/mak
  endif
 +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
 +EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/gcc.make ./hotspot/build/bsd/makefiles/gcc.make
---- ../orig/hotspot/build/bsd/makefiles/gcc.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/gcc.make	2009-05-14 23:41:33.000000000 -0400
+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
 @@ -22,12 +22,15 @@
  #  
  #
@@ -2595,7 +2463,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/gcc.make ./hotspot/build/bsd/make
  
  # -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
  # prints the numbers (e.g. "2.95", "3.2.1")
-@@ -62,7 +65,7 @@ endif
+@@ -55,7 +58,7 @@
  CFLAGS += $(VM_PICFLAG)
  CFLAGS += -fno-rtti
  CFLAGS += -fno-exceptions
@@ -2604,7 +2472,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/gcc.make ./hotspot/build/bsd/make
  CFLAGS += -fcheck-new
  
  ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
-@@ -72,6 +75,15 @@ ARCHFLAG/ia64    =
+@@ -65,6 +68,15 @@
  ARCHFLAG/sparc   = -m32 -mcpu=v9
  ARCHFLAG/sparcv9 = -m64 -mcpu=v9
  
@@ -2620,7 +2488,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/gcc.make ./hotspot/build/bsd/make
  CFLAGS     += $(ARCHFLAG)
  AOUT_FLAGS += $(ARCHFLAG)
  LFLAGS     += $(ARCHFLAG)
-@@ -96,6 +108,11 @@ ACCEPTABLE_WARNINGS = -Wpointer-arith -W
+@@ -98,6 +110,11 @@
  CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
  # Special cases
  CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
@@ -2632,7 +2500,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/gcc.make ./hotspot/build/bsd/make
  
  # The flags to use for an Optimized g++ build
  OPT_CFLAGS += -O3
-@@ -126,20 +143,40 @@ ifeq ($(BUILDARCH), ia64)
+@@ -133,20 +150,40 @@
  LFLAGS += -Wl,-relax
  endif
  
@@ -2682,9 +2550,9 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/gcc.make ./hotspot/build/bsd/make
  
  #------------------------------------------------------------------------
  # Debug flags
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/jsig.make ./hotspot/build/bsd/makefiles/jsig.make
---- ../orig/hotspot/build/bsd/makefiles/jsig.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/jsig.make	2009-05-14 23:41:33.000000000 -0400
+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
 @@ -26,7 +26,12 @@
  
  # libjsig[_g].so: signal interposition library
@@ -2699,25 +2567,28 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/jsig.make ./hotspot/build/bsd/mak
  
  JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
  
-@@ -39,12 +44,12 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi
+@@ -39,7 +44,7 @@
  # cause problems with interposing. See CR: 6466665
  # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
  
 -LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT
 +LFLAGS_JSIG += -D_GNU_SOURCE -pthread
  
+ # DEBUG_BINARIES overrides everything, use full -g debug information
+ ifeq ($(DEBUG_BINARIES), true)
+@@ -49,7 +54,7 @@
  $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
  	@echo Making signal interposition lib...
  	$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
--                         $(LFLAGS_JSIG) -o $@ $< -ldl
-+                         $(LFLAGS_JSIG) -o $@ $<
+-                         $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
++                         $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
  
  install_jsig: $(LIBJSIG)
  	@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/launcher.make ./hotspot/build/bsd/makefiles/launcher.make
---- ../orig/hotspot/build/bsd/makefiles/launcher.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/launcher.make	2009-05-14 23:41:33.000000000 -0400
-@@ -44,7 +44,7 @@ ifeq ($(LINK_INTO),AOUT)
+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
+@@ -44,7 +44,7 @@
    LIBS_LAUNCHER             += $(STATIC_STDCXX) $(LIBS)
  else
    LAUNCHER.o                 = launcher.o
@@ -2726,21 +2597,23 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/launcher.make ./hotspot/build/bsd
    LIBS_LAUNCHER             += -l$(JVM) $(LIBS)
  endif
  
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/sa.make ./hotspot/build/bsd/makefiles/sa.make
---- ../orig/hotspot/build/bsd/makefiles/sa.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/sa.make	2009-05-14 23:41:33.000000000 -0400
-@@ -42,7 +42,7 @@ SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/too
+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
+@@ -42,8 +42,8 @@
  
  # gnumake 3.78.1 does not accept the *s that
- # are in AGENT_ALLFILES, so use the shell to expand them
--AGENT_ALLFILES := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_ALLFILES))
-+AGENT_ALLFILES := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_ALLFILES))
+ # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
+-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
+-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
++AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
++AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
  
  SA_CLASSDIR = $(GENERATED)/saclasses
  
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/saproc.make ./hotspot/build/bsd/makefiles/saproc.make
---- ../orig/hotspot/build/bsd/makefiles/saproc.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/saproc.make	2009-05-15 09:53:42.000000000 -0400
+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
 @@ -26,7 +26,12 @@
  
  # libsaproc[_g].so: serviceability agent
@@ -2755,7 +2628,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/saproc.make ./hotspot/build/bsd/m
  
  AGENT_DIR = $(GAMMADIR)/agent
  
-@@ -37,6 +42,7 @@ SASRCFILES = $(SASRCDIR)/salibelf.c     
+@@ -37,6 +42,7 @@
               $(SASRCDIR)/libproc_impl.c               \
               $(SASRCDIR)/ps_proc.c                    \
               $(SASRCDIR)/ps_core.c                    \
@@ -2763,7 +2636,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/saproc.make ./hotspot/build/bsd/m
               $(SASRCDIR)/BsdDebuggerLocal.c
  
  SAMAPFILE = $(SASRCDIR)/mapfile
-@@ -53,6 +59,25 @@ checkAndBuildSA:
+@@ -58,6 +64,25 @@
  
  SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE))
  
@@ -2789,27 +2662,28 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/saproc.make ./hotspot/build/bsd/m
  $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
  	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
  	  echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
-@@ -61,13 +86,14 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
+@@ -66,14 +91,15 @@
  	@echo Making SA debugger back-end...
  	$(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE                   \
                     $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG)     \
 -	           -I$(SASRCDIR)                                        \
-+	           $(INCSASRCDIR)                                       \
++	           $(INCSASRCDIR)                                        \
  	           -I$(GENERATED)                                       \
  	           -I$(BOOT_JAVA_HOME)/include                          \
 -	           -I$(BOOT_JAVA_HOME)/include/$(Platform_os_family)    \
 +	           -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") \
  	           $(SASRCFILES)                                        \
  	           $(SA_LFLAGS)                                         \
+ 	           $(SA_DEBUG_CFLAGS)                                   \
  	           -o $@                                                \
-+	           $(LIBUTIL)                                           \
++	           $(LIBUTIL)
  	           -lthread_db
  
  install_saproc: checkAndBuildSA
-diff -uNpr ../orig/hotspot/build/bsd/makefiles/vm.make ./hotspot/build/bsd/makefiles/vm.make
---- ../orig/hotspot/build/bsd/makefiles/vm.make	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/makefiles/vm.make	2009-05-14 23:41:33.000000000 -0400
-@@ -93,7 +93,7 @@ CFLAGS += $(CFLAGS/NOEX)
+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
+@@ -95,7 +95,7 @@
  # Extra flags from gnumake's invocation or environment
  CFLAGS += $(EXTRA_CFLAGS)
  
@@ -2818,7 +2692,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/vm.make ./hotspot/build/bsd/makef
  
  # By default, link the *.o into the library, not the executable.
  LINK_INTO$(LINK_INTO) = LIBJVM
-@@ -108,7 +108,11 @@ include $(MAKEFILES_DIR)/dtrace.make
+@@ -110,7 +110,11 @@
  # JVM
  
  JVM    = jvm$(G_SUFFIX)
@@ -2831,7 +2705,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/vm.make ./hotspot/build/bsd/makef
  
  JVM_OBJ_FILES = $(Obj_Files)
  
-@@ -122,7 +126,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
+@@ -124,7 +128,7 @@
  	rm -f $@
  	cat $^ > $@
  
@@ -2840,7 +2714,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/vm.make ./hotspot/build/bsd/makef
  
  ifeq ($(LINK_INTO),AOUT)
    LIBJVM.o                 =
-@@ -140,14 +144,14 @@ else
+@@ -142,14 +146,14 @@
    ifeq ($(STATIC_CXX), true)
      LFLAGS_VM              += $(STATIC_LIBGCC)
      LIBS_VM                += $(STATIC_STDCXX)
@@ -2857,7 +2731,7 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/vm.make ./hotspot/build/bsd/makef
  
  # rule for building precompiled header
  $(PRECOMPILED_HEADER): $(Precompiled_Files)
-@@ -175,11 +179,6 @@ $(LD_SCRIPT): $(LIBJVM_MAPFILE)
+@@ -177,11 +181,6 @@
  LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT)
  endif
  
@@ -2869,121 +2743,32 @@ diff -uNpr ../orig/hotspot/build/bsd/makefiles/vm.make ./hotspot/build/bsd/makef
  $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
  	$(QUIETLY) {                                                    \
  	    echo Linking vm...;                                         \
-@@ -188,15 +187,6 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE)
- 		       $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM);       \
- 	    $(LINK_LIB.CC/POST_HOOK)                                    \
- 	    rm -f $@.1; ln -s $@ $@.1;                                  \
--	    if [ -x /usr/sbin/sebsdenabled ] ; then                   \
--	      /usr/sbin/sebsdenabled;                                 \
--              if [ $$? = 0 ] ; then					\
--		/usr/bin/chcon -t textrel_shlib_t $@;                   \
--		if [ $$? != 0 ]; then                                   \
--		  echo "ERROR: Cannot chcon $@"; exit 1;                \
--		fi							\
--	      fi							\
--	    fi                                                          \
- 	}
- 
- DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
-diff -uNpr ../orig/hotspot/build/bsd/platform_amd64 ./hotspot/build/bsd/platform_amd64
---- ../orig/hotspot/build/bsd/platform_amd64	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/platform_amd64	2009-05-14 23:41:33.000000000 -0400
-@@ -12,6 +12,4 @@ lib_arch = amd64
+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
+@@ -12,4 +12,6 @@
  
  compiler = gcc
  
--gnu_dis_arch = amd64
--
 -sysdefs = -DLINUX -D_GNU_SOURCE -DAMD64
++gnu_dis_arch = amd64
++
 +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
-diff -uNpr ../orig/hotspot/build/bsd/platform_i486 ./hotspot/build/bsd/platform_i486
---- ../orig/hotspot/build/bsd/platform_i486	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/platform_i486	2009-05-14 23:41:33.000000000 -0400
-@@ -12,6 +12,4 @@ lib_arch = i386
+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
+@@ -12,4 +12,6 @@
  
  compiler = gcc
  
--gnu_dis_arch = i386
--
 -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32
++gnu_dis_arch = i386
++
 +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
-diff -uNpr ../orig/hotspot/build/bsd/platform_sparc ./hotspot/build/bsd/platform_sparc
---- ../orig/hotspot/build/bsd/platform_sparc	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/build/bsd/platform_sparc	2009-05-14 23:41:33.000000000 -0400
-@@ -12,6 +12,6 @@ lib_arch = sparc
- 
- compiler = gcc
- 
--gnu_dis_arch = sparc
-+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
- 
- sysdefs = -DLINUX -D_GNU_SOURCE -DSPARC
-diff -uNpr ../orig/hotspot/build/sa.files ./hotspot/build/sa.files
---- ../orig/hotspot/build/sa.files	2009-04-24 03:30:52.000000000 -0400
-+++ ./hotspot/build/sa.files	2009-05-14 23:41:34.000000000 -0400
-@@ -40,6 +40,7 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/HotSpot
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/HotSpotTypeDataBase.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/LinuxVtblAccess.java \
-+$(AGENT_SRC_DIR)/sun/jvm/hotspot/BsdVtblAccess.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/ObjectHistogram.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/RMIHelper.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/StackTrace.java \
-@@ -76,6 +77,9 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugge
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dbx/x86/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dummy/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \
-+$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \
-+$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/amd64/*.java \
-+$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/x86/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/ia64/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/linux/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/linux/amd64/*.java \
-@@ -110,6 +114,9 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/memory/
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/oops/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/amd64/*.java \
-+$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd/*.java \
-+$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd_amd64/*.java \
-+$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd_x86/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \
- $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \
-diff -uNpr ../orig/hotspot/make/Makefile ./hotspot/make/Makefile
---- ../orig/hotspot/make/Makefile	2009-04-24 03:30:52.000000000 -0400
-+++ ./hotspot/make/Makefile	2009-05-14 23:41:33.000000000 -0400
-@@ -262,6 +262,19 @@ endif
- 
- # Shared Library
- ifneq ($(OSNAME),windows)
-+ifeq ($(OSNAME),bsd)
-+# BSD-specific LIBRARY_SUFFIX build option
-+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
-+	$(install-file)
-+$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX):       $(C1_DIR)/%.$(LIBRARY_SUFFIX)
-+	$(install-file)
-+$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C1_DIR)/%.$(LIBRARY_SUFFIX)
-+	$(install-file)
-+$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX):       $(C2_DIR)/%.$(LIBRARY_SUFFIX)
-+	$(install-file)
-+$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX):    $(C2_DIR)/%.$(LIBRARY_SUFFIX)
-+	$(install-file)
-+else
- $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
- 	$(install-file)
- $(EXPORT_CLIENT_DIR)/%.so:       $(C1_DIR)/%.so
-@@ -273,6 +286,7 @@ $(EXPORT_SERVER_DIR)/%.so:       $(C2_DI
- $(EXPORT_SERVER_DIR)/64/%.so:    $(C2_DIR)/%.so
- 	$(install-file)
- endif
-+endif
- 
- # Jar file (sa-jdi.jar)
- $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
-diff -uNpr ../orig/hotspot/make/defs.make ./hotspot/make/defs.make
---- ../orig/hotspot/make/defs.make	2009-04-24 03:30:52.000000000 -0400
-+++ ./hotspot/make/defs.make	2009-05-14 23:41:33.000000000 -0400
-@@ -118,13 +118,23 @@ endif
+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
+@@ -119,13 +119,23 @@
  # Windows should have OS predefined
  ifeq ($(OS),)
    OS   := $(shell uname -s)
@@ -3009,20 +2794,34 @@ diff -uNpr ../orig/hotspot/make/defs.make ./hotspot/make/defs.make
    else
      OSNAME=solaris
    endif
-diff -uNpr ../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-04-24 03:30:53.000000000 -0400
-+++ ./hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -57,7 +57,7 @@ void InterpreterRuntime::SignatureHandle
-   __ cmpl(Address(from(), Interpreter::local_offset_in_bytes(from_offset)), 0); // do not use temp() to avoid AGI
-   Label L;
-   __ jcc(Assembler::notZero, L);
--  __ movl(temp(), 0);
-+  __ movl(temp(), NULL_WORD);
-   __ bind(L);
-   __ movl(Address(to(), to_offset * wordSize), temp());
- }
-@@ -113,7 +113,7 @@ class SlowSignatureHandler: public Nativ
-   virtual void pass_object() { 
+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
+@@ -59,6 +59,9 @@
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dbx/x86/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dummy/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/ia64/*.java \
++$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \
++$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/amd64/*.java \
++$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/x86/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/linux/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/linux/amd64/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/linux/ia64/*.java \
+@@ -95,6 +98,9 @@
+ AGENT_FILES2 = \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/amd64/*.java \
++$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd/*.java \
++$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd_amd64/*.java \
++$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd_x86/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \
+ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \
+diff -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
+@@ -110,7 +110,7 @@
+   virtual void pass_object() {
      // pass address of from
      intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0));
 -    *_to++ = (*(intptr_t*)from_addr == 0) ? NULL : from_addr;
@@ -3030,10 +2829,10 @@ diff -uNpr ../orig/hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp ./hotspot/src
      debug_only(verify_tag(frame::TagReference));
      _from -= Interpreter::stackElementSize();
     }
-diff -uNpr ../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-04-24 03:30:53.000000000 -0400
-+++ ./hotspot/src/cpu/x86/vm/jni_x86.h	2009-05-14 23:41:33.000000000 -0400
-@@ -29,7 +29,7 @@
+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
+@@ -26,7 +26,7 @@
  #ifndef _JAVASOFT_JNI_MD_H_
  #define _JAVASOFT_JNI_MD_H_
  
@@ -3042,123 +2841,105 @@ diff -uNpr ../orig/hotspot/src/cpu/x86/vm/jni_x86.h ./hotspot/src/cpu/x86/vm/jni
    #define JNIEXPORT
    #define JNIIMPORT
    #define JNICALL
-diff -uNpr ../orig/hotspot/src/cpu/x86/vm/runtime_x86_32.cpp ./hotspot/src/cpu/x86/vm/runtime_x86_32.cpp
---- ../orig/hotspot/src/cpu/x86/vm/runtime_x86_32.cpp	2009-04-24 03:30:53.000000000 -0400
-+++ ./hotspot/src/cpu/x86/vm/runtime_x86_32.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -132,11 +132,11 @@ void OptoRuntime::generate_exception_blo
-   // Get the exception pc in case we are deoptimized
-   __ movl(rdx, Address(rcx, JavaThread::exception_pc_offset()));
- #ifdef ASSERT
--  __ movl(Address(rcx, JavaThread::exception_handler_pc_offset()), 0);
--  __ movl(Address(rcx, JavaThread::exception_pc_offset()), 0); 
-+  __ movl(Address(rcx, JavaThread::exception_handler_pc_offset()), NULL_WORD);
-+  __ movl(Address(rcx, JavaThread::exception_pc_offset()), NULL_WORD); 
- #endif
-   // Clear the exception oop so GC no longer processes it as a root.
--  __ movl(Address(rcx, JavaThread::exception_oop_offset()), 0);
-+  __ movl(Address(rcx, JavaThread::exception_oop_offset()), NULL_WORD);
- 
-   __ popl(rcx);
- 
-diff -uNpr ../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-04-24 03:30:53.000000000 -0400
-+++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -472,7 +472,7 @@ class StubGenerator: public StubCodeGene
+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
+@@ -472,7 +472,7 @@
      // setup rax & rdx, remove return address & clear pending exception
-     __ popq(rdx);
-     __ movq(rax, Address(r15_thread, Thread::pending_exception_offset()));
+     __ pop(rdx);
+     __ movptr(rax, Address(r15_thread, Thread::pending_exception_offset()));
 -    __ movptr(Address(r15_thread, Thread::pending_exception_offset()), (int)NULL_WORD);
 +    __ movptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
  
  #ifdef ASSERT
      // make sure exception is set
-@@ -941,9 +941,9 @@ class StubGenerator: public StubCodeGene
+@@ -954,9 +954,9 @@
      __ jcc(Assembler::zero, exit); // if obj is NULL it is OK
      // Check if the oop is in the right area of memory
-     __ movq(c_rarg2, rax);
+     __ movptr(c_rarg2, rax);
 -    __ movptr(c_rarg3, (int64_t) Universe::verify_oop_mask());
 +    __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_mask());
-     __ andq(c_rarg2, c_rarg3);
+     __ andptr(c_rarg2, c_rarg3);
 -    __ movptr(c_rarg3, (int64_t) Universe::verify_oop_bits());
 +    __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_bits());
-     __ cmpq(c_rarg2, c_rarg3);
+     __ cmpptr(c_rarg2, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
-@@ -953,9 +953,9 @@ class StubGenerator: public StubCodeGene
+@@ -969,9 +969,9 @@
      __ jcc(Assembler::zero, error); // if klass is NULL it is broken
      // Check if the klass is in the right area of memory
-     __ movq(c_rarg2, rax);
+     __ mov(c_rarg2, rax);
 -    __ movptr(c_rarg3, (int64_t) Universe::verify_klass_mask());
 +    __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_mask());
-     __ andq(c_rarg2, c_rarg3);
+     __ andptr(c_rarg2, c_rarg3);
 -    __ movptr(c_rarg3, (int64_t) Universe::verify_klass_bits());
 +    __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_bits());
-     __ cmpq(c_rarg2, c_rarg3);
+     __ cmpptr(c_rarg2, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
-@@ -964,9 +964,9 @@ class StubGenerator: public StubCodeGene
-     __ testq(rax, rax);
+@@ -980,9 +980,9 @@
+     __ testptr(rax, rax);
      __ jcc(Assembler::zero, error); // if klass' klass is NULL it is broken
      // Check if the klass' klass is in the right area of memory
 -    __ movptr(c_rarg3, (int64_t) Universe::verify_klass_mask());
 +    __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_mask());
-     __ andq(rax, c_rarg3);
+     __ andptr(rax, c_rarg3);
 -    __ movptr(c_rarg3, (int64_t) Universe::verify_klass_bits());
 +    __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_bits());
-     __ cmpq(rax, c_rarg3);
+     __ cmpptr(rax, c_rarg3);
      __ jcc(Assembler::notZero, error);
  
-diff -uNpr ../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-04-24 03:30:53.000000000 -0400
-+++ ./hotspot/src/cpu/x86/vm/x86_32.ad	2009-05-14 23:41:33.000000000 -0400
-@@ -3364,7 +3364,7 @@ encode %{
-          masm.movl  (Address(boxReg, 0), 3) ;            // results in ST-before-CAS penalty
-          masm.get_thread (scrReg) ; 
-          masm.movl  (boxReg, tmpReg);                    // consider: LEA box, [tmp-2] 
--         masm.movl  (tmpReg, 0);                         // consider: xor vs mov
-+         masm.movl  (tmpReg, NULL_WORD);                         // consider: xor vs mov
-          if (os::is_MP()) { masm.lock(); } 
-          masm.cmpxchg (scrReg, Address(boxReg, ObjectMonitor::owner_offset_in_bytes()-2)) ; 
-       } else 
-@@ -3383,7 +3383,7 @@ encode %{
- 
-          if ((EmitSync & 64) == 0) { 
+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
+@@ -3371,7 +3371,7 @@
+          masm.movptr(Address(boxReg, 0), 3) ;            // results in ST-before-CAS penalty
+          masm.get_thread (scrReg) ;
+          masm.movptr(boxReg, tmpReg);                    // consider: LEA box, [tmp-2]
+-         masm.movptr(tmpReg, 0);                         // consider: xor vs mov
++         masm.movptr(tmpReg, NULL_WORD);                         // consider: xor vs mov
+          if (os::is_MP()) { masm.lock(); }
+          masm.cmpxchgptr(scrReg, Address(boxReg, ObjectMonitor::owner_offset_in_bytes()-2)) ;
+       } else
+@@ -3387,7 +3387,7 @@
+ 
+          if ((EmitSync & 64) == 0) {
             // Optimistic form: consider XORL tmpReg,tmpReg
--           masm.movl  (tmpReg, 0 ) ; 
-+           masm.movl  (tmpReg, NULL_WORD ) ; 
-          } else { 
+-           masm.movptr(tmpReg, 0 ) ;
++           masm.movptr(tmpReg, NULL_WORD ) ;
+          } else {
             // Can suffer RTS->RTO upgrades on shared or cold $ lines
             // Test-And-CAS instead of CAS
-@@ -3589,7 +3589,7 @@ encode %{
-          masm.orl   (boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ; 
-          masm.orl   (boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ; 
-          masm.jccb  (Assembler::notZero, DONE_LABEL) ; 
--         masm.movl  (Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ; 
-+         masm.movl  (Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ; 
-          masm.jmpb  (DONE_LABEL) ; 
-       } else { 
-          masm.xorl  (boxReg, Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2)) ;  
-@@ -3598,7 +3598,7 @@ encode %{
-          masm.movl  (boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ; 
-          masm.orl   (boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ; 
-          masm.jccb  (Assembler::notZero, CheckSucc) ; 
--         masm.movl  (Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ; 
-+         masm.movl  (Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ; 
-          masm.jmpb  (DONE_LABEL) ; 
+@@ -3587,7 +3587,7 @@
+          masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ;
+          masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ;
+          masm.jccb  (Assembler::notZero, DONE_LABEL) ;
+-         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
++         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
+          masm.jmpb  (DONE_LABEL) ;
+       } else {
+          masm.xorptr(boxReg, Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2)) ;
+@@ -3596,7 +3596,7 @@
+          masm.movptr(boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ;
+          masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ;
+          masm.jccb  (Assembler::notZero, CheckSucc) ;
+-         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
++         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
+          masm.jmpb  (DONE_LABEL) ;
        }
  
-@@ -3646,7 +3646,7 @@ encode %{
-          // We currently use (3), although it's likely that switching to (2) 
+@@ -3644,7 +3644,7 @@
+          // We currently use (3), although it's likely that switching to (2)
           // is correct for the future.
-             
--         masm.movl  (Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ; 
-+         masm.movl  (Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ; 
-          if (os::is_MP()) { 
-             if (VM_Version::supports_sse2() && 1 == FenceInstruction) { 
-               masm.emit_raw (0x0F) ;    // MFENCE ...
-diff -uNpr ../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-05-14 23:40:13.000000000 -0400
-+++ ./hotspot/src/os/bsd/launcher/java_md.c	2009-05-14 23:41:33.000000000 -0400
+ 
+-         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
++         masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
+          if (os::is_MP()) {
+             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
 @@ -45,8 +45,15 @@
  #include "version_comp.h"
  #endif
@@ -3175,16 +2956,16 @@ diff -uNpr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/la
  
  #ifndef GAMMA   /* launcher.make defines ARCH */
  
-@@ -112,7 +119,7 @@ extern char **environ;
+@@ -112,7 +119,7 @@
   *      A collection of useful strings. One should think of these as #define
   *      entries, but actual strings can be more efficient (with many compilers).
   */
 -#ifdef __bsd__
 +#ifdef _ALLBSD_SOURCE
- static const char *system_dir	= "/usr/java";
- static const char *user_dir	= "/java";
+ static const char *system_dir   = "/usr/java";
+ static const char *user_dir     = "/java";
  #else /* Solaris */
-@@ -456,10 +463,10 @@ CreateExecutionEnvironment(int *_argcp,
+@@ -456,10 +463,10 @@
         * If not on Solaris, assume only a single LD_LIBRARY_PATH
         * variable.
         */
@@ -3197,7 +2978,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/la
        /*
         * On bsd, if a binary is running as sgid or suid, glibc sets
         * LD_LIBRARY_PATH to the empty string for security purposes.  (In
-@@ -836,7 +843,7 @@ GetXUsagePath(char *buf, jint bufsize)
+@@ -836,7 +843,7 @@
  jboolean
  GetApplicationHome(char *buf, jint bufsize)
  {
@@ -3205,26 +2986,26 @@ diff -uNpr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/la
 +#ifdef _ALLBSD_SOURCE
      char *execname = GetExecname();
      if (execname) {
- 	strncpy(buf, execname, bufsize-1);
-@@ -1005,7 +1012,7 @@ SetExecname(char **argv)
- 	    }
+         strncpy(buf, execname, bufsize-1);
+@@ -1005,7 +1012,7 @@
+             }
          }
      }
 -#elif defined(__bsd__)
 +#elif defined(__linux__)
      {
- 	const char* self = "/proc/self/exe";
+         const char* self = "/proc/self/exe";
          char buf[PATH_MAX+1];
-@@ -1015,7 +1022,7 @@ SetExecname(char **argv)
- 	    exec_path = strdup(buf);
- 	}
+@@ -1015,7 +1022,7 @@
+             exec_path = strdup(buf);
+         }
      }
 -#else /* !__sun && !__bsd */
 +#else /* !__sun && !__linux */
      {
          /* Not implemented */
      }
-@@ -1220,7 +1227,7 @@ get_cpuid(uint32_t arg,
+@@ -1220,7 +1227,7 @@
  
  #endif /* __sun && i586 */
  
@@ -3233,7 +3014,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/la
  
  /*
   * A utility method for asking the CPU about itself.
-@@ -1286,7 +1293,7 @@ get_cpuid(uint32_t arg,
+@@ -1286,7 +1293,7 @@
  #endif
  }
  
@@ -3241,8 +3022,8 @@ diff -uNpr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/la
 +#endif /* _ALLBSD_SOURCE && i586 */
  
  #ifdef i586
- /* 
-@@ -1465,7 +1472,7 @@ solaris_i586_ServerClassMachine(void) {
+ /*
+@@ -1465,7 +1472,7 @@
  
  #endif /* __sun && i586 */
  
@@ -3251,7 +3032,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/la
  
  /* The definition of a server-class machine for bsd-i586 */
  jboolean
-@@ -1496,7 +1503,7 @@ bsd_i586_ServerClassMachine(void) {
+@@ -1496,7 +1503,7 @@
    return result;
  }
  
@@ -3260,7 +3041,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/la
  
  /* Dispatch to the platform-specific definition of "server-class" */
  jboolean
-@@ -1506,7 +1513,7 @@ ServerClassMachine(void) {
+@@ -1506,7 +1513,7 @@
    result = solaris_sparc_ServerClassMachine();
  #elif defined(__sun) && defined(i586)
    result = solaris_i586_ServerClassMachine();
@@ -3269,10 +3050,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/launcher/java_md.c ./hotspot/src/os/bsd/la
    result = bsd_i586_ServerClassMachine();
  #else
    if (_launcher_debug) {
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp	2009-05-14 23:41:34.000000000 -0400
-@@ -182,32 +182,20 @@ int BsdAttachListener::init() {
+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
+@@ -179,32 +179,20 @@
    struct sockaddr_un addr;
    addr.sun_family = AF_UNIX;
  
@@ -3292,7 +3073,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp ./hotspot/src/os
 -    sprintf(path, "%s/.java_pid%d", os::get_temp_directory(), os::current_process_id());
 -    strcpy(addr.sun_path, path);
 -    ::unlink(path);
--    res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr)); 
+-    res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr));
 -  }
 +
 +  sprintf(path, "%s/.java_pid%d", os::get_temp_directory(), os::current_process_id());
@@ -3305,7 +3086,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp ./hotspot/src/os
    }
    set_path(path);
  
--  // put in listen mode and set permission 
+-  // put in listen mode and set permission
 -  if ((::listen(listener, 5) == -1) || (::chmod(path, S_IREAD|S_IWRITE) == -1)) {
 +  // put in listen mode and set permission and ownership
 +  if ((::listen(listener, 5) == -1) || (::chmod(path, S_IREAD|S_IWRITE) == -1) ||
@@ -3313,7 +3094,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp ./hotspot/src/os
      RESTARTABLE(::close(listener), res);
      ::unlink(path);
      set_path(NULL);
-@@ -333,6 +321,15 @@ BsdAttachOperation* BsdAttachListener::d
+@@ -330,6 +318,15 @@
  
      // get the credentials of the peer and check the effective uid/guid
      // - check with jeff on this.
@@ -3329,7 +3110,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp ./hotspot/src/os
      struct ucred cred_info;
      socklen_t optlen = sizeof(cred_info);
      if (::getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void*)&cred_info, &optlen) == -1) {
-@@ -340,10 +337,13 @@ BsdAttachOperation* BsdAttachListener::d
+@@ -337,10 +334,13 @@
        RESTARTABLE(::close(s), res);
        continue;
      }
@@ -3344,7 +3125,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp ./hotspot/src/os
        int res;
        RESTARTABLE(::close(s), res);
        continue;
-@@ -463,15 +463,12 @@ bool AttachListener::is_init_trigger() {
+@@ -460,15 +460,12 @@
    if (init_at_startup() || is_initialized()) {
      return false;               // initialized at startup or already initialized
    }
@@ -3365,10 +3146,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/attachListener_bsd.cpp ./hotspot/src/os
    if (ret == 0) {
      // simple check to avoid starting the attach mechanism when
      // a bogus user creates the file
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -31,6 +31,14 @@
+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
+@@ -28,6 +28,14 @@
  # include <sys/param.h>
  # include <dlfcn.h>
  
@@ -3383,9 +3164,9 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/hpi_bsd.cpp ./hotspot/src/os/bsd/vm/hpi
  typedef jint (JNICALL *init_t)(GetInterfaceFunc *, void *);
  
  void hpi::initialize_get_interface(vm_calls_t *callbacks) {
-@@ -48,11 +56,11 @@ void hpi::initialize_get_interface(vm_ca
+@@ -45,11 +53,11 @@
        os::jvm_path(buf, JVM_MAXPATHLEN);
-       
+ 
  #ifdef PRODUCT
 -      const char * hpi_lib = "/libhpi.so";
 +      const char * hpi_lib = "/" HPI_LIB;
@@ -3397,10 +3178,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/hpi_bsd.cpp ./hotspot/src/os/bsd/vm/hpi
  #endif
  
        *(strrchr(buf, '/')) = '\0';  /* get rid of /libjvm.so */
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -39,26 +39,22 @@
+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
+@@ -36,7 +36,7 @@
  // HPI_FileInterface
  
  inline int hpi::close(int fd) {
@@ -3409,20 +3190,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/hpi_bsd.hpp ./hotspot/src/os/bsd/vm/hpi
  }
  
  inline size_t hpi::read(int fd, void *buf, unsigned int nBytes) {
--  size_t res;
--  RESTARTABLE( (size_t) ::read(fd, buf, (size_t) nBytes), res);
--  return res;
-+  INTERRUPTIBLE_RETURN_INT(::read(fd, buf, (size_t) nBytes), os::Bsd::clear_interrupted);
- }
- 
- inline size_t hpi::write(int fd, const void *buf, unsigned int nBytes) {
--  size_t res;
--  RESTARTABLE((size_t) ::write(fd, buf, (size_t) nBytes), res);
--  return res;
-+  INTERRUPTIBLE_RETURN_INT(::write(fd, buf, (size_t) nBytes), os::Bsd::clear_interrupted);
- }
- 
- 
+@@ -55,7 +55,7 @@
  // HPI_SocketInterface
  
  inline int hpi::socket_close(int fd) {
@@ -3431,87 +3199,23 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/hpi_bsd.hpp ./hotspot/src/os/bsd/vm/hpi
  }
  
  inline int hpi::socket(int domain, int type, int protocol) {
-@@ -66,11 +62,11 @@ inline int hpi::socket(int domain, int t
- }
- 
- inline int hpi::recv(int fd, char *buf, int nBytes, int flags) {
--  RESTARTABLE_RETURN_INT(::recv(fd, buf, nBytes, (unsigned int) flags));
-+  INTERRUPTIBLE_RETURN_INT(::recv(fd, buf, nBytes, (unsigned int) flags), os::Bsd::clear_interrupted);
- }
- 
- inline int hpi::send(int fd, char *buf, int nBytes, int flags) {
--  RESTARTABLE_RETURN_INT(::send(fd, buf, nBytes, (unsigned int) flags));
-+  INTERRUPTIBLE_RETURN_INT(::send(fd, buf, nBytes, (unsigned int) flags), os::Bsd::clear_interrupted);
- }
- 
- inline int hpi::timeout(int fd, long timeout) {
-@@ -81,12 +77,13 @@ inline int hpi::timeout(int fd, long tim
-   prevtime = ((julong)t.tv_sec * 1000)  +  t.tv_usec / 1000;
- 
-   for(;;) {
-+    int res;
-     struct pollfd pfd;
- 
-     pfd.fd = fd;
-     pfd.events = POLLIN | POLLERR;
-   
--    int res = ::poll(&pfd, 1, timeout);
-+    INTERRUPTIBLE_NORESTART(::poll(&pfd, 1, timeout), res, os::Bsd::clear_interrupted);
- 
-     if (res == OS_ERR && errno == EINTR) {
- 
-@@ -110,7 +107,26 @@ inline int hpi::listen(int fd, int count
- }
- 
- inline int hpi::connect(int fd, struct sockaddr *him, int len) {
--  RESTARTABLE_RETURN_INT(::connect(fd, him, len));
-+  do {
-+    int _result;
-+    INTERRUPTIBLE_NORESTART(::connect(fd, him, len), _result,
-+                           os::Bsd::clear_interrupted);
-+
-+    // Depending on when thread interruption is reset, _result could be
-+    // one of two values when errno == EINTR
-+
-+    if (((_result == OS_INTRPT) || (_result == OS_ERR)) && (errno == EINTR)) {
-+      /* restarting a connect() changes its errno semantics */
-+      INTERRUPTIBLE(::connect(fd, him, len), _result,
-+                     os::Bsd::clear_interrupted);
-+      /* undo these changes */
-+      if (_result == OS_ERR) {
-+       if (errno == EALREADY) errno = EINPROGRESS; /* fall through */
-+       else if (errno == EISCONN) { errno = 0; return OS_OK; }
-+      }
-+    }
-+    return _result;
-+  } while(false);
- }
- 
- inline int hpi::accept(int fd, struct sockaddr *him, int *len) {
-@@ -121,26 +137,33 @@ inline int hpi::accept(int fd, struct so
+@@ -120,9 +120,9 @@
+   // fetch it's value, this cast is safe for now. The java.net group
+   // may need and want to change this interface someday if socklen_t goes
    // to 64 bits on some platform that we support.
-   // Bsd doc says this can't return EINTR, unlike accept() on Solaris
+-  // Bsd doc says this can't return EINTR, unlike accept() on Solaris
++  // At least OpenBSD and FreeBSD can return EINTR from accept.
  
 -  return ::accept(fd, him, (socklen_t *)len);
-+  if (fd < 0)
-+    return OS_ERR;
-+  INTERRUPTIBLE_RETURN_INT((int)::accept(fd, him, (socklen_t*) len), os::Bsd::clear_interrupted);
++  RESTARTABLE_RETURN_INT(::accept(fd, him, (socklen_t *)len));
  }
  
  inline int hpi::recvfrom(int fd, char *buf, int nBytes, int flags,
- 		         sockaddr *from, int *fromlen) {
--  RESTARTABLE_RETURN_INT(::recvfrom(fd, buf, nBytes, (unsigned int) flags, from, (socklen_t *)fromlen));
-+  INTERRUPTIBLE_RETURN_INT((int)::recvfrom(fd, buf, nBytes, (unsigned int) flags, from, (socklen_t *)fromlen), os::Bsd::clear_interrupted);
- }
- 
- inline int hpi::sendto(int fd, char *buf, int len, int flags,
- 			struct sockaddr *to, int tolen) {
--  RESTARTABLE_RETURN_INT(::sendto(fd, buf, len, (unsigned int) flags, to, tolen));
-+  INTERRUPTIBLE_RETURN_INT((int)::sendto(fd, buf, len, (unsigned int) flags, to, tolen),os::Bsd::clear_interrupted);
+@@ -136,12 +136,16 @@
  }
  
  inline int hpi::socket_available(int fd, jint *pbytes) {
-   // Bsd doc says EINTR not returned, unlike Solaris
+-  // Bsd doc says EINTR not returned, unlike Solaris
 -  int ret = ::ioctl(fd, FIONREAD, pbytes);
 +  int ret;
 +
@@ -3527,19 +3231,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/hpi_bsd.hpp ./hotspot/src/os/bsd/vm/hpi
  }
  
  
-@@ -167,7 +190,7 @@ HPIDECL(bind, "bind", _socket, Bind, 
-         (fd, him, len));
- */
- inline int hpi::bind(int fd, struct sockaddr *him, int len){
--  return ::bind(fd, him, len);
-+  INTERRUPTIBLE_RETURN_INT_NORESTART(::bind(fd, him, len),os::Bsd::clear_interrupted);
- }
- 
- /*
-diff -uNpr ../orig/hotspot/src/os/bsd/vm/jsig.c ./hotspot/src/os/bsd/vm/jsig.c
---- ../orig/hotspot/src/os/bsd/vm/jsig.c	2009-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/jsig.c	2009-05-14 23:41:33.000000000 -0400
-@@ -146,7 +146,8 @@ sa_handler_t signal(int sig, sa_handler_
+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
+@@ -143,7 +143,8 @@
  }
  
  sa_handler_t sigset(int sig, sa_handler_t disp) {
@@ -3549,58 +3244,58 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/jsig.c ./hotspot/src/os/bsd/vm/jsig.c
   }
  
  static int call_os_sigaction(int sig, const struct sigaction  *act,
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -141,44 +141,37 @@ struct siglabel {
+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
+@@ -138,44 +138,37 @@
  
  struct siglabel siglabels[] = {
    /* derived from /usr/include/bits/signum.h on RH7.2 */
--   "HUP",	SIGHUP,		/* Hangup (POSIX).  */
+-   "HUP",       SIGHUP,         /* Hangup (POSIX).  */
 +  "HUP",	SIGHUP,		/* Hangup (POSIX).  */
-   "INT",	SIGINT,		/* Interrupt (ANSI).  */
-   "QUIT",	SIGQUIT,	/* Quit (POSIX).  */
-   "ILL",	SIGILL,		/* Illegal instruction (ANSI).  */
-   "TRAP",	SIGTRAP,	/* Trace trap (POSIX).  */
-   "ABRT",	SIGABRT,	/* Abort (ANSI).  */
--  "IOT",	SIGIOT,		/* IOT trap (4.2 BSD).  */
--  "BUS",	SIGBUS,		/* BUS error (4.2 BSD).  */
+   "INT",        SIGINT,         /* Interrupt (ANSI).  */
+   "QUIT",       SIGQUIT,        /* Quit (POSIX).  */
+   "ILL",        SIGILL,         /* Illegal instruction (ANSI).  */
+   "TRAP",       SIGTRAP,        /* Trace trap (POSIX).  */
+   "ABRT",       SIGABRT,        /* Abort (ANSI).  */
+-  "IOT",        SIGIOT,         /* IOT trap (4.2 BSD).  */
+-  "BUS",        SIGBUS,         /* BUS error (4.2 BSD).  */
 +  "EMT",	SIGEMT,		/* EMT trap  */
-   "FPE",	SIGFPE,		/* Floating-point exception (ANSI).  */
-   "KILL",	SIGKILL,	/* Kill, unblockable (POSIX).  */
--  "USR1",	SIGUSR1,	/* User-defined signal 1 (POSIX).  */
+   "FPE",        SIGFPE,         /* Floating-point exception (ANSI).  */
+   "KILL",       SIGKILL,        /* Kill, unblockable (POSIX).  */
+-  "USR1",       SIGUSR1,        /* User-defined signal 1 (POSIX).  */
 +  "BUS",	SIGBUS,		/* BUS error (4.2 BSD).  */
-   "SEGV",	SIGSEGV,	/* Segmentation violation (ANSI).  */
--  "USR2",	SIGUSR2,	/* User-defined signal 2 (POSIX).  */
+   "SEGV",       SIGSEGV,        /* Segmentation violation (ANSI).  */
+-  "USR2",       SIGUSR2,        /* User-defined signal 2 (POSIX).  */
 +  "SYS",	SIGSYS,		/* Bad system call. Only on some Bsden! */
-   "PIPE",	SIGPIPE,	/* Broken pipe (POSIX).  */
-   "ALRM",	SIGALRM,	/* Alarm clock (POSIX).  */
-   "TERM",	SIGTERM,	/* Termination (ANSI).  */
+   "PIPE",       SIGPIPE,        /* Broken pipe (POSIX).  */
+   "ALRM",       SIGALRM,        /* Alarm clock (POSIX).  */
+   "TERM",       SIGTERM,        /* Termination (ANSI).  */
 -#ifdef SIGSTKFLT
--  "STKFLT",	SIGSTKFLT,	/* Stack fault.  */
+-  "STKFLT",     SIGSTKFLT,      /* Stack fault.  */
 -#endif
--  "CLD",	SIGCLD,		/* Same as SIGCHLD (System V).  */
--  "CHLD",	SIGCHLD,	/* Child status has changed (POSIX).  */
--  "CONT",	SIGCONT,	/* Continue (POSIX).  */
+-  "CLD",        SIGCLD,         /* Same as SIGCHLD (System V).  */
+-  "CHLD",       SIGCHLD,        /* Child status has changed (POSIX).  */
+-  "CONT",       SIGCONT,        /* Continue (POSIX).  */
 +  "URG",	SIGURG,		/* Urgent condition on socket (4.2 BSD).  */
-   "STOP",	SIGSTOP,	/* Stop, unblockable (POSIX).  */
-   "TSTP",	SIGTSTP,	/* Keyboard stop (POSIX).  */
+   "STOP",       SIGSTOP,        /* Stop, unblockable (POSIX).  */
+   "TSTP",       SIGTSTP,        /* Keyboard stop (POSIX).  */
 +  "CONT",	SIGCONT,	/* Continue (POSIX).  */
 +  "CHLD",	SIGCHLD,	/* Child status has changed (POSIX).  */
-   "TTIN",	SIGTTIN,	/* Background read from tty (POSIX).  */
-   "TTOU",	SIGTTOU,	/* Background write to tty (POSIX).  */
--  "URG",	SIGURG,		/* Urgent condition on socket (4.2 BSD).  */
+   "TTIN",       SIGTTIN,        /* Background read from tty (POSIX).  */
+   "TTOU",       SIGTTOU,        /* Background write to tty (POSIX).  */
+-  "URG",        SIGURG,         /* Urgent condition on socket (4.2 BSD).  */
 +  "IO",		SIGIO,		/* I/O now possible (4.2 BSD).  */
-   "XCPU",	SIGXCPU,	/* CPU limit exceeded (4.2 BSD).  */
-   "XFSZ",	SIGXFSZ,	/* File size limit exceeded (4.2 BSD).  */
-   "VTALRM",	SIGVTALRM,	/* Virtual alarm clock (4.2 BSD).  */
-   "PROF",	SIGPROF,	/* Profiling alarm clock (4.2 BSD).  */
-   "WINCH",	SIGWINCH,	/* Window size change (4.3 BSD, Sun).  */
--  "POLL",	SIGPOLL,	/* Pollable event occurred (System V).  */
--  "IO",		SIGIO,		/* I/O now possible (4.2 BSD).  */
--  "PWR",	SIGPWR,		/* Power failure restart (System V).  */
+   "XCPU",       SIGXCPU,        /* CPU limit exceeded (4.2 BSD).  */
+   "XFSZ",       SIGXFSZ,        /* File size limit exceeded (4.2 BSD).  */
+   "VTALRM",     SIGVTALRM,      /* Virtual alarm clock (4.2 BSD).  */
+   "PROF",       SIGPROF,        /* Profiling alarm clock (4.2 BSD).  */
+   "WINCH",      SIGWINCH,       /* Window size change (4.3 BSD, Sun).  */
+-  "POLL",       SIGPOLL,        /* Pollable event occurred (System V).  */
+-  "IO",         SIGIO,          /* I/O now possible (4.2 BSD).  */
+-  "PWR",        SIGPWR,         /* Power failure restart (System V).  */
 -#ifdef SIGSYS
--  "SYS",	SIGSYS		/* Bad system call. Only on some Bsden! */
+-  "SYS",        SIGSYS          /* Bad system call. Only on some Bsden! */
 -#endif
 +  "INFO",	SIGINFO,	/* Information request.  */
 +  "USR1",	SIGUSR1,	/* User-defined signal 1 (POSIX).  */
@@ -3608,10 +3303,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/jvm_bsd.cpp ./hotspot/src/os/bsd/vm/jvm
    };
  
  JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h	2009-05-14 23:41:33.000000000 -0400
-@@ -54,7 +54,11 @@
+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
+@@ -51,7 +51,11 @@
  #define AGENT_ONATTACH_SYMBOLS  {"Agent_OnAttach"}
  
  #define JNI_LIB_PREFIX "lib"
@@ -3623,7 +3318,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/jvm_bsd.h ./hotspot/src/os/bsd/vm/jvm_b
  
  // Hack: MAXPATHLEN is 4095 on some Bsd and 4096 on others. This may
  //       cause problems if JVM and the rest of JDK are built on different
-@@ -93,6 +97,20 @@
+@@ -90,6 +94,20 @@
  #define SHUTDOWN2_SIGNAL SIGINT
  #define SHUTDOWN3_SIGNAL SIGTERM
  
@@ -3644,10 +3339,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/jvm_bsd.h ./hotspot/src/os/bsd/vm/jvm_b
  #endif /* JVM_MD_H */
  
  // Reconciliation History
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -31,8 +31,8 @@
+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
+@@ -28,8 +28,8 @@
  
  void OSThread::pd_initialize() {
    assert(this != NULL, "check");
@@ -3658,10 +3353,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.cpp ./hotspot/src/os/bsd/v
    _siginfo = NULL;
    _ucontext = NULL;
    _expanding_stack = 0;
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -39,6 +39,12 @@
+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
+@@ -36,6 +36,12 @@
  
   private:
  
@@ -3674,7 +3369,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp ./hotspot/src/os/bsd/v
    // _thread_id is kernel thread id (similar to LWP id on Solaris). Each
    // thread has a unique thread_id (BsdThreads or NPTL). It can be used
    // to access /proc.
-@@ -47,6 +53,7 @@
+@@ -44,6 +50,7 @@
    // _pthread_id is the pthread id, which is used by library calls
    // (e.g. pthread_kill).
    pthread_t _pthread_id;
@@ -3682,7 +3377,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp ./hotspot/src/os/bsd/v
  
    sigset_t _caller_sigmask; // Caller's signal mask
  
-@@ -56,12 +63,18 @@
+@@ -53,12 +60,18 @@
    sigset_t  caller_sigmask() const       { return _caller_sigmask; }
    void    set_caller_sigmask(sigset_t sigmask)  { _caller_sigmask = sigmask; }
  
@@ -3702,7 +3397,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp ./hotspot/src/os/bsd/v
  #endif
  #ifdef ASSERT
    // We expect no reposition failures so kill vm if we get one.
-@@ -70,9 +83,15 @@
+@@ -67,9 +80,15 @@
      return false;
    }
  #endif // ASSERT
@@ -3718,7 +3413,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp ./hotspot/src/os/bsd/v
    pthread_t pthread_id() const {
      return _pthread_id;
    }
-@@ -123,6 +142,9 @@ public:
+@@ -120,6 +139,9 @@
  
  private:
    Monitor* _startThread_lock;     // sync parent and child in thread creation
@@ -3728,7 +3423,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp ./hotspot/src/os/bsd/v
  
  public:
  
-@@ -130,6 +152,11 @@ public:
+@@ -127,6 +149,11 @@
      return _startThread_lock;
    }
  
@@ -3740,10 +3435,16 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/osThread_bsd.hpp ./hotspot/src/os/bsd/v
    // ***************************************************************
    // Platform dependent initialization and cleanup
    // ***************************************************************
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -50,12 +50,33 @@
+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
+@@ -42,17 +42,39 @@
+ # include <sys/utsname.h>
+ # include <sys/socket.h>
+ # include <sys/wait.h>
++# include <time.h>
+ # include <pwd.h>
+ # include <poll.h>
  # include <semaphore.h>
  # include <fcntl.h>
  # include <string.h>
@@ -3762,7 +3463,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  # include <link.h>
 +#endif
 +
-+#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
 +# include <elf.h>
 +#endif
 +
@@ -3777,7 +3478,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  #define MAX_PATH    (2 * K)
  
-@@ -67,19 +88,25 @@
+@@ -64,19 +86,25 @@
  // global variables
  julong os::Bsd::_physical_memory = 0;
  
@@ -3803,85 +3504,16 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  static jlong initial_time_count=0;
  
-@@ -97,6 +124,77 @@ static pid_t _initial_pid = 0;
+@@ -94,8 +122,6 @@
  static int SR_signum = SIGUSR2;
  sigset_t SR_sigset;
  
-+#ifdef _ALLBSD_SOURCE
-+// XXXBSD: ported from solaris version
-+// interruptible infrastructure
-+
-+// setup_interruptible saves the thread state before going into an
-+// interruptible system call.  
-+// The saved state is used to restore the thread to
-+// its former state whether or not an interrupt is received.  
-+// Used by classloader os::read 
-+// hpi calls skip this layer and stay in _thread_in_native
-+
-+void os::Bsd::setup_interruptible(JavaThread* thread) {
-+ 
-+  JavaThreadState thread_state = thread->thread_state();
-+
-+  assert(thread_state != _thread_blocked, "Coming from the wrong thread");
-+  assert(thread_state != _thread_in_native, "Native threads skip setup_interruptible");
-+  OSThread* osthread = thread->osthread();
-+  osthread->set_saved_interrupt_thread_state(thread_state);
-+  thread->frame_anchor()->make_walkable(thread);
-+  ThreadStateTransition::transition(thread, thread_state, _thread_blocked);
-+}
-+
-+// Version of setup_interruptible() for threads that are already in
-+// _thread_blocked. Used by os_sleep().
-+void os::Bsd::setup_interruptible_already_blocked(JavaThread* thread) {
-+  thread->frame_anchor()->make_walkable(thread);
-+}
-+
-+JavaThread* os::Bsd::setup_interruptible() {
-+  JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();
-+  setup_interruptible(thread);
-+  return thread;
-+}
-+
-+#ifdef ASSERT
-+
-+JavaThread* os::Bsd::setup_interruptible_native() {
-+  JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread();
-+  JavaThreadState thread_state = thread->thread_state();
-+  assert(thread_state == _thread_in_native, "Assumed thread_in_native");
-+  return thread;
-+}
-+
-+void os::Bsd::cleanup_interruptible_native(JavaThread* thread) {
-+  JavaThreadState thread_state = thread->thread_state();
-+  assert(thread_state == _thread_in_native, "Assumed thread_in_native");
-+}
-+#endif
-+
-+// cleanup_interruptible reverses the effects of setup_interruptible
-+// setup_interruptible_already_blocked() does not need any cleanup.
-+
-+void os::Bsd::cleanup_interruptible(JavaThread* thread) {
-+  OSThread* osthread = thread->osthread();
-+
-+  ThreadStateTransition::transition(thread, _thread_blocked, osthread->saved_interrupt_thread_state());
-+}
-+
-+// I/O interruption related counters called in _INTERRUPTIBLE
-+
-+void os::Bsd::bump_interrupted_before_count() {
-+  RuntimeService::record_interrupted_before_count();
-+}
-+
-+void os::Bsd::bump_interrupted_during_count() {
-+  RuntimeService::record_interrupted_during_count();
-+}
-+#endif
-+
-+
+-/* Used to protect dlsym() calls */
+-static pthread_mutex_t dl_mutex;
+ 
  ////////////////////////////////////////////////////////////////////////////////
  // utility functions
- 
-@@ -108,11 +206,17 @@ julong os::available_memory() {
+@@ -108,11 +134,16 @@
  }
  
  julong os::Bsd::available_memory() {
@@ -3889,17 +3521,16 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
 +  // XXXBSD: this is just a stopgap implementation
 +  return physical_memory() >> 2;
 +#else
-+
    // values in struct sysinfo are "unsigned long"
    struct sysinfo si;
    sysinfo(&si);
-   
+ 
    return (julong)si.freeram * si.mem_unit;
 +#endif
  }
  
  julong os::physical_memory() {
-@@ -160,6 +264,7 @@ bool os::have_special_privileges() {
+@@ -160,6 +191,7 @@
  }
  
  
@@ -3907,7 +3538,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  #ifndef SYS_gettid
  // i386: 224, ia64: 1105, amd64: 186, sparc 143
  #ifdef __ia64__
-@@ -174,6 +279,7 @@ bool os::have_special_privileges() {
+@@ -174,6 +206,7 @@
  #error define gettid for the arch
  #endif
  #endif
@@ -3915,7 +3546,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  // Cpu architecture string
  #if   defined(IA64)
-@@ -193,6 +299,7 @@ static char cpu_arch[] = "sparc";
+@@ -193,6 +226,7 @@
  #endif
  
  
@@ -3923,10 +3554,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  // pid_t gettid()
  //
  // Returns the kernel thread id of the currently running thread. Kernel
-@@ -219,7 +326,47 @@ static bool unsafe_chroot_detected = fal
+@@ -219,7 +253,47 @@
  static const char *unstable_chroot_error = "/proc file system not found.\n"
-                     "Java may be unstable running multithreaded in a chroot "
-                     "environment on Bsd when /proc filesystem is not mounted.";
+                      "Java may be unstable running multithreaded in a chroot "
+                      "environment on Bsd when /proc filesystem is not mounted.";
 +#endif
  
 +#ifdef _ALLBSD_SOURCE
@@ -3971,7 +3602,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  void os::Bsd::initialize_system_info() {
    _processor_count = sysconf(_SC_NPROCESSORS_CONF);
    if (_processor_count == 1) {
-@@ -236,6 +383,7 @@ void os::Bsd::initialize_system_info() {
+@@ -236,6 +310,7 @@
    _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
    assert(_processor_count > 0, "bsd error");
  }
@@ -3979,20 +3610,29 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  void os::init_system_properties_values() {
  //  char arch[12];
-@@ -356,7 +504,12 @@ void os::init_system_properties_values()
- 	 * should always exist (until the legacy problem cited above is
- 	 * addressed).
- 	 */
+@@ -279,7 +354,9 @@
+  *        ...
+  *        7: The default directories, normally /lib and /usr/lib.
+  */
++#ifndef DEFAULT_LIBPATH
+ #define DEFAULT_LIBPATH "/lib:/usr/lib"
++#endif
+ 
+ #define EXTENSIONS_DIR  "/lib/ext"
+ #define ENDORSED_DIR    "/lib/endorsed"
+@@ -356,7 +433,11 @@
+          * should always exist (until the legacy problem cited above is
+          * addressed).
+          */
 +#ifdef __APPLE__
-+   char *v = getenv("DYLD_LIBRARY_PATH");
++        char *v = getenv("DYLD_LIBRARY_PATH");
 +#else
- 	char *v = getenv("LD_LIBRARY_PATH");
+         char *v = getenv("LD_LIBRARY_PATH");
 +#endif
-+          
- 	if (v != NULL) {
- 	    char *t = ld_library_path;
- 	    /* That's +1 for the colon and +1 for the trailing '\0' */
-@@ -515,6 +668,7 @@ void os::Bsd::hotspot_sigmask(Thread* th
+         if (v != NULL) {
+             char *t = ld_library_path;
+             /* That's +1 for the colon and +1 for the trailing '\0' */
+@@ -515,6 +596,7 @@
    }
  }
  
@@ -4000,7 +3640,26 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  //////////////////////////////////////////////////////////////////////////////
  // detecting pthread library
  
-@@ -679,6 +833,7 @@ bool os::Bsd::manually_expand_stack(Java
+@@ -567,15 +649,15 @@
+   }
+ 
+   if (strstr(libpthread_version(), "NPTL")) {
+-    os::Bsd::set_is_NPTL();
++     os::Bsd::set_is_NPTL();
+   } else {
+-    os::Bsd::set_is_BsdThreads();
++     os::Bsd::set_is_BsdThreads();
+   }
+ 
+   // BsdThreads have two flavors: floating-stack mode, which allows variable
+   // stack size; and fixed-stack mode. NPTL is always floating-stack.
+   if (os::Bsd::is_NPTL() || os::Bsd::supports_variable_stack_size()) {
+-    os::Bsd::set_is_floating_stack();
++     os::Bsd::set_is_floating_stack();
+   }
+ }
+ 
+@@ -678,6 +760,7 @@
    }
    return false;
  }
@@ -4008,17 +3667,17 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  //////////////////////////////////////////////////////////////////////////////
  // create new thread
-@@ -687,6 +842,9 @@ static address highest_vm_reserved_addre
+@@ -686,6 +769,9 @@
  
  // check if it's safe to start a new thread
  static bool _thread_safety_check(Thread* thread) {
 +#ifdef _ALLBSD_SOURCE
-+  return true;
++    return true;
 +#else
    if (os::Bsd::is_BsdThreads() && !os::Bsd::is_floating_stack()) {
      // Fixed stack BsdThreads (SuSE Bsd/x86, and some versions of Redhat)
      //   Heap is mmap'ed at lower end of memory space. Thread stacks are
-@@ -720,6 +878,7 @@ static bool _thread_safety_check(Thread*
+@@ -719,6 +805,7 @@
      //   here, that means enough space has been reserved for stack.
      return true;
    }
@@ -4026,7 +3685,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  // Thread start routine for all newly created threads
-@@ -747,6 +906,10 @@ static void *java_start(Thread *thread) 
+@@ -746,6 +833,10 @@
      return NULL;
    }
  
@@ -4037,7 +3696,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    // thread_id is kernel thread id (similar to Solaris LWP id)
    osthread->set_thread_id(os::Bsd::gettid());
  
-@@ -756,6 +919,7 @@ static void *java_start(Thread *thread) 
+@@ -755,6 +846,7 @@
        thread->set_lgrp_id(lgrp_id);
      }
    }
@@ -4045,7 +3704,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    // initialize signal mask for this thread
    os::Bsd::hotspot_sigmask(thread);
  
-@@ -836,17 +1000,22 @@ bool os::create_thread(Thread* thread, T
+@@ -835,17 +927,22 @@
      // let pthread_create() pick the default value.
    }
  
@@ -4068,7 +3727,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
      pthread_t tid;
      int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
-@@ -860,7 +1029,9 @@ bool os::create_thread(Thread* thread, T
+@@ -859,7 +956,9 @@
        // Need to clean up stuff we've allocated so far
        thread->set_osthread(NULL);
        delete osthread;
@@ -4078,7 +3737,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
        return false;
      }
  
-@@ -876,9 +1047,11 @@ bool os::create_thread(Thread* thread, T
+@@ -875,9 +974,11 @@
        }
      }
  
@@ -4090,7 +3749,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    }
  
    // Aborted due to thread limit being reached
-@@ -916,7 +1089,11 @@ bool os::create_attached_thread(JavaThre
+@@ -915,7 +1016,11 @@
    }
  
    // Store pthread info into the OSThread
@@ -4102,7 +3761,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    osthread->set_pthread_id(::pthread_self());
  
    // initialize floating point control register
-@@ -927,6 +1104,7 @@ bool os::create_attached_thread(JavaThre
+@@ -926,6 +1031,7 @@
  
    thread->set_osthread(osthread);
  
@@ -4110,7 +3769,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    if (UseNUMA) {
      int lgrp_id = os::numa_get_group_id();
      if (lgrp_id != -1) {
-@@ -953,6 +1131,7 @@ bool os::create_attached_thread(JavaThre
+@@ -952,6 +1058,7 @@
      os::Bsd::manually_expand_stack(jt, addr);
      osthread->clear_expanding_stack();
    }
@@ -4118,7 +3777,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
    // initialize signal mask for this thread
    // and save the caller's signal mask
-@@ -1011,6 +1190,7 @@ extern "C" Thread* get_thread() {
+@@ -1010,6 +1117,7 @@
  //////////////////////////////////////////////////////////////////////////////
  // initial thread
  
@@ -4126,7 +3785,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  // Check if current thread is the initial thread, similar to Solaris thr_main.
  bool os::Bsd::is_initial_thread(void) {
    char dummy;
-@@ -1241,6 +1421,7 @@ void os::Bsd::capture_initial_stack(size
+@@ -1243,6 +1351,7 @@
    _initial_thread_stack_size = align_size_down(_initial_thread_stack_size, page_size());
    _initial_thread_stack_bottom = (address)stack_top - _initial_thread_stack_size;
  }
@@ -4134,7 +3793,18 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  ////////////////////////////////////////////////////////////////////////////////
  // time support
-@@ -1279,6 +1460,21 @@ jlong os::javaTimeMillis() {
+@@ -1264,9 +1373,7 @@
+   return (1000 * 1000);
+ }
+ 
+-// For now, we say that bsd does not support vtime.  I have no idea
+-// whether it can actually be made to (DLD, 9/13/05).
+-
++// XXX: For now, code this as if BSD does not support vtime.
+ bool os::supports_vtime() { return false; }
+ bool os::enable_vtime()   { return false; }
+ bool os::vtime_enabled()  { return false; }
+@@ -1286,6 +1393,21 @@
  #define CLOCK_MONOTONIC (1)
  #endif
  
@@ -4156,7 +3826,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  void os::Bsd::clock_init() {
    // we do dlopen's in this particular order due to bug in bsd
    // dynamical loader (see 6348968) leading to crash on exit
-@@ -1314,7 +1510,9 @@ void os::Bsd::clock_init() {
+@@ -1321,7 +1443,9 @@
      }
    }
  }
@@ -4166,7 +3836,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  #ifndef SYS_clock_getres
  
  #if defined(IA32) || defined(AMD64)
-@@ -1353,6 +1551,7 @@ void os::Bsd::fast_thread_clock_init() {
+@@ -1360,6 +1484,7 @@
      _pthread_getcpuclockid = pthread_getcpuclockid_func;
    }
  }
@@ -4174,7 +3844,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  jlong os::javaTimeNanos() {
    if (Bsd::supports_monotonic_clock()) {
-@@ -1499,7 +1698,14 @@ int os::current_process_id() {
+@@ -1510,7 +1635,14 @@
  
  // DLL functions
  
@@ -4190,7 +3860,44 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  const char* os::get_temp_directory() { return "/tmp/"; }
  
-@@ -1540,6 +1746,23 @@ bool os::dll_address_to_function_name(ad
+@@ -1528,13 +1660,13 @@
+   const size_t pnamelen = pname ? strlen(pname) : 0;
+ 
+   // Quietly truncate on buffer overflow.  Should be an error.
+-  if (pnamelen + strlen(fname) + 10 > (size_t) buflen) {
+-    *buffer = '\0';
+-    return;
++  if (pnamelen + strlen(fname) + strlen(JNI_LIB_PREFIX) + strlen(JNI_LIB_SUFFIX) + 2 > buflen) {
++      *buffer = '\0';
++      return;
+   }
+ 
+   if (pnamelen == 0) {
+-    snprintf(buffer, buflen, "lib%s.so", fname);
++    snprintf(buffer, buflen, JNI_LIB_PREFIX "%s" JNI_LIB_SUFFIX, fname);
+   } else if (strchr(pname, *os::path_separator()) != NULL) {
+     int n;
+     char** pelements = split_path(pname, &n);
+@@ -1543,7 +1675,8 @@
+       if (pelements[i] == NULL || strlen(pelements[i]) == 0) {
+         continue; // skip the empty path values
+       }
+-      snprintf(buffer, buflen, "%s/lib%s.so", pelements[i], fname);
++      snprintf(buffer, buflen, "%s/" JNI_LIB_PREFIX "%s" JNI_LIB_SUFFIX,
++          pelements[i], fname);
+       if (file_exists(buffer)) {
+         break;
+       }
+@@ -1558,7 +1691,7 @@
+       FREE_C_HEAP_ARRAY(char*, pelements);
+     }
+   } else {
+-    snprintf(buffer, buflen, "%s/lib%s.so", pname, fname);
++    snprintf(buffer, buflen, "%s/" JNI_LIB_PREFIX "%s" JNI_LIB_SUFFIX, pname, fname);
+   }
+ }
+ 
+@@ -1599,6 +1732,23 @@
    }
  }
  
@@ -4214,13 +3921,13 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  struct _address_to_library_name {
    address addr;          // input : memory address
    size_t  buflen;        //         size of fname
-@@ -1614,11 +1837,27 @@ bool os::dll_address_to_library_name(add
+@@ -1673,11 +1823,27 @@
       return false;
    }
  }
 +#endif
  
-   // Loads .dll/.so and 
+   // Loads .dll/.so and
    // in case of error it checks if .dll/.so was built for the
    // same architecture as Hotspot is running on
 + 
@@ -4231,18 +3938,18 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
 +    // Successful loading
 +    return result;
 +  }
- 
++
 +  // Read system error message into ebuf
 +  ::strncpy(ebuf, ::dlerror(), ebuflen-1);
 +  ebuf[ebuflen-1]='\0';
-+
+ 
 +  return NULL;
 +}
 +#else
  void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
  {
    void * result= ::dlopen(filename, RTLD_LAZY);
-@@ -1671,6 +1910,20 @@ void * os::dll_load(const char *filename
+@@ -1730,6 +1896,18 @@
    #define EM_486          6               /* Intel 80486 */
    #endif
  
@@ -4258,21 +3965,31 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
 +  #define EM_X86_64       62              /* AMD x86-64 */ 
 +  #endif
 +
-+
-+
-   static const arch_t arch_array[]={ 
+   static const arch_t arch_array[]={
      {EM_386,         EM_386,     ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
      {EM_486,         EM_386,     ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
-@@ -1751,7 +2004,7 @@ void * os::dll_load(const char *filename
+@@ -1810,17 +1988,11 @@
  
    return NULL;
  }
--
-+#endif /* !__APPLE__  */
++#endif /* !__APPLE__ */
  
+-/*
+- * glibc-2.0 libdl is not MT safe.  If you are building with any glibc,
+- * chances are you might want to run the generated bits against glibc-2.0
+- * libdl.so, so always use locking for any version of glibc.
+- */
++// XXX: Do we need a lock around this as per Linux?
+ void* os::dll_lookup(void* handle, const char* name) {
+-  pthread_mutex_lock(&dl_mutex);
+-  void* res = dlsym(handle, name);
+-  pthread_mutex_unlock(&dl_mutex);
+-  return res;
++  return dlsym(handle, name);
+ }
  
  
-@@ -1774,7 +2027,51 @@ bool _print_ascii_file(const char* filen
+@@ -1843,7 +2015,51 @@
  
  void os::print_dll_info(outputStream *st) {
     st->print_cr("Dynamic libraries:");
@@ -4325,7 +4042,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
     char fname[32];
     pid_t pid = os::Bsd::gettid();
  
-@@ -1783,6 +2080,7 @@ void os::print_dll_info(outputStream *st
+@@ -1852,6 +2068,7 @@
     if (!_print_ascii_file(fname, st)) {
       st->print("Can not get library information for pid = %d\n", pid);
     }
@@ -4333,7 +4050,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  
-@@ -1815,6 +2113,7 @@ void os::print_os_info(outputStream* st)
+@@ -1884,6 +2101,7 @@
    st->print(name.machine);
    st->cr();
  
@@ -4341,7 +4058,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    // Print warning if unsafe chroot environment detected
    if (unsafe_chroot_detected) {
      st->print("WARNING!! ");
-@@ -1829,6 +2128,7 @@ void os::print_os_info(outputStream* st)
+@@ -1898,6 +2116,7 @@
       st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed");
    }
    st->cr();
@@ -4349,7 +4066,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
    // rlimit
    st->print("rlimit:");
-@@ -1854,6 +2154,7 @@ void os::print_os_info(outputStream* st)
+@@ -1923,6 +2142,7 @@
    if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
    else st->print("%d", rlim.rlim_cur);
  
@@ -4357,7 +4074,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    st->print(", AS ");
    getrlimit(RLIMIT_AS, &rlim);
    if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
-@@ -1866,6 +2167,7 @@ void os::print_os_info(outputStream* st)
+@@ -1935,6 +2155,7 @@
    os::loadavg(loadavg, 3);
    st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]);
    st->cr();
@@ -4365,7 +4082,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  void os::print_memory_info(outputStream* st) {
-@@ -1873,18 +2175,22 @@ void os::print_memory_info(outputStream*
+@@ -1942,18 +2163,22 @@
    st->print("Memory:");
    st->print(" %dk page", os::vm_page_size()>>10);
  
@@ -4374,7 +4091,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    struct sysinfo si;
    sysinfo(&si);
 +#endif
-   
+ 
    st->print(", physical " UINT64_FORMAT "k",
              os::physical_memory() >> 10);
    st->print("(" UINT64_FORMAT "k free)",
@@ -4388,7 +4105,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    st->cr();
  }
  
-@@ -2108,19 +2414,29 @@ int os::sigexitnum_pd() {
+@@ -2180,19 +2405,29 @@
  static volatile jint pending_signals[NSIG+1] = { 0 };
  
  // Bsd(POSIX) specific hand shaking semaphore.
@@ -4420,7 +4137,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  static int check_pending_signals(bool wait) {
-@@ -2142,7 +2458,7 @@ static int check_pending_signals(bool wa
+@@ -2214,7 +2449,7 @@
      do {
        thread->set_suspend_equivalent();
        // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
@@ -4429,7 +4146,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
        // were we externally suspended while we were waiting?
        threadIsSuspended = thread->handle_special_suspend_equivalent_condition();
-@@ -2153,7 +2469,7 @@ static int check_pending_signals(bool wa
+@@ -2225,7 +2460,7 @@
          // while suspended because that would surprise the thread that
          // suspended us.
          //
@@ -4438,34 +4155,166 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
          thread->java_suspend_self();
        }
-@@ -2224,10 +2540,16 @@ void bsd_wrap_code(char* base, size_t si
- //       left at the time of mmap(). This could be a potential  
- //       problem.                                               
+@@ -2295,11 +2530,18 @@
+ //       All it does is to check if there are enough free pages
+ //       left at the time of mmap(). This could be a potential
+ //       problem.
++// modified to keep intact with openjdk6
  bool os::commit_memory(char* addr, size_t size) {
+-  uintptr_t res = (uintptr_t) ::mmap(addr, size,
+-                                   PROT_READ|PROT_WRITE|PROT_EXEC,
++//  int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
++  int prot = PROT_READ|PROT_WRITE|PROT_EXEC;
 +#ifdef __OpenBSD__
 +  // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
-+  return mprotect(addr, size, PROT_READ|PROT_WRITE|PROT_EXEC) == 0;
++  return ::mprotect(addr, size, prot) == 0;
 +#else
-+
-   uintptr_t res = (uintptr_t) ::mmap(addr, size,
-                                    PROT_READ|PROT_WRITE|PROT_EXEC,
++  uintptr_t res = (uintptr_t) ::mmap(addr, size, prot,
                                     MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
    return res != (uintptr_t) MAP_FAILED;
 +#endif
  }
  
  bool os::commit_memory(char* addr, size_t size, size_t alignment_hint) {
-@@ -2351,6 +2673,9 @@ bool os::unguard_memory(char* addr, size
+@@ -2309,40 +2551,32 @@
+ void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { }
+ 
+ void os::free_memory(char *addr, size_t bytes) {
+-  uncommit_memory(addr, bytes);
++  ::mmap(addr, bytes, PROT_READ | PROT_WRITE,
++         MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
+ }
+ 
+ void os::numa_make_global(char *addr, size_t bytes) {
+-  Bsd::numa_interleave_memory(addr, bytes);
+ }
+ 
+ void os::numa_make_local(char *addr, size_t bytes, int lgrp_hint) {
+-  Bsd::numa_tonode_memory(addr, bytes, lgrp_hint);
+ }
+ 
+ bool os::numa_topology_changed()   { return false; }
+ 
+ size_t os::numa_get_groups_num() {
+-  int max_node = Bsd::numa_max_node();
+-  return max_node > 0 ? max_node + 1 : 1;
++  return 1;
+ }
+ 
+ int os::numa_get_group_id() {
+-  int cpu_id = Bsd::sched_getcpu();
+-  if (cpu_id != -1) {
+-    int lgrp_id = Bsd::get_node_by_cpu(cpu_id);
+-    if (lgrp_id != -1) {
+-      return lgrp_id;
+-    }
+-  }
+   return 0;
+ }
+ 
+ size_t os::numa_get_leaf_groups(int *ids, size_t size) {
+-  for (size_t i = 0; i < size; i++) {
+-    ids[i] = i;
++  if (size > 0) {
++    ids[0] = 0;
++    return 1;
+   }
+-  return size;
++  return 0;
+ }
+ 
+ bool os::get_page_info(char *start, page_info* info) {
+@@ -2353,9 +2587,23 @@
+   return end;
+ }
+ 
++#ifndef _ALLBSD_SOURCE
+ extern "C" void numa_warn(int number, char *where, ...) { }
+ extern "C" void numa_error(char *where) { }
+ 
++
++// If we are running with libnuma version > 2, then we should
++// be trying to use symbols with versions 1.1
++// If we are running with earlier version, which did not have symbol versions,
++// we should use the base version.
++void* os::Bsd::libnuma_dlsym(void* handle, const char *name) {
++  void *f = dlvsym(handle, name, "libnuma_1.1");
++  if (f == NULL) {
++    f = dlsym(handle, name);
++  }
++  return f;
++}
++
+ bool os::Bsd::libnuma_init() {
+   // sched_getcpu() should be in libc.
+   set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t,
+@@ -2365,19 +2613,19 @@
+     void *handle = dlopen("libnuma.so.1", RTLD_LAZY);
+     if (handle != NULL) {
+       set_numa_node_to_cpus(CAST_TO_FN_PTR(numa_node_to_cpus_func_t,
+-                                           dlsym(handle, "numa_node_to_cpus")));
++                                           libnuma_dlsym(handle, "numa_node_to_cpus")));
+       set_numa_max_node(CAST_TO_FN_PTR(numa_max_node_func_t,
+-                                       dlsym(handle, "numa_max_node")));
++                                       libnuma_dlsym(handle, "numa_max_node")));
+       set_numa_available(CAST_TO_FN_PTR(numa_available_func_t,
+-                                        dlsym(handle, "numa_available")));
++                                        libnuma_dlsym(handle, "numa_available")));
+       set_numa_tonode_memory(CAST_TO_FN_PTR(numa_tonode_memory_func_t,
+-                                            dlsym(handle, "numa_tonode_memory")));
++                                            libnuma_dlsym(handle, "numa_tonode_memory")));
+       set_numa_interleave_memory(CAST_TO_FN_PTR(numa_interleave_memory_func_t,
+-                                            dlsym(handle, "numa_interleave_memory")));
++                                            libnuma_dlsym(handle, "numa_interleave_memory")));
+ 
+ 
+       if (numa_available() != -1) {
+-        set_numa_all_nodes((unsigned long*)dlsym(handle, "numa_all_nodes"));
++        set_numa_all_nodes((unsigned long*)libnuma_dlsym(handle, "numa_all_nodes"));
+         // Create a cpu -> node mapping
+         _cpu_to_node = new (ResourceObj::C_HEAP) GrowableArray<int>(0, true);
+         rebuild_cpu_to_node_map();
+@@ -2441,12 +2689,18 @@
+ os::Bsd::numa_tonode_memory_func_t os::Bsd::_numa_tonode_memory;
+ os::Bsd::numa_interleave_memory_func_t os::Bsd::_numa_interleave_memory;
+ unsigned long* os::Bsd::_numa_all_nodes;
++#endif
+ 
+ bool os::uncommit_memory(char* addr, size_t size) {
++#ifdef __OpenBSD__
++  // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
++  return ::mprotect(addr, size, PROT_NONE) == 0;
++#else
+   return ::mmap(addr, size,
+                 PROT_READ|PROT_WRITE|PROT_EXEC,
+                 MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0)
+     != MAP_FAILED;
++#endif
+ }
+ 
+ static address _highest_vm_reserved_address = NULL;
+@@ -2467,7 +2721,9 @@
+     flags |= MAP_FIXED;
+   }
+ 
+-  addr = (char*)::mmap(requested_addr, bytes, PROT_READ|PROT_WRITE|PROT_EXEC,
++  // Map uncommitted pages PROT_READ and PROT_WRITE, change access
++  // to PROT_EXEC if executable when we commit the page.
++  addr = (char*)::mmap(requested_addr, bytes, PROT_READ|PROT_WRITE,
+                        flags, -1, 0);
+ 
+   if (addr != MAP_FAILED) {
+@@ -2548,6 +2804,9 @@
  static size_t _large_page_size = 0;
  
  bool os::large_page_init() {
 +#ifdef _ALLBSD_SOURCE
-+ return false;
++  return false;
 +#else
    if (!UseLargePages) return false;
  
    if (LargePageSizeInBytes) {
-@@ -2405,6 +2730,7 @@ bool os::large_page_init() {
+@@ -2602,6 +2861,7 @@
    // We optimistically assume the support is available. If later it turns out
    // not true, VM will automatically switch to use regular page size.
    return true;
@@ -4473,16 +4322,25 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  #ifndef SHM_HUGETLB
-@@ -2575,7 +2901,7 @@ char* os::attempt_reserve_memory_at(size
+@@ -2609,6 +2869,8 @@
+ #endif
+ 
+ char* os::reserve_memory_special(size_t bytes) {
++  // "exec" is passed in but not used.  Creating the shared image for
++  // the code cache doesn't have an SHM_X executable permission to check.
+   assert(UseLargePages, "only for large pages");
+ 
+   key_t key = IPC_PRIVATE;
+@@ -2776,7 +3038,7 @@
  }
  
  size_t os::read(int fd, void *buf, unsigned int nBytes) {
 -  return ::read(fd, buf, nBytes);
-+  INTERRUPTIBLE_RETURN_INT_VM(::read(fd, buf, nBytes), os::Bsd::clear_interrupted);
- }  
++  RESTARTABLE_RETURN_INT(::read(fd, buf, nBytes));
+ }
  
  // TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation.
-@@ -2711,6 +3037,44 @@ void os::loop_breaker(int attempts) {
+@@ -2912,6 +3174,44 @@
  // this reason, the code should not be used as default (ThreadPriorityPolicy=0).
  // It is only used when ThreadPriorityPolicy=1 and requires root privilege.
  
@@ -4527,7 +4385,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  int os::java_to_os_priority[MaxPriority + 1] = {
    19,              // 0 Entry should never be used
  
-@@ -2728,6 +3092,7 @@ int os::java_to_os_priority[MaxPriority 
+@@ -2929,6 +3229,7 @@
  
    -5               // 10 MaxPriority
  };
@@ -4535,7 +4393,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  static int prio_init() {
    if (ThreadPriorityPolicy == 1) {
-@@ -2747,8 +3112,28 @@ static int prio_init() {
+@@ -2948,8 +3249,28 @@
  OSReturn os::set_native_priority(Thread* thread, int newpri) {
    if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK;
  
@@ -4544,7 +4402,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
 +  return OS_OK;
 +#elif defined(__FreeBSD__)
 +  int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
-+#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__NetBSD__)
 +  struct sched_param sp;
 +  int policy;
 +  pthread_t self = pthread_self();
@@ -4564,13 +4422,13 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
-@@ -2758,7 +3143,17 @@ OSReturn os::get_native_priority(const T
+@@ -2959,7 +3280,17 @@
    }
  
    errno = 0;
 +#if defined(__OpenBSD__) || defined(__FreeBSD__)
 +  *priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
-+#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__NetBSD__)
 +  int policy;
 +  struct sched_param sp;
 +
@@ -4582,16 +4440,16 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
  }
  
-@@ -2868,7 +3263,7 @@ static int SR_initialize() {
+@@ -3069,7 +3400,7 @@
    /* Get signal number to use for suspend/resume */
    if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
      int sig = ::strtol(s, 0, 10);
 -    if (sig > 0 || sig < _NSIG) {
 +    if (sig > 0 || sig < NSIG) {
- 	SR_signum = sig;
+         SR_signum = sig;
      }
    }
-@@ -3211,6 +3606,28 @@ void os::Bsd::install_signal_handlers() 
+@@ -3412,6 +3743,28 @@
      set_signal_handler(SIGFPE, true);
      set_signal_handler(SIGXFSZ, true);
  
@@ -4620,7 +4478,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
      if (libjsig_is_loaded) {
        // Tell libjsig jvm finishes setting signal handlers
        (*end_signal_setting)();
-@@ -3231,6 +3648,7 @@ void os::Bsd::install_signal_handlers() 
+@@ -3432,6 +3785,7 @@
    }
  }
  
@@ -4628,7 +4486,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  // This is the fastest way to get thread cpu time on Bsd.
  // Returns cpu time (user+sys) for any thread, not only for current.
  // POSIX compliant clocks are implemented in the kernels 2.6.16+.
-@@ -3245,6 +3663,7 @@ jlong os::Bsd::fast_thread_cpu_time(cloc
+@@ -3446,6 +3800,7 @@
  
    return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
  }
@@ -4636,7 +4494,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  /////
  // glibc on Bsd platform uses non-documented flag
-@@ -3466,13 +3885,13 @@ void os::init(void) {
+@@ -3667,13 +4022,13 @@
  
    _initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid();
  
@@ -4652,10 +4510,11 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    if (Bsd::page_size() == -1) {
      fatal1("os_bsd.cpp: os::init: sysconf failed (%s)", strerror(errno));
    }
-@@ -3485,6 +3904,16 @@ void os::init(void) {
+@@ -3686,7 +4041,16 @@
  
    Bsd::clock_init();
    initial_time_count = os::elapsed_counter();
+-  pthread_mutex_init(&dl_mutex, NULL);
 +
 +#ifdef __APPLE__
 +  // XXXDARWIN
@@ -4669,7 +4528,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  // To install functions for atexit system call
-@@ -3497,7 +3926,9 @@ extern "C" {
+@@ -3699,7 +4063,9 @@
  // this is called _after_ the global arguments have been parsed
  jint os::init_2(void)
  {
@@ -4679,7 +4538,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
    // Allocate a single page and mark it as readable for safepoint polling
    address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-@@ -3546,6 +3977,7 @@ jint os::init_2(void)
+@@ -3748,6 +4114,7 @@
    JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes,
          vm_page_size()));
  
@@ -4687,15 +4546,15 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    Bsd::capture_initial_stack(JavaThread::stack_size_at_create());
  
    Bsd::libpthread_init();
-@@ -3554,6 +3986,7 @@ jint os::init_2(void)
-           Bsd::glibc_version(), Bsd::libpthread_version(), 
-           Bsd::is_floating_stack() ? "floating stack" : "fixed stack");
+@@ -3770,6 +4137,7 @@
+       UseNUMA = true;
+     }
    }
 +#endif
  
    if (MaxFDLimit) {
      // set the number of file descriptors to max. print out error
-@@ -3565,6 +3998,14 @@ jint os::init_2(void)
+@@ -3781,6 +4149,14 @@
          perror("os::init_2 getrlimit failed");
      } else {
        nbr_files.rlim_cur = nbr_files.rlim_max;
@@ -4710,7 +4569,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
        status = setrlimit(RLIMIT_NOFILE, &nbr_files);
        if (status != 0) {
          if (PrintMiscellaneous && (Verbose || WizardMode))
-@@ -3573,8 +4014,10 @@ jint os::init_2(void)
+@@ -3789,8 +4165,10 @@
      }
    }
  
@@ -4721,14 +4580,13 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
    // Initialize HPI.
    jint hpi_result = hpi::initialize();
-@@ -3621,11 +4064,16 @@ void os::make_polling_page_readable(void
+@@ -3838,11 +4216,15 @@
  };
  
  int os::active_processor_count() {
 +#ifdef _ALLBSD_SOURCE
 +  return _processor_count;
 +#else
-+
    // Bsd doesn't yet have a (official) notion of processor sets,
    // so just return the number of online processors.
    int online_cpus = ::sysconf(_SC_NPROCESSORS_ONLN);
@@ -4738,7 +4596,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  bool os::distribute_processes(uint length, uint* distribution) {
-@@ -3667,6 +4115,9 @@ ExtendedPC os::get_thread_pc(Thread* thr
+@@ -3884,6 +4266,9 @@
  
  int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
  {
@@ -4748,7 +4606,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
     if (is_NPTL()) {
        return pthread_cond_timedwait(_cond, _mutex, _abstime);
     } else {
-@@ -3682,6 +4133,7 @@ int os::Bsd::safe_cond_timedwait(pthread
+@@ -3899,6 +4284,7 @@
  #endif // IA64
        return status;
     }
@@ -4756,7 +4614,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  ////////////////////////////////////////////////////////////////////////////////
-@@ -3817,17 +4269,17 @@ int os::create_binary_file(const char* p
+@@ -4034,17 +4420,17 @@
    if (!rewrite_existing) {
      oflags |= O_EXCL;
    }
@@ -4777,7 +4635,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  // Map a block of memory.
-@@ -3877,6 +4329,7 @@ bool os::unmap_memory(char* addr, size_t
+@@ -4094,6 +4480,7 @@
    return munmap(addr, bytes) == 0;
  }
  
@@ -4785,15 +4643,15 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
  
  static clockid_t thread_cpu_clockid(Thread* thread) {
-@@ -3888,6 +4341,7 @@ static clockid_t thread_cpu_clockid(Thre
+@@ -4105,6 +4492,7 @@
    assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
    return clockid;
  }
 +#endif
  
- // current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool) 
+ // current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
  // are used by JVM M&M and JVMTI to get user+sys or user CPU time
-@@ -3897,39 +4351,71 @@ static clockid_t thread_cpu_clockid(Thre
+@@ -4114,39 +4502,71 @@
  // the fast estimate available on the platform.
  
  jlong os::current_thread_cpu_time() {
@@ -4864,8 +4722,8 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
 +#ifndef _ALLBSD_SOURCE
  //
  //  -1 on error.
- // 
-@@ -4018,6 +4504,7 @@ static jlong slow_thread_cpu_time(Thread
+ //
+@@ -4235,6 +4655,7 @@
      return (jlong)user_time * (1000000000 / clock_tics_per_sec);
    }
  }
@@ -4873,7 +4731,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
  void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
    info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits
-@@ -4034,7 +4521,13 @@ void os::thread_cpu_time_info(jvmtiTimer
+@@ -4251,7 +4672,13 @@
  }
  
  bool os::is_thread_cpu_time_supported() {
@@ -4887,7 +4745,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  }
  
  // System loadavg support.  Returns -1 if load average cannot be obtained.
-@@ -4167,7 +4660,7 @@ jdk_pthread_sigmask(int how , const sigs
+@@ -4384,7 +4811,7 @@
  // abstime will be the absolute timeout time
  // TODO: replace compute_abstime() with unpackTime()
  
@@ -4896,29 +4754,29 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    if (millis < 0)  millis = 0;
    struct timeval now;
    int status = gettimeofday(&now, NULL);
-@@ -4219,7 +4712,7 @@ void os::PlatformEvent::park() {       /
+@@ -4436,7 +4863,7 @@
          status = pthread_cond_wait(_cond, _mutex);
          // for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
          // Treat this the same as if the wait was interrupted
--        if (status == ETIME) { status = EINTR; } 
+-        if (status == ETIME) { status = EINTR; }
 +        if (status == ETIMEDOUT) { status = EINTR; } 
          assert_status(status == 0 || status == EINTR, status, "cond_wait");
       }
-      -- _nParked ; 
-@@ -4277,10 +4770,10 @@ int os::PlatformEvent::park(jlong millis
+      -- _nParked ;
+@@ -4494,10 +4921,10 @@
        pthread_cond_init (_cond, NULL) ;
      }
-     assert_status(status == 0 || status == EINTR || 
--		  status == ETIME || status == ETIMEDOUT, 
+     assert_status(status == 0 || status == EINTR ||
+-                  status == ETIME || status == ETIMEDOUT,
 +		  status == ETIMEDOUT, 
- 		  status, "cond_timedwait");
-     if (!FilterSpuriousWakeups) break ; 		// previous semantics
--    if (status == ETIME || status == ETIMEDOUT) break ; 
+                   status, "cond_timedwait");
+     if (!FilterSpuriousWakeups) break ;                 // previous semantics
+-    if (status == ETIME || status == ETIMEDOUT) break ;
 +    if (status == ETIMEDOUT) break ; 
-     // We consume and ignore EINTR and spurious wakeups.   
+     // We consume and ignore EINTR and spurious wakeups.
    }
    --_nParked ;
-@@ -4372,7 +4865,7 @@ void os::PlatformEvent::unpark() {
+@@ -4589,7 +5016,7 @@
   * years from "now".
   */
  
@@ -4927,25 +4785,25 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
    assert (time > 0, "convertTime");
  
    struct timeval now;
-@@ -4431,7 +4924,7 @@ void Parker::park(bool isAbsolute, jlong
+@@ -4648,7 +5075,7 @@
    }
  
    // Next, demultiplex/decode time arguments
 -  timespec absTime;
 +  struct timespec absTime;
    if (time < 0) { // don't wait at all
-     return; 
+     return;
    }
-@@ -4484,7 +4977,7 @@ void Parker::park(bool isAbsolute, jlong
+@@ -4701,7 +5128,7 @@
      }
    }
-   assert_status(status == 0 || status == EINTR || 
--                status == ETIME || status == ETIMEDOUT, 
+   assert_status(status == 0 || status == EINTR ||
+-                status == ETIME || status == ETIMEDOUT,
 +                status == ETIMEDOUT, 
                  status, "cond_timedwait");
  
  #ifdef ASSERT
-@@ -4526,14 +5019,12 @@ void Parker::unpark() {
+@@ -4743,14 +5170,12 @@
  }
  
  
@@ -4965,19 +4823,19 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  #endif
  
  // Run the specified command in a separate process. Return its exit value,
-@@ -4548,8 +5039,7 @@ int os::fork_and_exec(char* cmd) {
+@@ -4765,8 +5190,7 @@
    // separate process to execve. Make a direct syscall to fork process.
    // On IA64 there's no fork syscall, we have to use fork() and hope for
    // the best...
--  pid_t pid = NOT_IA64(syscall(__NR_fork);) 
+-  pid_t pid = NOT_IA64(syscall(__NR_fork);)
 -              IA64_ONLY(fork();)
 +  pid_t pid = fork();
  
    if (pid < 0) {
      // fork failed
-@@ -4565,8 +5055,7 @@ int os::fork_and_exec(char* cmd) {
+@@ -4782,8 +5206,7 @@
      // in the new process, so make a system call directly.
-     // IA64 should use normal execve() from glibc to match the glibc fork() 
+     // IA64 should use normal execve() from glibc to match the glibc fork()
      // above.
 -    NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);)
 -    IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);)
@@ -4985,10 +4843,17 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.cpp ./hotspot/src/os/bsd/vm/os_b
  
      // execve failed
      _exit(-1);
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -30,6 +30,12 @@
+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
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.
++ * Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+  * This code is free software; you can redistribute it and/or modify it
+@@ -27,6 +27,12 @@
  /* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
  typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
  
@@ -5001,7 +4866,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_b
  class Bsd {
    friend class os;
  
-@@ -50,6 +56,7 @@ class Bsd {
+@@ -47,6 +53,7 @@
    static int sigflags[MAXSIGNUM];
  
    static int (*_clock_gettime)(clockid_t, struct timespec *);
@@ -5009,13 +4874,15 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_b
    static int (*_pthread_getcpuclockid)(pthread_t, clockid_t *);
  
    static address   _initial_thread_stack_bottom;
-@@ -61,42 +68,79 @@ class Bsd {
+@@ -58,6 +65,7 @@
    static bool _is_floating_stack;
    static bool _is_NPTL;
    static bool _supports_fast_thread_cpu_time;
 +#endif
  
-  protected:
+   static GrowableArray<int>* _cpu_to_node;
+ 
+@@ -65,38 +73,52 @@
  
    static julong _physical_memory;
    static pthread_t _main_thread;
@@ -5041,30 +4908,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_b
    static void set_is_floating_stack()         { _is_floating_stack = true; }
 +#endif
  
+   static void rebuild_cpu_to_node_map();
+   static GrowableArray<int>* cpu_to_node()    { return _cpu_to_node; }
   public:
-+#ifdef _ALLBSD_SOURCE
-+//XXXBSD: ported from solaris version
-+  enum {
-+    clear_interrupted = true
-+  };
-+  static void setup_interruptible(JavaThread* thread);
-+  static void setup_interruptible_already_blocked(JavaThread* thread);
-+  static JavaThread* setup_interruptible();
-+  static void cleanup_interruptible(JavaThread* thread);
-+
-+  // perf counter incrementers used by _INTERRUPTIBLE 
-+
-+  static void bump_interrupted_before_count();
-+  static void bump_interrupted_during_count();
 +
-+#ifdef ASSERT
-+  static JavaThread* setup_interruptible_native();
-+  static void cleanup_interruptible_native(JavaThread* thread);
-+#endif
-+
-+#endif
-+
- 
    static void init_thread_fpu_state();
 +#ifndef _ALLBSD_SOURCE
    static int  get_fpu_control_word();
@@ -5085,11 +4932,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_b
    static address   initial_thread_stack_bottom(void)                { return _initial_thread_stack_bottom; }
    static uintptr_t initial_thread_stack_size(void)                  { return _initial_thread_stack_size; }
 +#endif
-+
    static bool is_initial_thread(void);
  
    static int page_size(void)                                        { return _page_size; }
-@@ -133,6 +177,7 @@ class Bsd {
+@@ -133,6 +155,7 @@
    static struct sigaction *get_chained_signal_action(int sig);
    static bool chained_handler(int sig, siginfo_t* siginfo, void* context);
  
@@ -5097,15 +4943,17 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_b
    // GNU libc and libpthread version strings
    static const char *glibc_version()          { return _glibc_version; }
    static const char *libpthread_version()     { return _libpthread_version; }
-@@ -146,6 +191,7 @@ class Bsd {
-   static bool is_floating_stack()             { return _is_floating_stack; }
+@@ -147,7 +170,8 @@
  
    static void libpthread_init();
+   static bool libnuma_init();
+-
++  static void* libnuma_dlsym(void* handle, const char* name);
 +#endif
- 
    // Minimum stack size a thread can be created with (allowing
    // the VM to completely create the thread and enter user code)
-@@ -155,17 +201,21 @@ class Bsd {
+   static size_t min_stack_allowed;
+@@ -156,17 +180,21 @@
    static size_t default_stack_size(os::ThreadType thr_type);
    static size_t default_guard_size(os::ThreadType thr_type);
  
@@ -5127,7 +4975,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_b
  
    static bool supports_monotonic_clock() {
      return _clock_gettime != NULL;
-@@ -175,6 +225,7 @@ class Bsd {
+@@ -176,6 +204,7 @@
      return _clock_gettime ? _clock_gettime(clock_id, tp) : -1;
    }
  
@@ -5135,7 +4983,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_b
    static int pthread_getcpuclockid(pthread_t tid, clockid_t *clock_id) {
      return _pthread_getcpuclockid ? _pthread_getcpuclockid(tid, clock_id) : -1;
    }
-@@ -184,6 +235,7 @@ class Bsd {
+@@ -185,6 +214,7 @@
    }
  
    static jlong fast_thread_cpu_time(clockid_t clockid);
@@ -5143,10 +4991,10 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.hpp ./hotspot/src/os/bsd/vm/os_b
  
    // Stack repair handling
  
-diff -uNpr ../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-05-14 23:40:14.000000000 -0400
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -64,7 +64,15 @@ inline bool os::uses_stack_guard_pages()
+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
+@@ -61,7 +61,15 @@
  
  inline bool os::allocate_stack_guard_pages() {
    assert(uses_stack_guard_pages(), "sanity check");
@@ -5162,7 +5010,7 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.inline.hpp ./hotspot/src/os/bsd/
  }
  
  
-@@ -112,6 +120,107 @@ inline int os::closedir(DIR *dirp)
+@@ -109,6 +117,107 @@
    return ::closedir(dirp);
  }
  
@@ -5270,33 +5118,16 @@ diff -uNpr ../orig/hotspot/src/os/bsd/vm/os_bsd.inline.hpp ./hotspot/src/os/bsd/
  // macros for restartable system calls
  
  #define RESTARTABLE(_cmd, _result) do { \
-diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86_64.cpp ./hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86_64.cpp
---- ../orig/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86_64.cpp	2009-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86_64.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -69,8 +69,9 @@ void MacroAssembler::get_thread(Register
-    }
- }
- 
--// NOTE: since the bsd kernel resides at the low end of
--// user address space, no null pointer check is needed.
- bool MacroAssembler::needs_explicit_null_check(int offset) {
--  return offset < 0 || offset >= 0x100000;
-+  // Bsd kernel guarantees that the first page is always unmapped. Don't
-+  // assume anything more than that.
-+  bool offset_in_first_page =   0 <= offset  &&  offset < os::vm_page_size();
-+  return !offset_in_first_page;
- }
-diff -uNpr ../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-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s	2009-05-14 23:41:33.000000000 -0400
-@@ -21,49 +21,82 @@
+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
+@@ -21,6 +21,22 @@
  # have any questions.
  # 
  
 +
 +
- .ident	"@(#)bsd_x86_32.s	1.10 07/05/17 15:48:59 JVM"
--	
++  .ident        "@(#)bsd_x86_32.s       1.10 07/05/17 15:48:59 JVM"
 +
 +#ifdef __APPLE__
 +# Darwin uses _ prefixed global symbols
@@ -5309,9 +5140,11 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
 +
 +        .globl SYMBOL(fixcw)
 +
++
+ 	
          # NOTE WELL!  The _Copy functions are called directly
  	# from server-compiler-generated code via CallLeafNoFP,
- 	# which means that they *must* either not use floating
+@@ -28,41 +44,62 @@
  	# point or use it in the same manner as does the server
  	# compiler.
  	
@@ -5345,13 +5178,13 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
 +#ifdef __APPLE__
 +        .align   4
 +#else
-+	.align   16
++      .align   16
 +#endif
 +SYMBOL(fixcw):
-+	pushl    $0x27f
-+	fldcw    0(%esp)
-+	popl     %eax
-+	ret
++      pushl    $0x27f
++      fldcw    0(%esp)
++      popl     %eax
++      ret
 +
 +#ifdef __APPLE__
 +        .align   4
@@ -5359,6 +5192,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
 +        .align   16
 +#endif
 +
++
 +        .globl  SYMBOL(SafeFetch32), SYMBOL(Fetch32PFI), SYMBOL(Fetch32Resume)
 +        .globl  SYMBOL(SafeFetchN)
          ## TODO: avoid exposing Fetch32PFI and Fetch32Resume.
@@ -5392,7 +5226,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          rep
          nop
          movl    $1, %eax
-@@ -73,8 +106,8 @@ SpinPause:
+@@ -72,8 +109,8 @@
          #                                       void* to,
          #                                       size_t count)
          .p2align 4,,15
@@ -5403,7 +5237,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          pushl    %esi
          movl     4+12(%esp),%ecx      # count
          pushl    %edi
-@@ -181,8 +214,8 @@ cb_CopyLeft:
+@@ -180,8 +217,8 @@
          #
          # Same as _Copy_conjoint_bytes, except no source alignment check.
          .p2align 4,,15
@@ -5414,7 +5248,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          pushl    %esi
          movl     4+12(%esp),%ecx      # count
          pushl    %edi
-@@ -269,8 +302,8 @@ acb_CopyLeft:
+@@ -268,8 +305,8 @@
          #                                                void* to,
          #                                                size_t count)
          .p2align 4,,15
@@ -5425,7 +5259,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          pushl    %esi
          movl     4+12(%esp),%ecx      # count
          pushl    %edi
-@@ -355,8 +388,8 @@ cs_CopyLeft:
+@@ -354,8 +391,8 @@
          #                                                 void* to,
          #                                                 size_t count)
          .p2align 4,,15
@@ -5436,7 +5270,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          pushl    %esi
          movl     4+12(%esp),%ecx      # count
          pushl    %edi
-@@ -432,10 +465,10 @@ acs_CopyLeft:
+@@ -431,10 +468,10 @@
          # Equivalent to
          #   arrayof_conjoint_jints
          .p2align 4,,15
@@ -5451,7 +5285,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          pushl    %esi
          movl     4+12(%esp),%ecx      # count
          pushl    %edi
-@@ -495,7 +528,7 @@ ci_CopyLeft:
+@@ -494,7 +531,7 @@
          #
          # count treated as signed
          #
@@ -5460,7 +5294,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          #   while (--count >= 0) {
          #     *to++ = *from++;
          #   }
-@@ -505,8 +538,8 @@ ci_CopyLeft:
+@@ -504,8 +541,8 @@
          #   }
          # }
          .p2align 4,,15
@@ -5471,7 +5305,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          movl     4+8(%esp),%ecx       # count
          movl     4+0(%esp),%eax       # from
          movl     4+4(%esp),%edx       # to
-@@ -534,8 +567,8 @@ cla_CopyLeft:
+@@ -533,8 +570,8 @@
          #                                                 void* to,
          #                                                 size_t count)
          .p2align 4,,15
@@ -5482,7 +5316,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
          pushl    %esi
          movl     4+12(%esp),%ecx
          pushl    %edi
-@@ -633,8 +666,8 @@ mmx_acs_CopyLeft:
+@@ -632,8 +669,8 @@
          #                                   bool is_MP)
          #
          .p2align 4,,15
@@ -5493,12 +5327,12 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ./hotspot/src/os_c
                                     #  8(%esp) : return PC
          pushl    %ebx              #  4(%esp) : old %ebx
          pushl    %edi              #  0(%esp) : old %edi
-diff -uNpr ../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-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s	2009-05-14 23:41:33.000000000 -0400
-@@ -23,48 +23,70 @@
+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
+@@ -22,48 +22,70 @@
+ #
  
- .ident	"@(#)bsd_x86_64.s	1.7 07/05/05 17:04:47 JVM"
  
 +#ifdef __APPLE__
 +# Darwin uses _ prefixed global symbols
@@ -5588,7 +5422,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s ./hotspot/src/os_c
          rep
          nop
          movq   $1, %rax
-@@ -78,8 +100,8 @@ SpinPause:
+@@ -77,8 +99,8 @@
          # rdx - count, treated as ssize_t
          #
          .p2align 4,,15
@@ -5599,7 +5433,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s ./hotspot/src/os_c
          movq     %rdx,%r8             # byte count
          shrq     $3,%rdx              # qword count
          cmpq     %rdi,%rsi
-@@ -180,10 +202,10 @@ acb_CopyLeft:
+@@ -179,10 +201,10 @@
          # rdx - count, treated as ssize_t
          #
          .p2align 4,,15
@@ -5614,7 +5448,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s ./hotspot/src/os_c
          movq     %rdx,%r8             # word count
          shrq     $2,%rdx              # qword count
          cmpq     %rdi,%rsi
-@@ -270,10 +292,10 @@ acs_CopyLeft:
+@@ -269,10 +291,10 @@
          # rdx - count, treated as ssize_t
          #
          .p2align 4,,15
@@ -5629,7 +5463,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s ./hotspot/src/os_c
          movq     %rdx,%r8             # dword count
          shrq     %rdx                 # qword count
          cmpq     %rdi,%rsi
-@@ -349,10 +371,10 @@ aci_CopyLeft:
+@@ -348,10 +370,10 @@
          # rdx - count, treated as ssize_t
          #
          .p2align 4,,15
@@ -5644,11 +5478,11 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s ./hotspot/src/os_c
          cmpq     %rdi,%rsi
          leaq     -8(%rdi,%rdx,8),%rax # from + count*8 - 8
          jbe      acl_CopyRight
-diff -uNpr ../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-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -25,7 +25,29 @@
-  *  
+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
+@@ -22,7 +22,29 @@
+  *
   */
  
 +#ifndef _ALLBSD_SOURCE
@@ -5677,10 +5511,10 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp ./hots
  
  // Efficient swapping of data bytes from Java byte
  // ordering to native byte ordering and vice versa.
-diff -uNpr ../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-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -47,23 +47,158 @@
+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
+@@ -44,23 +44,158 @@
  # include <sys/wait.h>
  # include <pwd.h>
  # include <poll.h>
@@ -5844,9 +5678,9 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
 +#endif
 +
  address os::current_stack_pointer() {
-   register void *esp __asm__ (SPELL_REG_SP);
-   return (address) esp;
-@@ -82,15 +217,15 @@ void os::initialize_thread() {
+ #ifdef SPARC_WORKS
+   register void *esp;
+@@ -85,15 +220,15 @@
  }
  
  address os::Bsd::ucontext_get_pc(ucontext_t * uc) {
@@ -5865,20 +5699,20 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
  }
  
  // For Forte Analyzer AsyncGetCallTrace profiling support - thread
-@@ -237,18 +372,18 @@ JVM_handle_bsd_signal(int sig,
+@@ -245,18 +380,18 @@
      pc = (address) os::Bsd::ucontext_get_pc(uc);
  
-     if (pc == (address) Fetch32PFI) { 
--       uc->uc_mcontext.gregs[REG_PC] = intptr_t(Fetch32Resume) ; 
+     if (pc == (address) Fetch32PFI) {
+-       uc->uc_mcontext.gregs[REG_PC] = intptr_t(Fetch32Resume) ;
 +       uc->context_pc = intptr_t(Fetch32Resume) ;
-        return 1 ;  
+        return 1 ;
      }
  #ifdef AMD64
-     if (pc == (address) FetchNPFI) { 
--       uc->uc_mcontext.gregs[REG_PC] = intptr_t (FetchNResume) ; 
+     if (pc == (address) FetchNPFI) {
+-       uc->uc_mcontext.gregs[REG_PC] = intptr_t (FetchNResume) ;
 +       uc->context_pc = intptr_t (FetchNResume) ;
-        return 1 ; 
-     } 
+        return 1 ;
+     }
  #endif // AMD64
  
      // Handle ALL stack overflow variations here
@@ -5887,7 +5721,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
        address addr = (address) info->si_addr;
  
        // check if fault address is within thread stack
-@@ -270,6 +405,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -278,6 +413,7 @@
            // to handle_unexpected_exception way down below.
            thread->disable_stack_red_zone();
            tty->print_raw_cr("An irrecoverable stack overflow has occurred.");
@@ -5895,7 +5729,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
          } else {
            // Accessing stack address below sp may cause SEGV if current
            // thread has MAP_GROWSDOWN stack. This should only happen when
-@@ -285,6 +421,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -293,6 +429,7 @@
            } else {
               fatal("recursive segv. expanding stack.");
            }
@@ -5903,7 +5737,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
          }
        }
      }
-@@ -293,9 +430,16 @@ JVM_handle_bsd_signal(int sig,
+@@ -301,9 +438,16 @@
        // Java thread running in Java code => find exception handler if any
        // a fault inside compiled code, the interpreter, or a stub
  
@@ -5918,11 +5752,11 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
 +#else
        } else if (sig == SIGBUS /* && info->si_code == BUS_OBJERR */) {
 +#endif
- 	// BugId 4454115: A read from a MappedByteBuffer can fault
- 	// here if the underlying file has been truncated.
- 	// Do not crash the VM in such a case.
-@@ -316,6 +460,28 @@ JVM_handle_bsd_signal(int sig,
-                                               pc, 
+         // BugId 4454115: A read from a MappedByteBuffer can fault
+         // here if the underlying file has been truncated.
+         // Do not crash the VM in such a case.
+@@ -324,6 +468,28 @@
+                                               pc,
                                                SharedRuntime::
                                                IMPLICIT_DIVIDE_BY_ZERO);
 +#ifdef __APPLE__
@@ -5950,7 +5784,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
  #else
        if (sig == SIGFPE /* && info->si_code == FPE_INTDIV */) {
          // HACK: si_code does not work on bsd 2.2.12-20!!!
-@@ -343,7 +509,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -351,7 +517,7 @@
            fatal("please update this code.");
          }
  #endif // AMD64
@@ -5959,7 +5793,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
                 !MacroAssembler::needs_explicit_null_check((intptr_t)info->si_addr)) {
            // Determination of interpreter/vtable stub/compiled code null exception
            stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
-@@ -367,7 +533,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -375,7 +541,7 @@
      // process of write protecting the memory serialization page.
      // It write enables the page immediately after protecting it
      // so we can just return to retry the write.
@@ -5968,7 +5802,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
          os::is_memory_serialize_page(thread, (address) info->si_addr)) {
        // Block current thread until the memory serialize page permission restored.
        os::block_on_serialize_page_trap();
-@@ -388,7 +554,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -396,7 +562,7 @@
    // Furthermore, a false-positive should be harmless.
    if (UnguardOnExecutionViolation > 0 &&
        (sig == SIGSEGV || sig == SIGBUS) &&
@@ -5977,7 +5811,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
      int page_size = os::vm_page_size();
      address addr = (address) info->si_addr;
      address pc = os::Bsd::ucontext_get_pc(uc);
-@@ -457,7 +623,7 @@ JVM_handle_bsd_signal(int sig,
+@@ -466,7 +632,7 @@
      // save all thread context in case we need to restore it
      if (thread != NULL) thread->set_saved_exception_pc(pc);
  
@@ -5986,7 +5820,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
      return true;
    }
  
-@@ -487,13 +653,24 @@ JVM_handle_bsd_signal(int sig,
+@@ -496,13 +662,24 @@
    ShouldNotReachHere();
  }
  
@@ -6011,7 +5845,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
  int os::Bsd::get_fpu_control_word(void) {
  #ifdef AMD64
    return 0;
-@@ -509,11 +686,12 @@ void os::Bsd::set_fpu_control_word(int f
+@@ -518,11 +695,12 @@
    _FPU_SETCW(fpu_control);
  #endif // !AMD64
  }
@@ -6025,28 +5859,25 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
    return true;
  #else
    struct utsname uts;
-@@ -565,8 +743,11 @@ size_t os::Bsd::min_stack_allowed  =  (4
- 
+@@ -576,6 +754,9 @@
  #define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
+ #endif
  
 +#ifdef _ALLBSD_SOURCE
 +bool os::Bsd::supports_variable_stack_size() { return true; }
 +#else
  // Test if pthread library can support variable thread stack size. BsdThreads
--// in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads 
-+// in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads
+ // in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads
  // in floating stack mode and NPTL support variable stack size.
- bool os::Bsd::supports_variable_stack_size() {
-   if (os::Bsd::is_NPTL()) {
-@@ -597,6 +778,7 @@ bool os::Bsd::supports_variable_stack_si
-     return (GET_GS() != 0);
+@@ -612,6 +793,7 @@
+ #endif
    }
  }
 +#endif
  #endif // AMD64
  
  // return default stack size for thr_type
-@@ -650,6 +832,41 @@ size_t os::Bsd::default_guard_size(os::T
+@@ -665,6 +847,41 @@
  //    pthread_attr_getstack()
  
  static void current_stack_region(address * bottom, size_t * size) {
@@ -6088,7 +5919,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
    if (os::Bsd::is_initial_thread()) {
       // initial thread needs special handling because pthread_getattr_np()
       // may return bogus value.
-@@ -676,6 +893,7 @@ static void current_stack_region(address
+@@ -691,6 +908,7 @@
       pthread_attr_destroy(&attr);
  
    }
@@ -6096,7 +5927,7 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
    assert(os::current_stack_pointer() >= *bottom &&
           os::current_stack_pointer() < *bottom + *size, "just checking");
  }
-@@ -704,46 +922,44 @@ void os::print_context(outputStream *st,
+@@ -719,46 +937,44 @@
    ucontext_t *uc = (ucontext_t*)context;
    st->print_cr("Registers:");
  #ifdef AMD64
@@ -6173,10 +6004,10 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp ./hotspot/src/os
  #endif // AMD64
    st->cr();
    st->cr();
-diff -uNpr ../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-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -30,8 +30,10 @@
+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
+@@ -27,8 +27,10 @@
  #ifndef AMD64
    // map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp
    #define SP_BITLENGTH  32
@@ -6187,10 +6018,10 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp ./hotspot/
    static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
  #endif // !AMD64
  
-diff -uNpr ../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-05-14 23:40:15.000000000 -0400
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -34,7 +34,7 @@
+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
+@@ -31,7 +31,7 @@
    /******************************/                                                                                                   \
    /* Threads (NOTE: incomplete) */                                                                                                   \
    /******************************/                                                                                                   \
@@ -6199,10 +6030,10 @@ diff -uNpr ../orig/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp ./hotspot
    nonstatic_field(OSThread,                      _pthread_id,                                     pthread_t)                         \
    /* This must be the last entry, and must be present */                                                                             \
    last_entry()
-diff -uNpr ../orig/hotspot/src/share/vm/adlc/adlc.hpp ./hotspot/src/share/vm/adlc/adlc.hpp
---- ../orig/hotspot/src/share/vm/adlc/adlc.hpp	2009-04-24 03:30:54.000000000 -0400
-+++ ./hotspot/src/share/vm/adlc/adlc.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -76,9 +76,9 @@ typedef unsigned int uintptr_t;
+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
+@@ -69,9 +69,9 @@
  #endif
  #endif // _WIN32
  
@@ -6212,44 +6043,32 @@ diff -uNpr ../orig/hotspot/src/share/vm/adlc/adlc.hpp ./hotspot/src/share/vm/adl
 -#endif // LINUX
 +#endif // LINUX || _ALLBSD_SOURCE
  
- // Macros 
+ // Macros
  #define uint32 unsigned int
-diff -uNpr ../orig/hotspot/src/share/vm/ci/ciMethodBlocks.cpp ./hotspot/src/share/vm/ci/ciMethodBlocks.cpp
---- ../orig/hotspot/src/share/vm/ci/ciMethodBlocks.cpp	2009-04-24 03:30:54.000000000 -0400
-+++ ./hotspot/src/share/vm/ci/ciMethodBlocks.cpp	2009-05-14 23:41:34.000000000 -0400
-@@ -321,7 +321,7 @@ void ciBlock::set_exception_range(int st
- }
- 
- #ifndef PRODUCT
--static char *flagnames[] = {
-+static const char *flagnames[] = {
-   "Processed",
-   "Handler",
-   "MayThrow",
-diff -uNpr ../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-04-24 03:30:55.000000000 -0400
-+++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep	2009-05-14 23:41:33.000000000 -0400
-@@ -28,6 +28,7 @@ binaryTreeDictionary.cpp                
+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
+@@ -28,6 +28,7 @@
  binaryTreeDictionary.cpp                binaryTreeDictionary.hpp
  binaryTreeDictionary.cpp                globals.hpp
  binaryTreeDictionary.cpp                ostream.hpp
 +binaryTreeDictionary.cpp                space.inline.hpp
+ binaryTreeDictionary.cpp                spaceDecorator.hpp
  
  binaryTreeDictionary.hpp                freeBlockDictionary.hpp
- binaryTreeDictionary.hpp                freeList.hpp
-diff -uNpr ../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-04-24 03:30:55.000000000 -0400
-+++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew	2009-05-14 23:41:33.000000000 -0400
-@@ -30,6 +30,8 @@ asParNewGeneration.cpp			cmsAdaptiveSize
+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
+@@ -30,6 +30,8 @@
  asParNewGeneration.cpp                  cmsGCAdaptivePolicyCounters.hpp
- asParNewGeneration.cpp			defNewGeneration.inline.hpp
- asParNewGeneration.cpp			oop.pcgc.inline.hpp
+ asParNewGeneration.cpp                  defNewGeneration.inline.hpp
+ asParNewGeneration.cpp                  oop.pcgc.inline.hpp
 +asParNewGeneration.cpp                  markOop.inline.hpp
 +asParNewGeneration.cpp                  markSweep.inline.hpp
- asParNewGeneration.cpp			parNewGeneration.hpp
+ asParNewGeneration.cpp                  parNewGeneration.hpp
  asParNewGeneration.cpp                  referencePolicy.hpp
- 
-@@ -39,7 +41,7 @@ parCardTableModRefBS.cpp                
+ asParNewGeneration.cpp                  spaceDecorator.hpp
+@@ -40,7 +42,7 @@
  parCardTableModRefBS.cpp                java.hpp
  parCardTableModRefBS.cpp                mutexLocker.hpp
  parCardTableModRefBS.cpp                sharedHeap.hpp
@@ -6258,10 +6077,10 @@ diff -uNpr ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew ./
  parCardTableModRefBS.cpp                universe.hpp
  parCardTableModRefBS.cpp                virtualspace.hpp
  
-diff -uNpr ../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-04-24 03:30:55.000000000 -0400
-+++ ./hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge	2009-05-14 23:41:33.000000000 -0400
-@@ -302,6 +302,8 @@ psPermGen.cpp                           
+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
+@@ -306,6 +306,8 @@
  psPermGen.cpp                           psMarkSweepDecorator.hpp
  psPermGen.cpp                           psParallelCompact.hpp
  psPermGen.cpp                           psPermGen.hpp
@@ -6270,10 +6089,10 @@ diff -uNpr ../orig/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelS
  
  psPermGen.hpp                           psOldGen.hpp
  
-diff -uNpr ../orig/hotspot/src/share/vm/includeDB_compiler2 ./hotspot/src/share/vm/includeDB_compiler2
---- ../orig/hotspot/src/share/vm/includeDB_compiler2	2009-04-24 03:30:55.000000000 -0400
-+++ ./hotspot/src/share/vm/includeDB_compiler2	2009-05-14 23:41:33.000000000 -0400
-@@ -140,6 +140,7 @@ c2_globals_<os_family>.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
+@@ -140,6 +140,7 @@
  c2_globals_<os_family>.hpp              macros.hpp
  
  c2_init_<arch>.cpp                      compile.hpp
@@ -6281,7 +6100,7 @@ diff -uNpr ../orig/hotspot/src/share/vm/includeDB_compiler2 ./hotspot/src/share/
  
  c2compiler.cpp                          ad_<arch_model>.hpp
  c2compiler.cpp                          c2compiler.hpp
-@@ -833,6 +834,7 @@ parseHelper.cpp                         
+@@ -839,6 +840,7 @@
  phase.cpp                               compile.hpp
  phase.cpp                               compileBroker.hpp
  phase.cpp                               nmethod.hpp
@@ -6289,10 +6108,10 @@ diff -uNpr ../orig/hotspot/src/share/vm/includeDB_compiler2 ./hotspot/src/share/
  phase.cpp                               phase.hpp
  
  phase.hpp                               port.hpp
-diff -uNpr ../orig/hotspot/src/share/vm/includeDB_core ./hotspot/src/share/vm/includeDB_core
---- ../orig/hotspot/src/share/vm/includeDB_core	2009-04-24 03:30:55.000000000 -0400
-+++ ./hotspot/src/share/vm/includeDB_core	2009-05-14 23:41:33.000000000 -0400
-@@ -476,7 +476,7 @@ cardTableModRefBS.cpp                   
+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
+@@ -473,7 +473,7 @@
  cardTableModRefBS.cpp                   java.hpp
  cardTableModRefBS.cpp                   mutexLocker.hpp
  cardTableModRefBS.cpp                   sharedHeap.hpp
@@ -6301,7 +6120,7 @@ diff -uNpr ../orig/hotspot/src/share/vm/includeDB_core ./hotspot/src/share/vm/in
  cardTableModRefBS.cpp                   universe.hpp
  cardTableModRefBS.cpp                   virtualspace.hpp
  
-@@ -1978,7 +1978,7 @@ instanceKlass.cpp                       
+@@ -2014,7 +2014,7 @@
  instanceKlass.cpp                       vmSymbols.hpp
  
  instanceKlass.hpp                       accessFlags.hpp
@@ -6310,22 +6129,22 @@ diff -uNpr ../orig/hotspot/src/share/vm/includeDB_core ./hotspot/src/share/vm/in
  instanceKlass.hpp                       constMethodOop.hpp
  instanceKlass.hpp                       constantPoolOop.hpp
  instanceKlass.hpp                       handles.hpp
-diff -uNpr ../orig/hotspot/src/share/vm/includeDB_features ./hotspot/src/share/vm/includeDB_features
---- ../orig/hotspot/src/share/vm/includeDB_features	2009-04-24 03:30:55.000000000 -0400
-+++ ./hotspot/src/share/vm/includeDB_features	2009-05-14 23:41:33.000000000 -0400
-@@ -58,6 +58,8 @@ dump.cpp                                
+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
+@@ -59,6 +59,8 @@
  
- dump_<arch_model>.cpp                   assembler_<arch_model>.inline.hpp
+ dump_<arch_model>.cpp                   assembler_<arch>.inline.hpp
  dump_<arch_model>.cpp                   compactingPermGenGen.hpp
 +dump_<arch_model>.cpp                   generation.inline.hpp
 +dump_<arch_model>.cpp                   space.inline.hpp
  
  forte.cpp                               collectedHeap.inline.hpp
  forte.cpp                               debugInfoRec.hpp
-diff -uNpr ../orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
---- ../orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	2009-04-24 03:30:55.000000000 -0400
-+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -77,7 +77,7 @@ class BytecodePrinter: public BytecodeCl
+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
+@@ -74,7 +74,7 @@
        // the incoming method.  We could lose a line of trace output.
        // This is acceptable in a debug-only feature.
        st->cr();
@@ -6334,47 +6153,19 @@ diff -uNpr ../orig/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp ./hotspot
        method->print_name(st);
        st->cr();
        _current_method = method();
-@@ -90,7 +90,7 @@ class BytecodePrinter: public BytecodeCl
+@@ -87,7 +87,7 @@
        code = Bytecodes::code_at(bcp);
      }
      int bci = bcp - method->code_base();
 -    st->print("[%d] ", (int) Thread::current()->osthread()->thread_id());
 +    st->print("[%ld] ", (long) Thread::current()->osthread()->thread_id());
      if (Verbose) {
-       st->print("%8d  %4d  " INTPTR_FORMAT " " INTPTR_FORMAT " %s", 
- 	   BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
-diff -uNpr ../orig/hotspot/src/share/vm/opto/escape.cpp ./hotspot/src/share/vm/opto/escape.cpp
---- ../orig/hotspot/src/share/vm/opto/escape.cpp	2009-04-24 03:30:56.000000000 -0400
-+++ ./hotspot/src/share/vm/opto/escape.cpp	2009-05-14 23:41:34.000000000 -0400
-@@ -54,21 +54,21 @@ void PointsToNode::remove_edge(uint targ
- }
- 
- #ifndef PRODUCT
--static char *node_type_names[] = {
-+static const char *node_type_names[] = {
-   "UnknownType",
-   "JavaObject",
-   "LocalVar",
-   "Field"
- };
- 
--static char *esc_names[] = {
-+static const char *esc_names[] = {
-   "UnknownEscape",
-   "NoEscape     ",
-   "ArgEscape    ",
-   "GlobalEscape "
- };
- 
--static char *edge_type_suffix[] = {
-+static const char *edge_type_suffix[] = {
-  "?", // UnknownEdge
-  "P", // PointsToEdge
-  "D", // DeferredEdge
-diff -uNpr ../orig/hotspot/src/share/vm/prims/forte.cpp ./hotspot/src/share/vm/prims/forte.cpp
---- ../orig/hotspot/src/share/vm/prims/forte.cpp	2009-04-24 03:30:56.000000000 -0400
-+++ ./hotspot/src/share/vm/prims/forte.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -872,6 +872,11 @@ void AsyncGetCallTrace(ASGCT_CallTrace *
+       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
+@@ -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
  // isn't present.
@@ -6386,7 +6177,7 @@ diff -uNpr ../orig/hotspot/src/share/vm/prims/forte.cpp ./hotspot/src/share/vm/p
  void    collector_func_load(char* name,
                              void* null_argument_1,
                              void* null_argument_2,
-@@ -882,6 +887,7 @@ void    collector_func_load(char* name,
+@@ -636,6 +641,7 @@
  #pragma weak collector_func_load
  #define collector_func_load(x0,x1,x2,x3,x4,x5,x6) \
          ( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),0 : 0 )
@@ -6394,10 +6185,10 @@ diff -uNpr ../orig/hotspot/src/share/vm/prims/forte.cpp ./hotspot/src/share/vm/p
  #endif // !_WINDOWS
  
  } // end extern "C"
-diff -uNpr ../orig/hotspot/src/share/vm/runtime/globals.hpp ./hotspot/src/share/vm/runtime/globals.hpp
---- ../orig/hotspot/src/share/vm/runtime/globals.hpp	2009-04-24 03:30:56.000000000 -0400
-+++ ./hotspot/src/share/vm/runtime/globals.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -294,7 +294,7 @@ class CommandLineFlags {
+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
+@@ -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     \
     * been re-added (see 6401008) */                                         \
@@ -6406,25 +6197,26 @@ diff -uNpr ../orig/hotspot/src/share/vm/runtime/globals.hpp ./hotspot/src/share/
            "(Unstable) Issues membars on thread state transitions")          \
                                                                              \
    product(bool, PrintCommandLineFlags, false,                               \
-diff -uNpr ../orig/hotspot/src/share/vm/runtime/os.cpp ./hotspot/src/share/vm/runtime/os.cpp
---- ../orig/hotspot/src/share/vm/runtime/os.cpp	2009-04-24 03:30:57.000000000 -0400
-+++ ./hotspot/src/share/vm/runtime/os.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -155,7 +155,11 @@ char* os::iso8601_time(char* buffer, siz
+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
+@@ -80,7 +80,12 @@
+     return NULL;
    }
-   // Save the results of localtime
-   const struct tm time_struct = *time_struct_temp;
+ 
 +#if defined(_ALLBSD_SOURCE)
-+  const time_t zone = (time_t) time_struct_temp->tm_gmtoff;
++  const time_t zone = (time_t) time_struct.tm_gmtoff;
 +#else
    const time_t zone = timezone;
 +#endif
-   
-   // If daylight savings time is in effect, 
++
+ 
+   // If daylight savings time is in effect,
    // we are 1 hour East of our time zone
-diff -uNpr ../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-04-24 03:30:57.000000000 -0400
-+++ ./hotspot/src/share/vm/runtime/vm_version.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -141,7 +141,8 @@ const char* Abstract_VM_Version::vm_rele
+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
+@@ -140,7 +140,8 @@
  
  #define OS       LINUX_ONLY("linux")             \
                   WINDOWS_ONLY("windows")         \
@@ -6434,10 +6226,10 @@ diff -uNpr ../orig/hotspot/src/share/vm/runtime/vm_version.cpp ./hotspot/src/sha
  
  #define CPU      IA32_ONLY("x86")                \
                   IA64_ONLY("ia64")               \
-diff -uNpr ../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-04-24 03:30:57.000000000 -0400
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -74,12 +74,25 @@
+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
+@@ -71,12 +71,25 @@
  # include <sys/procfs.h>
  # endif
  
@@ -6465,7 +6257,7 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ./ho
  
  // 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
  // When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in
-@@ -115,17 +128,20 @@
+@@ -112,17 +125,20 @@
  // pointer is stored as integer value.  On some platforms, sizeof(intptr_t) >
  // sizeof(void*), so here we want something which is integer type, but has the
  // same size as a pointer.
@@ -6483,13 +6275,13 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ./ho
    #define NULL_WORD  NULL
  #endif
  
--#ifndef	LINUX
+-#ifndef LINUX
 +
 +#if !defined(LINUX) && !defined(_ALLBSD_SOURCE)
  // Compiler-specific primitive types
  typedef unsigned short     uint16_t;
  #ifndef _UINT32_T
-@@ -145,7 +161,7 @@ typedef unsigned int		uintptr_t;
+@@ -142,7 +158,7 @@
  // prior definition of intptr_t, and add "&& !defined(XXX)" above.
  #endif // _SYS_INT_TYPES_H
  
@@ -6498,7 +6290,7 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ./ho
  
  // Additional Java basic types
  
-@@ -229,7 +245,9 @@ inline int g_isnan(float  f) { return is
+@@ -226,7 +242,9 @@
  inline int g_isnan(float  f) { return isnand(f); }
  #endif
  inline int g_isnan(double f) { return isnand(f); }
@@ -6509,11 +6301,11 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ./ho
  inline int g_isnan(float  f) { return isnanf(f); }
  inline int g_isnan(double f) { return isnan(f); }
  #else
-diff -uNpr ../orig/hotspot/src/share/vm/utilities/macros.hpp ./hotspot/src/share/vm/utilities/macros.hpp
---- ../orig/hotspot/src/share/vm/utilities/macros.hpp	2009-04-24 03:30:57.000000000 -0400
-+++ ./hotspot/src/share/vm/utilities/macros.hpp	2009-05-14 23:41:33.000000000 -0400
-@@ -147,6 +147,16 @@
- #define NOT_WINDOWS(code) code
+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
+@@ -154,6 +154,16 @@
+ #define X86_ONLY(code)
  #endif
  
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
@@ -6529,10 +6321,10 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/macros.hpp ./hotspot/src/share
  #ifdef IA32
  #define IA32_ONLY(code) code
  #define NOT_IA32(code)
-diff -uNpr ../orig/hotspot/src/share/vm/utilities/ostream.cpp ./hotspot/src/share/vm/utilities/ostream.cpp
---- ../orig/hotspot/src/share/vm/utilities/ostream.cpp	2009-04-24 03:30:57.000000000 -0400
-+++ ./hotspot/src/share/vm/utilities/ostream.cpp	2009-05-14 23:41:34.000000000 -0400
-@@ -780,7 +780,7 @@ bufferedStream::~bufferedStream() {
+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
+@@ -827,7 +827,7 @@
  
  #ifndef PRODUCT
  
@@ -6541,25 +6333,16 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/ostream.cpp ./hotspot/src/shar
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
-@@ -832,7 +832,7 @@ bool networkStream::connect(const char *
-   server.sin_port = htons(port);
- 
-   server.sin_addr.s_addr = inet_addr(ip);
--  if (server.sin_addr.s_addr == (unsigned long)-1) {
-+  if (server.sin_addr.s_addr == (uint32_t)-1) {
- #ifdef _WINDOWS
-     struct hostent* host = hpi::get_host_by_name((char*)ip);
- #else
-diff -uNpr ../orig/hotspot/src/share/vm/utilities/vmError.cpp ./hotspot/src/share/vm/utilities/vmError.cpp
---- ../orig/hotspot/src/share/vm/utilities/vmError.cpp	2009-04-24 03:30:57.000000000 -0400
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp	2009-05-14 23:41:33.000000000 -0400
-@@ -34,13 +34,18 @@ const char *env_list[] = {
-   "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH", 
+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
+@@ -31,13 +31,18 @@
+   "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
    "JAVA_COMPILER", "PATH", "USERNAME",
  
 -  // Env variables that are defined on Solaris/Linux
 +  // Env variables that are defined on Solaris/Linux/BSD
-   "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY", 
+   "LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY",
    "HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE",
  
    // defined on Linux
@@ -6573,7 +6356,7 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/vmError.cpp ./hotspot/src/shar
    // defined on Windows
    "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR",
  
-@@ -673,6 +678,11 @@ void VMError::report_and_die() {
+@@ -674,6 +679,11 @@
      reset_signal_handlers();
  
    } else {
@@ -6585,7 +6368,7 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/vmError.cpp ./hotspot/src/shar
      // This is not the first error, see if it happened in a different thread
      // or in the same thread during error reporting.
      if (first_error_tid != mytid) {
-@@ -793,7 +803,7 @@ void VMError::report_and_die() {
+@@ -794,7 +804,7 @@
      const char* ptr = OnError;
      while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
        out.print_raw   ("#   Executing ");
@@ -6594,10 +6377,10 @@ diff -uNpr ../orig/hotspot/src/share/vm/utilities/vmError.cpp ./hotspot/src/shar
        out.print_raw   ("/bin/sh -c ");
  #elif defined(SOLARIS)
        out.print_raw   ("/usr/bin/sh -c ");
-diff -uNpr ../orig/jdk/make/com/sun/java/pack/Makefile ./jdk/make/com/sun/java/pack/Makefile
---- ../orig/jdk/make/com/sun/java/pack/Makefile	2009-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/com/sun/java/pack/Makefile	2009-05-14 23:41:33.000000000 -0400
-@@ -61,6 +61,7 @@ vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR
+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
+@@ -61,6 +61,7 @@
  
  
  ifeq ($(STANDALONE),true)
@@ -6605,7 +6388,7 @@ diff -uNpr ../orig/jdk/make/com/sun/java/pack/Makefile ./jdk/make/com/sun/java/p
    ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
  
    ZIPOBJS =  $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
-@@ -78,6 +79,10 @@ ifeq ($(STANDALONE),true)
+@@ -78,6 +79,10 @@
    ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
    OTHER_CXXFLAGS += $(ZINCLUDE)
    LDDFLAGS += $(ZIPOBJS)
@@ -6616,7 +6399,7 @@ diff -uNpr ../orig/jdk/make/com/sun/java/pack/Makefile ./jdk/make/com/sun/java/p
  else
    OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
    OTHER_LDLIBS += $(JVMLIB)
-@@ -102,7 +107,11 @@ ifeq ($(PLATFORM), windows) 
+@@ -102,7 +107,11 @@
    COMPILER_WARNINGS_FATAL=false
  else
    LDOUTPUT = -o #Have a space 
@@ -6628,10 +6411,10 @@ diff -uNpr ../orig/jdk/make/com/sun/java/pack/Makefile ./jdk/make/com/sun/java/p
    OTHER_LDLIBS  += $(LIBCXX)
  # setup the list of libraries to link in...
  ifeq ($(PLATFORM), linux)
-diff -uNpr ../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-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/com/sun/security/auth/module/Makefile	2009-05-14 23:41:33.000000000 -0400
-@@ -70,7 +70,7 @@ ifeq ($(PLATFORM), solaris)
+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
+@@ -70,7 +70,7 @@
    include FILES_c_solaris.gmk
  endif # solaris
  
@@ -6640,10 +6423,10 @@ diff -uNpr ../orig/jdk/make/com/sun/security/auth/module/Makefile ./jdk/make/com
    LIBRARY = jaas_unix
    include FILES_export_unix.gmk
    include FILES_c_unix.gmk
-diff -uNpr ../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-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -43,5 +43,7 @@ FILES_export = \
+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
+@@ -43,5 +43,7 @@
  	sun/tools/attach/LinuxVirtualMachine.java
  endif
  
@@ -6653,10 +6436,10 @@ diff -uNpr ../orig/jdk/make/com/sun/tools/attach/Exportedfiles.gmk ./jdk/make/co
 +FILES_export = \
 +	sun/tools/attach/BsdVirtualMachine.java
 +endif
-diff -uNpr ../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-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -39,4 +39,7 @@ FILES_c = \
+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
+@@ -39,4 +39,7 @@
  	LinuxVirtualMachine.c
  endif
  
@@ -6665,10 +6448,10 @@ diff -uNpr ../orig/jdk/make/com/sun/tools/attach/FILES_c.gmk ./jdk/make/com/sun/
 +FILES_c = \
 +	BsdVirtualMachine.c
 +endif
-diff -uNpr ../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-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -43,6 +43,11 @@ FILES_java += \
+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
+@@ -43,6 +43,11 @@
  	sun/tools/attach/LinuxAttachProvider.java
  endif
  
@@ -6680,10 +6463,10 @@ diff -uNpr ../orig/jdk/make/com/sun/tools/attach/FILES_java.gmk ./jdk/make/com/s
  #
  # Files that need to be copied
  #
-diff -uNpr ../orig/jdk/make/com/sun/tools/attach/Makefile ./jdk/make/com/sun/tools/attach/Makefile
---- ../orig/jdk/make/com/sun/tools/attach/Makefile	2009-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/com/sun/tools/attach/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -36,6 +36,9 @@ endif
+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
+@@ -36,6 +36,9 @@
  ifeq ($(PLATFORM), linux)
  FILES_m = mapfile-linux
  endif
@@ -6693,10 +6476,10 @@ diff -uNpr ../orig/jdk/make/com/sun/tools/attach/Makefile ./jdk/make/com/sun/too
  include $(BUILDDIR)/common/Mapfile-vers.gmk
  
  #
-diff -uNpr ../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-05-14 23:40:16.000000000 -0400
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd	2009-05-14 23:41:34.000000000 -0400
-@@ -30,14 +30,12 @@ SUNWprivate_1.1 {
+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
+@@ -30,14 +30,12 @@
  	    Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
  	    Java_sun_tools_attach_BsdVirtualMachine_close;
  	    Java_sun_tools_attach_BsdVirtualMachine_connect;
@@ -6712,9 +6495,9 @@ diff -uNpr ../orig/jdk/make/com/sun/tools/attach/mapfile-bsd ./jdk/make/com/sun/
  	local:
  		*;
  };
-diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
---- ../orig/jdk/make/common/Defs-bsd.gmk	2009-05-14 23:40:16.000000000 -0400
-+++ ./jdk/make/common/Defs-bsd.gmk	2009-05-14 23:41:33.000000000 -0400
+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
 @@ -43,12 +43,6 @@
  # Get shared JDK settings
  include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
@@ -6728,7 +6511,7 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  ifndef PLATFORM_SRC
    PLATFORM_SRC = $(BUILDDIR)/../src/solaris
  endif # PLATFORM_SRC
-@@ -61,7 +55,7 @@ ifndef OPENJDK
+@@ -61,7 +55,7 @@
  endif
  
  # platform specific include files
@@ -6737,7 +6520,7 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  PLATFORM_INCLUDE      = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
  
  # suffix used for make dependencies files.
-@@ -104,6 +98,10 @@ endif
+@@ -104,6 +98,10 @@
  #    as the default.
  CFLAGS_REQUIRED_amd64   += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
  CFLAGS_REQUIRED_i586    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
@@ -6748,7 +6531,7 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  CFLAGS_REQUIRED_ia64    += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
  CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
  LDFLAGS_COMMON_sparcv9  += -m64 -mcpu=v9
-@@ -178,7 +176,7 @@ ifeq ($(FASTDEBUG), true)
+@@ -184,7 +182,7 @@
    CXXFLAGS_DBG	+= $(CC_LOWER_OPT)
  endif
  
@@ -6757,7 +6540,7 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  		  -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
  
  ifeq ($(ARCH_DATA_MODEL), 64)
-@@ -188,33 +186,15 @@ endif
+@@ -194,33 +192,15 @@
  CPPFLAGS_OPT    = 
  CPPFLAGS_DBG    = -DDEBUG
  
@@ -6795,18 +6578,19 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  
  #
  # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
-@@ -235,8 +215,8 @@ AUTOMATIC_PCH_OPTION = 
- #
+@@ -242,9 +222,9 @@
  ifeq ($(VARIANT), OPT)
    ifneq ($(NO_STRIP), true)
--    # Debug 'strip -g' leaves local function Elf symbols (better stack traces)
--    POST_STRIP_PROCESS = $(STRIP) -g
-+    # Debug 'strip -S' leaves local function Elf symbols (better stack traces)
-+    POST_STRIP_PROCESS = $(STRIP) -S
+     ifneq ($(DEBUG_BINARIES), true)
+-      # Debug 'strip -g' leaves local function Elf symbols (better stack
++      # Debug 'strip -S' leaves local function Elf symbols (better stack
+       # traces)
+-      POST_STRIP_PROCESS = $(STRIP) -g
++      POST_STRIP_PROCESS = $(STRIP) -S
+     endif
    endif
  endif
- 
-@@ -245,13 +225,9 @@ endif
+@@ -254,13 +234,9 @@
  #
  LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
  
@@ -6823,7 +6607,7 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  endif
  
  #
-@@ -280,7 +256,9 @@ override HAVE_ALTZONE            = false
+@@ -289,7 +265,9 @@
  override HAVE_FILIOH             = false
  override HAVE_GETHRTIME          = false
  override HAVE_GETHRVTIME         = false
@@ -6833,7 +6617,7 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  override LEX_LIBRARY             = -lfl
  ifeq ($(STATIC_CXX),true)
  override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-@@ -291,13 +269,9 @@ override LIBPOSIX4               =
+@@ -300,13 +278,9 @@
  override LIBSOCKET               =
  override LIBTHREAD               =
  override MOOT_PRIORITIES         = true
@@ -6849,7 +6633,7 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
  override SUN_CMM_SUBDIR          =
  override THREADS_FLAG            = native
-@@ -318,6 +292,14 @@ override USE_EXECNAME            = true
+@@ -327,6 +301,14 @@
  # DPS (Displayable PostScript) is available on Solaris machines
  HAVE_DPS = no
  
@@ -6864,10 +6648,10 @@ diff -uNpr ../orig/jdk/make/common/Defs-bsd.gmk ./jdk/make/common/Defs-bsd.gmk
  #
  # Japanese manpages
  #
-diff -uNpr ../orig/jdk/make/common/Defs-linux.gmk ./jdk/make/common/Defs-linux.gmk
---- ../orig/jdk/make/common/Defs-linux.gmk	2009-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/common/Defs-linux.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -292,7 +292,7 @@ override LIBSOCKET               =
+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
+@@ -301,7 +301,7 @@
  override LIBTHREAD               =
  override MOOT_PRIORITIES         = true
  override NO_INTERRUPTIBLE_IO     = true
@@ -6876,10 +6660,10 @@ diff -uNpr ../orig/jdk/make/common/Defs-linux.gmk ./jdk/make/common/Defs-linux.g
  ifeq ($(ARCH), amd64)
  override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
  else
-diff -uNpr ../orig/jdk/make/common/Defs.gmk ./jdk/make/common/Defs.gmk
---- ../orig/jdk/make/common/Defs.gmk	2009-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/common/Defs.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -188,6 +188,24 @@ 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
+@@ -188,6 +188,24 @@
  _OUTPUTDIR=$(JDK_TOPDIR)/build/$(PLATFORM)-$(ARCH)
  endif
  
@@ -6904,7 +6688,7 @@ diff -uNpr ../orig/jdk/make/common/Defs.gmk ./jdk/make/common/Defs.gmk
  #
  # Get platform definitions
  #
-@@ -223,6 +241,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
+@@ -223,6 +241,7 @@
  
    ifdef ALT_FREETYPE_LIB_PATH
      FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
@@ -6912,7 +6696,7 @@ diff -uNpr ../orig/jdk/make/common/Defs.gmk ./jdk/make/common/Defs.gmk
    else
      ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
        FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
-@@ -287,6 +306,10 @@ ifdef PROGRAM
+@@ -287,6 +306,10 @@
      LDLIBS_COMMON = -ldl
    endif
  
@@ -6923,10 +6707,10 @@ diff -uNpr ../orig/jdk/make/common/Defs.gmk ./jdk/make/common/Defs.gmk
  endif # PROGRAM
  
  LDLIBS_COMMON += $(EXTRA_LIBS)
-diff -uNpr ../orig/jdk/make/common/Program.gmk ./jdk/make/common/Program.gmk
---- ../orig/jdk/make/common/Program.gmk	2009-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/common/Program.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -67,11 +67,27 @@ endif
+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
+@@ -67,11 +67,27 @@
  # Create a dependency on libjli (Java Launcher Infrastructure)
  #
  # On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to
@@ -6955,7 +6739,7 @@ diff -uNpr ../orig/jdk/make/common/Program.gmk ./jdk/make/common/Program.gmk
  ifneq (,$(findstring $(PLATFORM), linux solaris))	# UNIX systems
      LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
      OTHER_LDLIBS += -ljli
-@@ -175,6 +191,10 @@ else # USE_PTHREADS
+@@ -175,6 +191,10 @@
    THREADLIBS = $(LIBTHREAD)
  endif # USE_PTHREADS
  
@@ -6966,7 +6750,7 @@ diff -uNpr ../orig/jdk/make/common/Program.gmk ./jdk/make/common/Program.gmk
  #
  # This rule only applies on unix.  It supports quantify and its ilk.
  #
-@@ -243,15 +263,19 @@ endif
+@@ -243,15 +263,19 @@
  
  
  ifneq ($(PLATFORM), windows)
@@ -6986,10 +6770,10 @@ diff -uNpr ../orig/jdk/make/common/Program.gmk ./jdk/make/common/Program.gmk
  
  # this may not be necessary...
  ifeq ($(PLATFORM), windows)
-diff -uNpr ../orig/jdk/make/common/Release.gmk ./jdk/make/common/Release.gmk
---- ../orig/jdk/make/common/Release.gmk	2009-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/common/Release.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -147,14 +147,13 @@ JRE_MAN_PAGES =         \
+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 @@
  	tnameserv.1     \
  	unpack200.1
  
@@ -7005,7 +6789,7 @@ diff -uNpr ../orig/jdk/make/common/Release.gmk ./jdk/make/common/Release.gmk
  	extcheck.1         \
  	idlj.1             \
  	jar.1              \
-@@ -193,6 +192,11 @@ ifeq ($(PLATFORM), linux)
+@@ -190,6 +189,11 @@
    JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
  endif # linux
  
@@ -7017,7 +6801,7 @@ diff -uNpr ../orig/jdk/make/common/Release.gmk ./jdk/make/common/Release.gmk
  define copy-man-pages
  $(MKDIR) -p $1/man/man1
  for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
-@@ -325,6 +329,12 @@ ifndef OPENJDK
+@@ -322,6 +326,12 @@
    SOURCE_DIRS += $(CLOSED_SRC)/share/classes
  endif
  
@@ -7030,7 +6814,16 @@ diff -uNpr ../orig/jdk/make/common/Release.gmk ./jdk/make/common/Release.gmk
  
  #
  # Specific files and directories that will be filtered out from above areas.
-@@ -982,7 +992,7 @@ initial-image-jdk:: initial-image-jdk-se
+@@ -636,6 +646,8 @@
+ 	$(BOOT_JAVA_CMD) -jar $(JARSPLIT_JARFILE) \
+ 		$(TOTAL_JAR_FILELIST) \
+ 		-o  $(RT_JAR_FILELIST) $(RES_JAR_FILELIST)
++	$(EGREP) -v hotspot.log $(RES_JAR_FILELIST) > $(RES_JAR_FILELIST).temp
++	$(MV) $(RES_JAR_FILELIST).temp $(RES_JAR_FILELIST)
+ 	@$(java-vm-cleanup)
+ 
+ # Create the manifest file.
+@@ -979,7 +991,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.
@@ -7039,7 +6832,7 @@ diff -uNpr ../orig/jdk/make/common/Release.gmk ./jdk/make/common/Release.gmk
  	for d in $(SOURCE_DIRS); do \
  	  $(RM) $(ABS_TEMPDIR)/src-files.list; \
  	  ($(CD) $$d &&  \
-@@ -995,7 +1005,7 @@ initial-image-jdk:: initial-image-jdk-se
+@@ -992,7 +1004,7 @@
  	    done ; \
  	  ) ; \
  	  if [ -f  $(ABS_TEMPDIR)/src-files.list ] ; then \
@@ -7048,10 +6841,10 @@ diff -uNpr ../orig/jdk/make/common/Release.gmk ./jdk/make/common/Release.gmk
  	       | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
  	  fi; \
  	done
-diff -uNpr ../orig/jdk/make/common/internal/BinaryPlugs.gmk ./jdk/make/common/internal/BinaryPlugs.gmk
---- ../orig/jdk/make/common/internal/BinaryPlugs.gmk	2009-04-24 03:33:54.000000000 -0400
-+++ ./jdk/make/common/internal/BinaryPlugs.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -49,8 +49,6 @@ PLUG_JMF_CLASS_NAMES = \
+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
+@@ -49,8 +49,6 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -7060,7 +6853,7 @@ diff -uNpr ../orig/jdk/make/common/internal/BinaryPlugs.gmk ./jdk/make/common/in
  com/sun/jmx/snmp/SnmpOidRecord.class \
  com/sun/jmx/snmp/SnmpOidTable.class \
  com/sun/jmx/snmp/SnmpOidTableSupport.class \
-@@ -60,22 +58,16 @@ com/sun/jmx/snmp/SnmpPeer.class \
+@@ -60,22 +58,16 @@
  com/sun/jmx/snmp/SnmpTimeticks.class \
  com/sun/jmx/snmp/SnmpVarBind.class \
  com/sun/jmx/snmp/SnmpVarBindList.class \
@@ -7087,7 +6880,7 @@ diff -uNpr ../orig/jdk/make/common/internal/BinaryPlugs.gmk ./jdk/make/common/in
  PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
  
  # Create jargs file command
-@@ -93,11 +85,18 @@ $(PLUG_TEMPDIR)/jmf.clist:
+@@ -93,11 +85,18 @@
  	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
  	  $(ECHO) "$$i" >> $@; \
  	done
@@ -7106,7 +6899,7 @@ diff -uNpr ../orig/jdk/make/common/internal/BinaryPlugs.gmk ./jdk/make/common/in
  $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
  
-@@ -153,11 +152,16 @@ endif # IMPORT_BINARY_PLUGS
+@@ -153,11 +152,16 @@
  
  import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
@@ -7124,7 +6917,7 @@ diff -uNpr ../orig/jdk/make/common/internal/BinaryPlugs.gmk ./jdk/make/common/in
  
  # Binary plug start/complete messages
  
-@@ -169,14 +173,12 @@ import-binary-plugs-completed:
+@@ -169,14 +173,12 @@
  
  # Import lib files (only if they don't exist already)
  
@@ -7140,10 +6933,10 @@ diff -uNpr ../orig/jdk/make/common/internal/BinaryPlugs.gmk ./jdk/make/common/in
      import-binary-plug-jar \
      import-binary-plugs-completed
  
-diff -uNpr ../orig/jdk/make/common/shared/Compiler-gcc.gmk ./jdk/make/common/shared/Compiler-gcc.gmk
---- ../orig/jdk/make/common/shared/Compiler-gcc.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -99,6 +99,24 @@ ifeq ($(PLATFORM), linux)
+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
+@@ -99,6 +99,24 @@
  
  endif
  
@@ -7168,10 +6961,10 @@ diff -uNpr ../orig/jdk/make/common/shared/Compiler-gcc.gmk ./jdk/make/common/sha
  ifeq ($(PLATFORM), solaris)
  
    # Settings specific to Solaris
-diff -uNpr ../orig/jdk/make/common/shared/Compiler.gmk ./jdk/make/common/shared/Compiler.gmk
---- ../orig/jdk/make/common/shared/Compiler.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/common/shared/Compiler.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -37,8 +37,8 @@ ifeq ($(PLATFORM), 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
+@@ -37,8 +37,8 @@
    override CC_VERSION = sun
  endif
  
@@ -7182,10 +6975,10 @@ diff -uNpr ../orig/jdk/make/common/shared/Compiler.gmk ./jdk/make/common/shared/
    override CC_VERSION = gcc
  endif
  
-diff -uNpr ../orig/jdk/make/common/shared/Defs-bsd.gmk ./jdk/make/common/shared/Defs-bsd.gmk
---- ../orig/jdk/make/common/shared/Defs-bsd.gmk	2009-05-14 23:40:17.000000000 -0400
-+++ ./jdk/make/common/shared/Defs-bsd.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -70,7 +70,7 @@ $(shell if [ "$1" != "" -a -d "$1" ]; th
+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
+@@ -70,7 +70,7 @@
  endef
  
  # Location on system where jdk installs might be
@@ -7194,7 +6987,7 @@ diff -uNpr ../orig/jdk/make/common/shared/Defs-bsd.gmk ./jdk/make/common/shared/
  
  # UNIXCOMMAND_PATH: path to where the most common Unix commands are.
  #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-@@ -123,7 +123,7 @@ endif
+@@ -123,7 +123,7 @@
  ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
    DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
  else
@@ -7203,7 +6996,7 @@ diff -uNpr ../orig/jdk/make/common/shared/Defs-bsd.gmk ./jdk/make/common/shared/
  endif
  
  # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-@@ -162,16 +162,12 @@ else
+@@ -162,16 +162,12 @@
  endif
  MOTIF_INCLUDE = $(MOTIF_DIR)/include
  
@@ -7223,12 +7016,24 @@ diff -uNpr ../orig/jdk/make/common/shared/Defs-bsd.gmk ./jdk/make/common/shared/
  # Import JDK images allow for partial builds, components not built are
  #    imported (or copied from) these import areas when needed.
  
-diff -uNpr ../orig/jdk/make/common/shared/Defs-utils.gmk ./jdk/make/common/shared/Defs-utils.gmk
---- ../orig/jdk/make/common/shared/Defs-utils.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/common/shared/Defs-utils.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -77,6 +77,13 @@ ifndef FINDBUGS_HOME
+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
+@@ -42,7 +42,7 @@
+   #   Suspect this may not be needed anymore.
+   JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
+ else
+-  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
++  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m
+ endif
+ 
+ # 
+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
+@@ -80,6 +80,13 @@
+   endif
  endif
- FINDBUGS = $(FINDBUGS_HOME)/bin/findbugs
  
 +ifeq ($(PLATFORM),bsd)
 +  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
@@ -7240,7 +7045,7 @@ diff -uNpr ../orig/jdk/make/common/shared/Defs-utils.gmk ./jdk/make/common/share
  # Utilities
  ADB            = $(UTILS_COMMAND_PATH)adb
  AR             = $(UTILS_CCS_BIN_PATH)ar
-@@ -198,3 +205,32 @@ ifeq ($(PLATFORM),solaris)
+@@ -201,3 +208,32 @@
    ECHO           = /usr/bin/echo
  endif
  
@@ -7273,10 +7078,10 @@ diff -uNpr ../orig/jdk/make/common/shared/Defs-utils.gmk ./jdk/make/common/share
 +    TAR        = $(UTILS_USR_BIN_PATH)tar
 +  endif
 +endif
-diff -uNpr ../orig/jdk/make/common/shared/Defs.gmk ./jdk/make/common/shared/Defs.gmk
---- ../orig/jdk/make/common/shared/Defs.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/common/shared/Defs.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -143,7 +143,7 @@ $(shell \
+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
+@@ -143,7 +143,7 @@
          echo older; \
        else \
  	if [ $(call MajorVersion,$1) -eq $(call MajorVersion,$2) -a \
@@ -7285,10 +7090,10 @@ diff -uNpr ../orig/jdk/make/common/shared/Defs.gmk ./jdk/make/common/shared/Defs
            echo older; \
          else \
            echo newer; \
-diff -uNpr ../orig/jdk/make/common/shared/Platform.gmk ./jdk/make/common/shared/Platform.gmk
---- ../orig/jdk/make/common/shared/Platform.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/common/shared/Platform.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -276,6 +276,76 @@ ifeq ($(SYSTEM_UNAME), Linux)
+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
+@@ -276,6 +276,76 @@
    MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
  endif
  
@@ -7365,7 +7170,7 @@ diff -uNpr ../orig/jdk/make/common/shared/Platform.gmk ./jdk/make/common/shared/
  # Windows with and without CYGWIN will be slightly different
  ifeq ($(SYSTEM_UNAME), Windows_NT)
    PLATFORM = windows
-@@ -392,6 +462,13 @@ endif
+@@ -392,6 +462,13 @@
  #    system swapping during the build.
  #    If we don't know, assume 512. Subtract 128 from MB for VM MAX.
  #    Don't set VM max over 1024-128=896.
@@ -7379,7 +7184,7 @@ diff -uNpr ../orig/jdk/make/common/shared/Platform.gmk ./jdk/make/common/shared/
  ifneq ($(MB_OF_MEMORY),)
    LOW_MEMORY_MACHINE := $(shell \
      if [ $(MB_OF_MEMORY) -le 512 ] ; then \
-@@ -403,7 +480,7 @@ ifneq ($(MB_OF_MEMORY),)
+@@ -403,7 +480,7 @@
      if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
        expr $(MB_OF_MEMORY) '-' 128 ; \
      else \
@@ -7388,7 +7193,7 @@ diff -uNpr ../orig/jdk/make/common/shared/Platform.gmk ./jdk/make/common/shared/
      fi)
    MIN_VM_MEMORY := $(shell \
      if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
-@@ -455,6 +532,15 @@ ifneq ($(PLATFORM), windows)
+@@ -455,6 +532,15 @@
    ARCH_VM_SUBDIR=jre/lib/$(LIBARCH)
  endif
  
@@ -7404,10 +7209,10 @@ diff -uNpr ../orig/jdk/make/common/shared/Platform.gmk ./jdk/make/common/shared/
  # If blanks in the username, use the first 4 words and pack them together
  _USER1:=$(subst ', ,$(_USER))
  _USER2:=$(subst ", ,$(_USER1))
-diff -uNpr ../orig/jdk/make/common/shared/Sanity-Settings.gmk ./jdk/make/common/shared/Sanity-Settings.gmk
---- ../orig/jdk/make/common/shared/Sanity-Settings.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/common/shared/Sanity-Settings.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -257,6 +257,7 @@ ifdef OPENJDK
+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
+@@ -255,6 +255,7 @@
    ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
    ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
    ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH)
@@ -7415,10 +7220,10 @@ diff -uNpr ../orig/jdk/make/common/shared/Sanity-Settings.gmk ./jdk/make/common/
    ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
    ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
    ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_PATH)
-diff -uNpr ../orig/jdk/make/common/shared/Sanity.gmk ./jdk/make/common/shared/Sanity.gmk
---- ../orig/jdk/make/common/shared/Sanity.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/common/shared/Sanity.gmk	2009-05-14 23:41:33.000000000 -0400
-@@ -96,6 +96,11 @@ ifeq ($(PLATFORM), windows)
+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
+@@ -96,6 +96,11 @@
      $(EGREP) "\#define" | $(NAWK) '{print $$3}')
  endif
  
@@ -7430,10 +7235,10 @@ diff -uNpr ../orig/jdk/make/common/shared/Sanity.gmk ./jdk/make/common/shared/Sa
  # Get the version numbers of what we are using
  _MAKE_VER  :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1)
  _ZIP_VER   :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
-diff -uNpr ../orig/jdk/make/docs/Makefile ./jdk/make/docs/Makefile
---- ../orig/jdk/make/docs/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/docs/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -232,7 +232,7 @@ JDI_HEADER      = "Java Debug Interface"
+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 @@
  #       you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR)
  #       being interpreted as an end of command (newline)
  
@@ -7442,10 +7247,10 @@ diff -uNpr ../orig/jdk/make/docs/Makefile ./jdk/make/docs/Makefile
  JAAS_DOCDIR	 = $(DOCSDIR)/jre/api/security/jaas/spec
  JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS)			 \
  		   -encoding ascii			         \
-diff -uNpr ../orig/jdk/make/java/Makefile ./jdk/make/java/Makefile
---- ../orig/jdk/make/java/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -49,7 +49,7 @@ ifeq ($(PLATFORM), solaris)
+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
+@@ -49,7 +49,7 @@
    endif
  endif # PLATFORM
  
@@ -7454,10 +7259,10 @@ diff -uNpr ../orig/jdk/make/java/Makefile ./jdk/make/java/Makefile
    SUBDIRS += jexec
  endif # PLATFORM
  
-diff -uNpr ../orig/jdk/make/java/hpi/hpi_common.gmk ./jdk/make/java/hpi/hpi_common.gmk
---- ../orig/jdk/make/java/hpi/hpi_common.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/hpi/hpi_common.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -86,5 +86,9 @@ endif
+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
+@@ -86,5 +86,9 @@
  # Things that must be linked in.
  #
  ifneq ($(PLATFORM), windows)
@@ -7467,10 +7272,10 @@ diff -uNpr ../orig/jdk/make/java/hpi/hpi_common.gmk ./jdk/make/java/hpi/hpi_comm
  OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
  endif
 +endif
-diff -uNpr ../orig/jdk/make/java/hpi/native/Makefile ./jdk/make/java/hpi/native/Makefile
---- ../orig/jdk/make/java/hpi/native/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/hpi/native/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -72,11 +72,18 @@ OTHER_CPPFLAGS += -DUSE_PTHREADS
+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
+@@ -72,11 +72,18 @@
  ifeq ($(MOOT_PRIORITIES),true)
  OTHER_CPPFLAGS += -DMOOT_PRIORITIES
  endif
@@ -7489,10 +7294,10 @@ diff -uNpr ../orig/jdk/make/java/hpi/native/Makefile ./jdk/make/java/hpi/native/
  ifeq ($(HAVE_GETHRVTIME),true)
  OTHER_CPPFLAGS += -DHAVE_GETHRVTIME
  endif
-diff -uNpr ../orig/jdk/make/java/instrument/Makefile ./jdk/make/java/instrument/Makefile
---- ../orig/jdk/make/java/instrument/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/instrument/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -102,6 +102,21 @@ ifeq ($(PLATFORM), windows)
+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
+@@ -102,6 +102,21 @@
    # equivalent of strcasecmp is stricmp on Windows
    CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
  else
@@ -7514,7 +7319,7 @@ diff -uNpr ../orig/jdk/make/java/instrument/Makefile ./jdk/make/java/instrument/
    LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
    OTHER_LDLIBS += -ljli
    OTHER_LDLIBS += -ldl 
-@@ -114,6 +129,7 @@ else
+@@ -114,6 +129,7 @@
      LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
    endif
  endif
@@ -7522,10 +7327,10 @@ diff -uNpr ../orig/jdk/make/java/instrument/Makefile ./jdk/make/java/instrument/
  
  #
  # Library to compile.
-diff -uNpr ../orig/jdk/make/java/java/Makefile ./jdk/make/java/java/Makefile
---- ../orig/jdk/make/java/java/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/java/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -167,8 +167,10 @@ OTHER_INCLUDES += -I$(PLATFORM_SRC)/nati
+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
+@@ -167,8 +167,10 @@
  # Is the altzone extern documented in ctime(3C) available?
  #
  ifneq ($(PLATFORM), windows)
@@ -7536,7 +7341,7 @@ diff -uNpr ../orig/jdk/make/java/java/Makefile ./jdk/make/java/java/Makefile
  
  ifeq ($(HAVE_ALTZONE),true)
  OTHER_CPPFLAGS += -DHAVE_ALTZONE
-@@ -205,9 +207,14 @@ ifeq ($(PLATFORM),windows)
+@@ -205,9 +207,14 @@
  OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
  		       -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
  else
@@ -7551,10 +7356,69 @@ diff -uNpr ../orig/jdk/make/java/java/Makefile ./jdk/make/java/java/Makefile
  
  #
  # Rules.
-diff -uNpr ../orig/jdk/make/java/java/localegen.sh ./jdk/make/java/java/localegen.sh
---- ../orig/jdk/make/java/java/localegen.sh	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/java/localegen.sh	2009-05-14 23:41:34.000000000 -0400
-@@ -55,9 +55,9 @@ sed_script="$SED -e \"s@^#warn .*@// -- 
+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
+@@ -1,5 +1,5 @@
+ #
+-# Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
++# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -76,11 +76,16 @@
+ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
+ 	@$(RM) $@.tmp.euro $@.tmp.noneuro;
+ 	@$(prep-target) 
+-	@$(ECHO) $(subst .properties,'\n',$(Euro_Resources_properties)) > $@.tmp.euro;
+-	@$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro;	
+-	@$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro;
+-	@$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro;
+-	NAWK="$(NAWK)" SED="$(SED)" $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
++	@$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\
++'@g > $@.tmp.euro;
++	@$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\
++'@g >> $@.tmp.euro;
++	@$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\
++'@g > $@.tmp.noneuro;
++	@$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\
++'@g >> $@.tmp.noneuro;
++	NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
++	     $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
+ 		$@.tmp.noneuro $< $@
+ 	@$(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
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ #
+-# Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
++# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ #
+ # This code is free software; you can redistribute it and/or modify it
+@@ -29,7 +29,7 @@
+ # This script is to generate the supported locale list string and replace the
+ # LocaleDataMetaInfo-XLocales.java in <ws>/src/share/classes/sun/util
+ # 
+-# NAWK & SED is passed in as environment variables.
++# SORT, NAWK & SED is passed in as environment variables.
+ #
+ 
+ # A list of resource base name list;
+@@ -47,7 +47,7 @@
+ localelist=
+ getlocalelist() {
+     localelist=""
+-    localelist=`$NAWK -F$1_ '{print $2}' $2 | sort`
++    localelist=`$NAWK -F$1_ '{print $2}' $2 | $SORT`
+ }
+ 
+ sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" " 
+@@ -55,9 +55,9 @@
  for FILE in $RESOURCE_NAMES 
  do
      getlocalelist $FILE $EURO_FILES_LIST
@@ -7566,10 +7430,10 @@ diff -uNpr ../orig/jdk/make/java/java/localegen.sh ./jdk/make/java/java/localege
  done
  
  sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
-diff -uNpr ../orig/jdk/make/java/java_hprof_demo/Makefile ./jdk/make/java/java_hprof_demo/Makefile
---- ../orig/jdk/make/java/java_hprof_demo/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/java_hprof_demo/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -83,8 +83,10 @@ OTHER_INCLUDES = -I$(SRCDIR) \
+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
+@@ -83,8 +83,10 @@
  ifeq ($(PLATFORM), windows)
    OTHER_LDLIBS += wsock32.lib winmm.lib
  else
@@ -7580,10 +7444,10 @@ diff -uNpr ../orig/jdk/make/java/java_hprof_demo/Makefile ./jdk/make/java/java_h
  
  #
  # Tell library.gmk to copy the txt file first
-diff -uNpr ../orig/jdk/make/java/jli/Makefile ./jdk/make/java/jli/Makefile
---- ../orig/jdk/make/java/jli/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/jli/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -44,8 +44,10 @@ MS_RUNTIME_STATIC = true
+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
+@@ -44,8 +44,10 @@
  
  include $(BUILDDIR)/common/Defs.gmk
  
@@ -7594,7 +7458,7 @@ diff -uNpr ../orig/jdk/make/java/jli/Makefile ./jdk/make/java/jli/Makefile
  LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
  LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
  
-@@ -56,7 +58,10 @@ FILES_c = \
+@@ -56,7 +58,10 @@
  	parse_manifest.c \
  	version_comp.c \
  	wildcard.c \
@@ -7606,7 +7470,7 @@ diff -uNpr ../orig/jdk/make/java/jli/Makefile ./jdk/make/java/jli/Makefile
  	inflate.c \
  	infblock.c \
  	inftrees.c \
-@@ -65,6 +70,7 @@ FILES_c = \
+@@ -65,6 +70,7 @@
  	infutil.c \
  	zadler32.c \
  	zutil.c
@@ -7614,7 +7478,7 @@ diff -uNpr ../orig/jdk/make/java/jli/Makefile ./jdk/make/java/jli/Makefile
  
  OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
  
-@@ -98,7 +104,11 @@ endif
+@@ -98,7 +104,11 @@
  
  OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
  OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
@@ -7627,7 +7491,7 @@ diff -uNpr ../orig/jdk/make/java/jli/Makefile ./jdk/make/java/jli/Makefile
  
  #
  # Library to compile.
-@@ -136,8 +146,29 @@ library:: $(STATIC_LIBRARY)
+@@ -136,8 +146,29 @@
  
  endif	# PLATFORM
  
@@ -7658,10 +7522,10 @@ diff -uNpr ../orig/jdk/make/java/jli/Makefile ./jdk/make/java/jli/Makefile
 +endif
 +
  
-diff -uNpr ../orig/jdk/make/java/management/Makefile ./jdk/make/java/management/Makefile
---- ../orig/jdk/make/java/management/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/management/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -85,6 +85,11 @@ vpath %.c $(PLATFORM_SRC)/native/com/sun
+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
+@@ -85,6 +85,11 @@
  OTHER_INCLUDES += \
    -I$(SHARE_SRC)/native/sun/management 
  
@@ -7673,10 +7537,10 @@ diff -uNpr ../orig/jdk/make/java/management/Makefile ./jdk/make/java/management/
  ifeq ($(PLATFORM),windows)
    OTHER_LDLIBS += $(JVMLIB)
  endif
-diff -uNpr ../orig/jdk/make/java/net/FILES_c.gmk ./jdk/make/java/net/FILES_c.gmk
---- ../orig/jdk/make/java/net/FILES_c.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/net/FILES_c.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -43,6 +43,10 @@ ifeq ($(PLATFORM), linux)
+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
+@@ -43,6 +43,10 @@
      FILES_c += linux_close.c
  endif
  
@@ -7687,10 +7551,10 @@ diff -uNpr ../orig/jdk/make/java/net/FILES_c.gmk ./jdk/make/java/net/FILES_c.gmk
  ifeq ($(PLATFORM), windows)
      FILES_c += TwoStacksPlainSocketImpl.c
      FILES_c += DualStackPlainSocketImpl.c
-diff -uNpr ../orig/jdk/make/java/net/Makefile ./jdk/make/java/net/Makefile
---- ../orig/jdk/make/java/net/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/net/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -92,6 +92,12 @@ include $(BUILDDIR)/common/Mapfile-vers.
+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
+@@ -92,6 +92,12 @@
  
  include $(BUILDDIR)/common/Library.gmk
  
@@ -7703,7 +7567,7 @@ diff -uNpr ../orig/jdk/make/java/net/Makefile ./jdk/make/java/net/Makefile
  ifeq ($(PLATFORM), windows)
    OTHER_LDLIBS = ws2_32.lib $(JVMLIB)
    # Will not compile at warning level 3 if warnings are fatal
-@@ -102,6 +108,7 @@ endif
+@@ -102,6 +108,7 @@
  ifeq ($(PLATFORM), linux)
    OTHER_LDLIBS += -lpthread
  endif
@@ -7711,10 +7575,10 @@ diff -uNpr ../orig/jdk/make/java/net/Makefile ./jdk/make/java/net/Makefile
  
  CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
  
-diff -uNpr ../orig/jdk/make/java/nio/Makefile ./jdk/make/java/nio/Makefile
---- ../orig/jdk/make/java/nio/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/nio/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -82,7 +82,7 @@ FILES_export += \
+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
+@@ -82,7 +82,7 @@
  	sun/nio/ch/WindowsSelectorImpl.java
  endif # PLATFORM = windows
  
@@ -7723,7 +7587,7 @@ diff -uNpr ../orig/jdk/make/java/nio/Makefile ./jdk/make/java/nio/Makefile
  FILES_java += \
          sun/nio/ch/AbstractPollSelectorImpl.java \
  	sun/nio/ch/EPollArrayWrapper.java \
-@@ -126,6 +126,11 @@ OTHER_INCLUDES += \
+@@ -126,6 +126,11 @@
    -I$(PLATFORM_SRC)/native/java/net \
    -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders
  
@@ -7735,7 +7599,7 @@ diff -uNpr ../orig/jdk/make/java/nio/Makefile ./jdk/make/java/nio/Makefile
  ifeq ($(PLATFORM),windows)
    OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
       -libpath:$(LIBDIR) java.lib \
-@@ -137,6 +142,9 @@ ifeq ($(PLATFORM), linux)
+@@ -137,6 +142,9 @@
  COMPILER_WARNINGS_FATAL=true
  OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
  endif
@@ -7745,7 +7609,7 @@ diff -uNpr ../orig/jdk/make/java/nio/Makefile ./jdk/make/java/nio/Makefile
  ifeq ($(PLATFORM), solaris)
  OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
  		-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
-@@ -159,6 +167,9 @@ endif
+@@ -159,6 +167,9 @@
  ifeq ($(PLATFORM), linux)
  FILES_m = mapfile-linux
  endif
@@ -7755,10 +7619,10 @@ diff -uNpr ../orig/jdk/make/java/nio/Makefile ./jdk/make/java/nio/Makefile
  include $(BUILDDIR)/common/Mapfile-vers.gmk
  include $(BUILDDIR)/common/Library.gmk
  
-diff -uNpr ../orig/jdk/make/java/npt/Makefile ./jdk/make/java/npt/Makefile
---- ../orig/jdk/make/java/npt/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/npt/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -70,6 +70,18 @@ ifeq ($(PLATFORM), windows)
+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
+@@ -70,6 +70,18 @@
    OTHER_LCF += -export:nptInitialize -export:nptTerminate
  endif
  
@@ -7777,10 +7641,10 @@ diff -uNpr ../orig/jdk/make/java/npt/Makefile ./jdk/make/java/npt/Makefile
  #
  # Add to ambient vpath so we pick up the library files
  #
-diff -uNpr ../orig/jdk/make/java/redist/FILES.gmk ./jdk/make/java/redist/FILES.gmk
---- ../orig/jdk/make/java/redist/FILES.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/redist/FILES.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -38,6 +38,14 @@ SHARED_FONTFILES =					\
+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
+@@ -38,6 +38,14 @@
  	$(LIBDIR)/fonts/LucidaSansDemiBold.ttf       	\
  
  ifeq ($(PLATFORM), linux)
@@ -7795,10 +7659,10 @@ diff -uNpr ../orig/jdk/make/java/redist/FILES.gmk ./jdk/make/java/redist/FILES.g
  
  # 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 -uNpr ../orig/jdk/make/java/redist/Makefile ./jdk/make/java/redist/Makefile
---- ../orig/jdk/make/java/redist/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/redist/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -312,7 +312,7 @@ $(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/sha
+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
+@@ -312,7 +312,7 @@
  $(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
  	$(install-file)
  
@@ -7807,7 +7671,7 @@ diff -uNpr ../orig/jdk/make/java/redist/Makefile ./jdk/make/java/redist/Makefile
  
  # The oblique fonts are only needed/wanted on Linux.
  
-@@ -326,7 +326,7 @@ $(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_
+@@ -326,7 +326,7 @@
  $(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
  	$(install-file)
  
@@ -7816,10 +7680,10 @@ diff -uNpr ../orig/jdk/make/java/redist/Makefile ./jdk/make/java/redist/Makefile
  endif # !OPENJDK
  
  # Import internal files (ones that are stashed in this source tree)
-diff -uNpr ../orig/jdk/make/java/security/Makefile ./jdk/make/java/security/Makefile
---- ../orig/jdk/make/java/security/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/security/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -51,7 +51,15 @@ ifeq ($(PLATFORM), windows)
+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
+@@ -51,7 +51,15 @@
    ifneq ($(ARCH_DATA_MODEL), 64)
      PROPS_SRC   = $(TOPDIR)/src/share/lib/security/java.security-windows
    endif
@@ -7835,10 +7699,10 @@ diff -uNpr ../orig/jdk/make/java/security/Makefile ./jdk/make/java/security/Make
  endif # PLATFORM
  
  
-diff -uNpr ../orig/jdk/make/java/zip/FILES_c.gmk ./jdk/make/java/zip/FILES_c.gmk
---- ../orig/jdk/make/java/zip/FILES_c.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/zip/FILES_c.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -30,6 +30,10 @@ FILES_c = \
+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
+@@ -30,6 +30,10 @@
  	Inflater.c \
  	ZipFile.c \
  	ZipEntry.c \
@@ -7849,7 +7713,7 @@ diff -uNpr ../orig/jdk/make/java/zip/FILES_c.gmk ./jdk/make/java/zip/FILES_c.gmk
  	zadler32.c \
  	zcrc32.c \
  	deflate.c \
-@@ -40,5 +44,5 @@ FILES_c = \
+@@ -40,5 +44,5 @@
  	inftrees.c \
  	infcodes.c \
  	infutil.c \
@@ -7857,10 +7721,10 @@ diff -uNpr ../orig/jdk/make/java/zip/FILES_c.gmk ./jdk/make/java/zip/FILES_c.gmk
 -	zip_util.c
 +	inffast.c
 +endif
-diff -uNpr ../orig/jdk/make/java/zip/Makefile ./jdk/make/java/zip/Makefile
---- ../orig/jdk/make/java/zip/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/java/zip/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -72,16 +72,24 @@ else
+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
+@@ -72,16 +72,24 @@
  CPPFLAGS += -UDEBUG 
  endif
  
@@ -7886,10 +7750,10 @@ diff -uNpr ../orig/jdk/make/java/zip/Makefile ./jdk/make/java/zip/Makefile
  OTHER_LDLIBS = $(JVMLIB)
 +endif
 +
-diff -uNpr ../orig/jdk/make/javax/sound/FILES_c.gmk ./jdk/make/javax/sound/FILES_c.gmk
---- ../orig/jdk/make/javax/sound/FILES_c.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/javax/sound/FILES_c.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -34,6 +34,8 @@ FILES_solaris = \
+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
+@@ -34,6 +34,8 @@
  
  FILES_linux = 
  
@@ -7898,10 +7762,10 @@ diff -uNpr ../orig/jdk/make/javax/sound/FILES_c.gmk ./jdk/make/javax/sound/FILES
  FILES_windows = \
  	PLATFORM_API_WinOS_MidiIn.c \
  	PLATFORM_API_WinOS_MidiOut.c \
-diff -uNpr ../orig/jdk/make/javax/sound/Makefile ./jdk/make/javax/sound/Makefile
---- ../orig/jdk/make/javax/sound/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/javax/sound/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -107,6 +107,19 @@ ifeq ($(PLATFORM), linux)
+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
+@@ -107,6 +107,19 @@
    #MXSPP_ADD = $(PLATFORM)-$(ARCH)/
  endif # PLATFORM linux
  
@@ -7921,10 +7785,10 @@ diff -uNpr ../orig/jdk/make/javax/sound/Makefile ./jdk/make/javax/sound/Makefile
  ifeq ($(PLATFORM), solaris)
    ifneq ($(ARCH), amd64)
      # build with ports and direct audio
-diff -uNpr ../orig/jdk/make/javax/sound/SoundDefs.gmk ./jdk/make/javax/sound/SoundDefs.gmk
---- ../orig/jdk/make/javax/sound/SoundDefs.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/javax/sound/SoundDefs.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -40,6 +40,10 @@ ifeq ($(PLATFORM), linux)
+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
+@@ -40,6 +40,10 @@
    CPPFLAGS += -DX_PLATFORM=X_LINUX
  endif # PLATFORM linux
  
@@ -7935,10 +7799,10 @@ diff -uNpr ../orig/jdk/make/javax/sound/SoundDefs.gmk ./jdk/make/javax/sound/Sou
  ifeq ($(PLATFORM), solaris)
    CPPFLAGS += -DX_PLATFORM=X_SOLARIS
  
-diff -uNpr ../orig/jdk/make/jpda/back/Makefile ./jdk/make/jpda/back/Makefile
---- ../orig/jdk/make/jpda/back/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/jpda/back/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -49,8 +49,10 @@ OTHER_INCLUDES = -I$(SHARE_SRC)/transpor
+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
+@@ -49,8 +49,10 @@
                   -I$(GENNATIVESRCDIR)/jdwp
  
  ifneq ($(PLATFORM), windows)
@@ -7949,25 +7813,10 @@ diff -uNpr ../orig/jdk/make/jpda/back/Makefile ./jdk/make/jpda/back/Makefile
  
  #
  # This turns off all assert() checking in the optimized library
-diff -uNpr ../orig/jdk/make/jpda/transport/socket/Makefile ./jdk/make/jpda/transport/socket/Makefile
---- ../orig/jdk/make/jpda/transport/socket/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/jpda/transport/socket/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -45,6 +45,11 @@ ifeq ($(PLATFORM), linux)
-   OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
- endif
- 
-+ifeq ($(PLATFORM), bsd)
-+  LIBSOCKET =
-+  OTHER_LDLIBS += -pthread
-+endif
-+
- ifeq ($(PLATFORM), solaris)
-   OTHER_LDLIBS += -lnsl $(LIBSOCKET)
- endif
-diff -uNpr ../orig/jdk/make/sun/awt/Makefile ./jdk/make/sun/awt/Makefile
---- ../orig/jdk/make/sun/awt/Makefile	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/sun/awt/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -129,6 +129,14 @@ OTHER_CFLAGS += -DMOTIF_VERSION=2
+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
+@@ -129,6 +129,14 @@
  OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
  endif
  
@@ -7982,7 +7831,7 @@ diff -uNpr ../orig/jdk/make/sun/awt/Makefile ./jdk/make/sun/awt/Makefile
  FILES_c += initIDs.c
  
  # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
-@@ -241,7 +249,7 @@ vpath %.c     $(SHARE_SRC)/native/$(PKGD
+@@ -241,7 +249,7 @@
  # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
  endif # PLATFORM
  
@@ -7991,7 +7840,7 @@ diff -uNpr ../orig/jdk/make/sun/awt/Makefile ./jdk/make/sun/awt/Makefile
  # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
  vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
-@@ -421,6 +429,19 @@ FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+@@ -421,6 +429,19 @@
  # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
  endif # PLATFORM
  
@@ -8011,7 +7860,7 @@ diff -uNpr ../orig/jdk/make/sun/awt/Makefile ./jdk/make/sun/awt/Makefile
  FONTCONFIGS     = $(_FONTCONFIGS:%=$(LIBDIR)/%.src)
  BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc)
  
-@@ -514,6 +535,9 @@ CPPFLAGS += -I$(MOTIF_DIR)/include \
+@@ -514,6 +535,9 @@
              -I$(OPENWIN_HOME)/include/X11/extensions \
              -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
  endif
@@ -8021,7 +7870,7 @@ diff -uNpr ../orig/jdk/make/sun/awt/Makefile ./jdk/make/sun/awt/Makefile
  CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
              -I$(SHARE_SRC)/native/$(PKGDIR)/../font \
              -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-@@ -535,7 +559,13 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGD
+@@ -535,7 +559,13 @@
              -I$(PLATFORM_SRC)/native/$(PKGDIR) \
  	    $(EVENT_MODEL)
  
@@ -8036,10 +7885,10 @@ diff -uNpr ../orig/jdk/make/sun/awt/Makefile ./jdk/make/sun/awt/Makefile
  LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
  endif
  
-diff -uNpr ../orig/jdk/make/sun/awt/mawt.gmk ./jdk/make/sun/awt/mawt.gmk
---- ../orig/jdk/make/sun/awt/mawt.gmk	2009-04-24 03:33:55.000000000 -0400
-+++ ./jdk/make/sun/awt/mawt.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -172,7 +172,7 @@ ifeq ($(PLATFORM), solaris)
+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
+@@ -174,7 +174,7 @@
  OTHER_LDLIBS = $(LIBXM) -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
  endif
  
@@ -8048,7 +7897,7 @@ diff -uNpr ../orig/jdk/make/sun/awt/mawt.gmk ./jdk/make/sun/awt/mawt.gmk
  OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
  OTHER_CFLAGS += -DMOTIF_VERSION=2
  OTHER_CFLAGS += -DXMSTRINGDEFINES=1
-@@ -183,7 +183,11 @@ endif
+@@ -185,7 +185,11 @@
  # !HEADLESS
  
  OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \
@@ -8061,7 +7910,7 @@ diff -uNpr ../orig/jdk/make/sun/awt/mawt.gmk ./jdk/make/sun/awt/mawt.gmk
  
  #
  # Sun CC with -Xa misdefines __STDC__ to 0 (zero).
-@@ -227,16 +231,33 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGD
+@@ -229,16 +233,33 @@
          -I$(PLATFORM_SRC)/native/$(PKGDIR) \
          $(EVENT_MODEL)
  
@@ -8095,10 +7944,10 @@ diff -uNpr ../orig/jdk/make/sun/awt/mawt.gmk ./jdk/make/sun/awt/mawt.gmk
  
  LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
  	   $(AWT_RUNPATH)
-diff -uNpr ../orig/jdk/make/sun/font/Makefile ./jdk/make/sun/font/Makefile
---- ../orig/jdk/make/sun/font/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/font/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -177,6 +177,15 @@ else # PLATFORM
+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
+@@ -177,6 +177,15 @@
  # Libraries to link, and other C flags.
  #
  
@@ -8114,7 +7963,7 @@ diff -uNpr ../orig/jdk/make/sun/font/Makefile ./jdk/make/sun/font/Makefile
  ifeq ($(PLATFORM), solaris)
    # Note that on Solaris, fontmanager is built against the headless library.
    LDFLAGS      += -L$(LIBDIR)/$(LIBARCH)/headless
-@@ -187,6 +196,7 @@ else # PLATFORM is linux
+@@ -187,6 +196,7 @@
      OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
    endif                           
  endif
@@ -8122,10 +7971,10 @@ diff -uNpr ../orig/jdk/make/sun/font/Makefile ./jdk/make/sun/font/Makefile
  
  endif # PLATFORM
  
-diff -uNpr ../orig/jdk/make/sun/image/generic/Makefile ./jdk/make/sun/image/generic/Makefile
---- ../orig/jdk/make/sun/image/generic/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/image/generic/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -69,5 +69,9 @@ CPPFLAGS += \
+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
+@@ -69,5 +69,9 @@
              -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib 
  
  OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
@@ -8136,10 +7985,10 @@ diff -uNpr ../orig/jdk/make/sun/image/generic/Makefile ./jdk/make/sun/image/gene
 +endif
 +
  
-diff -uNpr ../orig/jdk/make/sun/jawt/Makefile ./jdk/make/sun/jawt/Makefile
---- ../orig/jdk/make/sun/jawt/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/jawt/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -98,9 +98,7 @@ else # PLATFORM
+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
+@@ -98,9 +98,7 @@
  #
  # Other extra flags needed for compiling.
  #
@@ -8150,7 +7999,7 @@ diff -uNpr ../orig/jdk/make/sun/jawt/Makefile ./jdk/make/sun/jawt/Makefile
              -I$(SHARE_SRC)/native/$(PKGDIR)/image \
  	    -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
  	    -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
-@@ -114,6 +112,8 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
+@@ -114,6 +112,8 @@
  	    -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
  	    -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
              -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
@@ -8159,7 +8008,7 @@ diff -uNpr ../orig/jdk/make/sun/jawt/Makefile ./jdk/make/sun/jawt/Makefile
  	    $(EVENT_MODEL)
  #
  # Libraries to link in.
-@@ -122,7 +122,7 @@ ifeq ($(PLATFORM), solaris)
+@@ -122,7 +122,7 @@
  OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
  endif # PLATFORM
  
@@ -8168,10 +8017,10 @@ diff -uNpr ../orig/jdk/make/sun/jawt/Makefile ./jdk/make/sun/jawt/Makefile
  OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
  endif # PLATFORM
  
-diff -uNpr ../orig/jdk/make/sun/security/jgss/wrapper/Makefile ./jdk/make/sun/security/jgss/wrapper/Makefile
---- ../orig/jdk/make/sun/security/jgss/wrapper/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/security/jgss/wrapper/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -71,6 +71,10 @@ include $(BUILDDIR)/common/Library.gmk
+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
+@@ -71,6 +71,10 @@
  #
  # Libraries to link
  #
@@ -8183,10 +8032,10 @@ diff -uNpr ../orig/jdk/make/sun/security/jgss/wrapper/Makefile ./jdk/make/sun/se
 +ifeq ($(PLATFORM), bsd)
 +  OTHER_LDLIBS = $(JVMLIB)
 +endif
-diff -uNpr ../orig/jdk/make/sun/security/pkcs11/Makefile ./jdk/make/sun/security/pkcs11/Makefile
---- ../orig/jdk/make/sun/security/pkcs11/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/security/pkcs11/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -155,7 +155,7 @@ include $(BUILDDIR)/common/Library.gmk
+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
+@@ -155,7 +155,7 @@
  #
  # Libraries to link
  #
@@ -8195,10 +8044,10 @@ diff -uNpr ../orig/jdk/make/sun/security/pkcs11/Makefile ./jdk/make/sun/security
    OTHER_LDLIBS = $(JVMLIB)
  else
    OTHER_LDLIBS = -ldl $(JVMLIB)
-diff -uNpr ../orig/jdk/make/sun/security/smartcardio/Makefile ./jdk/make/sun/security/smartcardio/Makefile
---- ../orig/jdk/make/sun/security/smartcardio/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/security/smartcardio/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -75,6 +75,10 @@ include $(BUILDDIR)/common/Library.gmk
+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
+@@ -75,6 +75,10 @@
  ifeq ($(PLATFORM), windows)
    OTHER_LDLIBS = $(JVMLIB) winscard.lib
  else
@@ -8210,10 +8059,10 @@ diff -uNpr ../orig/jdk/make/sun/security/smartcardio/Makefile ./jdk/make/sun/sec
 +  endif
    OTHER_CFLAGS = -D__sun_jdk
  endif
-diff -uNpr ../orig/jdk/make/sun/splashscreen/FILES_c.gmk ./jdk/make/sun/splashscreen/FILES_c.gmk
---- ../orig/jdk/make/sun/splashscreen/FILES_c.gmk	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/splashscreen/FILES_c.gmk	2009-05-14 23:41:34.000000000 -0400
-@@ -49,20 +49,6 @@ FILES_c = \
+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
+@@ -49,20 +49,6 @@
  	dgif_lib.c \
  	gif_err.c \
  	gifalloc.c \
@@ -8234,7 +8083,7 @@ diff -uNpr ../orig/jdk/make/sun/splashscreen/FILES_c.gmk ./jdk/make/sun/splashsc
  	jcomapi.c \
  	jdapimin.c \
  	jdapistd.c \
-@@ -108,3 +94,20 @@ FILES_c = \
+@@ -108,3 +94,20 @@
  	jfdctfst.c \
  	jfdctint.c
  
@@ -8255,10 +8104,10 @@ diff -uNpr ../orig/jdk/make/sun/splashscreen/FILES_c.gmk ./jdk/make/sun/splashsc
 +	zcrc32.c \
 +	zutil.c
 +endif
-diff -uNpr ../orig/jdk/make/sun/splashscreen/Makefile ./jdk/make/sun/splashscreen/Makefile
---- ../orig/jdk/make/sun/splashscreen/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/splashscreen/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -61,10 +61,26 @@ JAVALIB=
+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
+@@ -61,10 +61,26 @@
  
  CFLAGS += -DSPLASHSCREEN
  
@@ -8287,7 +8136,7 @@ diff -uNpr ../orig/jdk/make/sun/splashscreen/Makefile ./jdk/make/sun/splashscree
  else # PLATFORM
    CFLAGS += -DWITH_WIN32
    OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib 
-@@ -77,14 +93,13 @@ endif # PLATFORM
+@@ -77,14 +93,13 @@
  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)
  vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
@@ -8305,10 +8154,10 @@ diff -uNpr ../orig/jdk/make/sun/splashscreen/Makefile ./jdk/make/sun/splashscree
  ifeq ($(PLATFORM), linux)
    ifeq ($(ARCH_DATA_MODEL), 64)
      # 64-bit gcc has problems compiling MMX instructions.
-diff -uNpr ../orig/jdk/make/sun/xawt/Makefile ./jdk/make/sun/xawt/Makefile
---- ../orig/jdk/make/sun/xawt/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/sun/xawt/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -53,6 +53,11 @@ LDFLAGS += -lpthread
+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
+@@ -53,6 +53,11 @@
  dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
  endif
  
@@ -8320,7 +8169,7 @@ diff -uNpr ../orig/jdk/make/sun/xawt/Makefile ./jdk/make/sun/xawt/Makefile
  # Since this library will be living in a subdirectory below the other libraries
  #   we need to add an extra runpath so that libraries in the upper directory
  #   are found at runtime.
-@@ -86,7 +91,12 @@ vpath %.c   $(SHARE_SRC)/native/sun/java
+@@ -86,7 +91,12 @@
  vpath %.c   $(PLATFORM_SRC)/native/sun/java2d/opengl
  vpath %.c   $(PLATFORM_SRC)/native/sun/java2d/x11
  
@@ -8334,7 +8183,7 @@ diff -uNpr ../orig/jdk/make/sun/xawt/Makefile ./jdk/make/sun/xawt/Makefile
                     $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
  
  ifeq  ($(PLATFORM), solaris)
-@@ -94,8 +104,6 @@ CPPFLAGS += -DFUNCPROTO=15
+@@ -94,8 +104,6 @@
  dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
  endif
  
@@ -8343,7 +8192,7 @@ diff -uNpr ../orig/jdk/make/sun/xawt/Makefile ./jdk/make/sun/xawt/Makefile
  CPPFLAGS += -DXAWT -DXAWT_HACK \
          -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
          -I$(PLATFORM_SRC)/native/sun/awt \
-@@ -122,9 +130,11 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \
+@@ -122,9 +130,11 @@
          -I$(SHARE_SRC)/native/sun/awt \
          -I$(PLATFORM_SRC)/native/sun/awt 
  
@@ -8356,7 +8205,7 @@ diff -uNpr ../orig/jdk/make/sun/xawt/Makefile ./jdk/make/sun/xawt/Makefile
                -I/usr/include/X11/extensions \
                -I$(MOTIF_DIR)/include \
                -I$(OPENWIN_HOME)/include 
-@@ -134,6 +144,14 @@ ifeq ($(PLATFORM), solaris)
+@@ -134,6 +144,14 @@
    CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(MOTIF_DIR)/include 
  endif
  
@@ -8371,10 +8220,10 @@ diff -uNpr ../orig/jdk/make/sun/xawt/Makefile ./jdk/make/sun/xawt/Makefile
  ifeq ($(MILESTONE), internal)
    CPPFLAGS += -DINTERNAL_BUILD
  endif
-diff -uNpr ../orig/jdk/make/tools/freetypecheck/Makefile ./jdk/make/tools/freetypecheck/Makefile
---- ../orig/jdk/make/tools/freetypecheck/Makefile	2009-04-24 03:33:56.000000000 -0400
-+++ ./jdk/make/tools/freetypecheck/Makefile	2009-05-14 23:41:34.000000000 -0400
-@@ -60,8 +60,12 @@ else
+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
+@@ -60,8 +60,12 @@
    #add runtime lib search path to ensure test will be runnable
    ifeq ($(PLATFORM), solaris)
      FT_OPTIONS += -R $(FT_LIB) -lfreetype
@@ -8389,9 +8238,9 @@ diff -uNpr ../orig/jdk/make/tools/freetypecheck/Makefile ./jdk/make/tools/freety
    endif
  endif
  
-diff -uNpr ../orig/jdk/src/share/back/commonRef.c ./jdk/src/share/back/commonRef.c
---- ../orig/jdk/src/share/back/commonRef.c	2009-04-24 03:33:57.000000000 -0400
-+++ ./jdk/src/share/back/commonRef.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,6 +23,10 @@
   * have any questions.
   */
@@ -8403,10 +8252,10 @@ diff -uNpr ../orig/jdk/src/share/back/commonRef.c ./jdk/src/share/back/commonRef
  #include "util.h"
  #include "commonRef.h"
  
-diff -uNpr ../orig/jdk/src/share/bin/java.c ./jdk/src/share/bin/java.c
---- ../orig/jdk/src/share/bin/java.c	2009-04-24 03:33:57.000000000 -0400
-+++ ./jdk/src/share/bin/java.c	2009-05-14 23:41:34.000000000 -0400
-@@ -104,6 +104,11 @@ static char *progname;
+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
+@@ -104,6 +104,11 @@
  static char *launchername;
  jboolean _launcher_debug = JNI_FALSE;
  
@@ -8418,7 +8267,7 @@ diff -uNpr ../orig/jdk/src/share/bin/java.c ./jdk/src/share/bin/java.c
  /*
   * Entries for splash screen environment variables.
   * putenv is performed in SelectVersion. We need
-@@ -146,6 +151,10 @@ static void PrintUsage(JNIEnv* env, jboo
+@@ -146,6 +151,10 @@
  static void SetPaths(int argc, char **argv);
  
  
@@ -8429,7 +8278,7 @@ diff -uNpr ../orig/jdk/src/share/bin/java.c ./jdk/src/share/bin/java.c
  /* Maximum supported entries from jvm.cfg. */
  #define INIT_MAX_KNOWN_VMS      10
  /* Values for vmdesc.flag */
-@@ -184,13 +193,13 @@ static jlong threadStackSize = 0;  /* st
+@@ -184,13 +193,13 @@
  
  int JNICALL JavaMain(void * args); /* entry point                  */
  
@@ -8445,7 +8294,7 @@ diff -uNpr ../orig/jdk/src/share/bin/java.c ./jdk/src/share/bin/java.c
  
  /*
   * Entry point.
-@@ -332,49 +341,24 @@ main(int argc, char ** argv)
+@@ -332,49 +341,24 @@
      /* Show the splash screen if needed */
      ShowSplashScreen();
  
@@ -8504,7 +8353,7 @@ diff -uNpr ../orig/jdk/src/share/bin/java.c ./jdk/src/share/bin/java.c
      int argc = args->argc;
      char **argv = args->argv;
      char *jarfile = args->jarfile;
-@@ -1159,6 +1143,10 @@ ParseArguments(int *pargc, char ***pargv
+@@ -1159,6 +1143,10 @@
          } else if (strcmp(arg, "-X") == 0) {
              printXUsage = JNI_TRUE;
              return JNI_TRUE;
@@ -8515,7 +8364,7 @@ diff -uNpr ../orig/jdk/src/share/bin/java.c ./jdk/src/share/bin/java.c
  /*
   * The following case provide backward compatibility with old-style
   * command line options.
-@@ -1979,6 +1967,84 @@ KnownVMIndex(const char* name)
+@@ -1979,6 +1967,84 @@
      return -1;
  }
  
@@ -8600,10 +8449,10 @@ diff -uNpr ../orig/jdk/src/share/bin/java.c ./jdk/src/share/bin/java.c
  static void
  FreeKnownVMs()
  {
-diff -uNpr ../orig/jdk/src/share/bin/java.h ./jdk/src/share/bin/java.h
---- ../orig/jdk/src/share/bin/java.h	2009-04-24 03:33:57.000000000 -0400
-+++ ./jdk/src/share/bin/java.h	2009-05-14 23:41:34.000000000 -0400
-@@ -91,11 +91,17 @@ jboolean RemovableMachineDependentOption
+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
+@@ -91,11 +91,17 @@
  void PrintMachineDependentOptions();
  
  const char *jlong_format_specifier();
@@ -8623,10 +8472,10 @@ diff -uNpr ../orig/jdk/src/share/bin/java.h ./jdk/src/share/bin/java.h
  
  /* sun.java.launcher.* platform properties. */
  void SetJavaLauncherPlatformProps(void);
-diff -uNpr ../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-04-24 03:33:58.000000000 -0400
-+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java	2009-05-14 23:41:34.000000000 -0400
-@@ -477,6 +477,10 @@ class Metacity implements SynthConstants
+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
+@@ -477,6 +477,10 @@
                  String[] dirs = new String[] {
                      userHome + sep + ".themes",
                      System.getProperty("swing.metacitythemedir"),
@@ -8637,10 +8486,10 @@ diff -uNpr ../orig/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.ja
                      "/usr/share/themes",
                      "/usr/gnome/share/themes",  // Debian/Redhat/Solaris
                      "/opt/gnome2/share/themes"  // SuSE
-diff -uNpr ../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-04-24 03:34:00.000000000 -0400
-+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2009-05-14 23:41:34.000000000 -0400
-@@ -78,6 +78,9 @@ public class SnmpPduTrap extends SnmpPdu
+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
+@@ -78,6 +78,9 @@
       */
      public long            timeStamp ;
  
@@ -8650,10 +8499,39 @@ diff -uNpr ../orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java ./jdk
  
  
      /**
-diff -uNpr ../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-04-24 03:34:04.000000000 -0400
-+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java	2009-05-14 23:41:34.000000000 -0400
-@@ -148,7 +148,12 @@ public abstract class GraphicsEnvironmen
+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
+@@ -445,18 +445,19 @@
+      */
+     private AttributeValues getAttributeValues() {
+         if (values == null) {
+-            values = new AttributeValues();
+-            values.setFamily(name);
+-            values.setSize(pointSize); // expects the float value.
++            AttributeValues valuesTmp = new AttributeValues();
++            valuesTmp.setFamily(name);
++            valuesTmp.setSize(pointSize); // expects the float value.
+ 
+             if ((style & BOLD) != 0) {
+-                values.setWeight(2); // WEIGHT_BOLD
++                valuesTmp.setWeight(2); // WEIGHT_BOLD
+             }
+ 
+             if ((style & ITALIC) != 0) {
+-                values.setPosture(.2f); // POSTURE_OBLIQUE
++                valuesTmp.setPosture(.2f); // POSTURE_OBLIQUE
+             }
+-            values.defineAll(PRIMARY_MASK); // for streaming compatibility
++            valuesTmp.defineAll(PRIMARY_MASK); // for streaming compatibility
++            values = valuesTmp;
+         }
+ 
+         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
+@@ -148,7 +148,12 @@
                          } else {
                              String osName = System.getProperty("os.name");
                              headless = defaultHeadless =
@@ -8667,10 +8545,10 @@ diff -uNpr ../orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java ./jdk
                                                  (System.getenv("DISPLAY") == null));
                          }
                      } else if (nm.equals("true")) {
-diff -uNpr ../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-04-24 03:34:08.000000000 -0400
-+++ ./jdk/src/share/classes/java/util/TimeZone.java	2009-05-14 23:41:34.000000000 -0400
-@@ -779,15 +779,13 @@ abstract public class TimeZone implement
+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 @@
          }
          int gmtOffset =  (hours * 60 + num) * 60 * 1000;
  
@@ -8687,10 +8565,10 @@ diff -uNpr ../orig/jdk/src/share/classes/java/util/TimeZone.java ./jdk/src/share
          }
          return zi;
      }
-diff -uNpr ../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-04-24 03:34:16.000000000 -0400
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java	2009-05-14 23:41:34.000000000 -0400
-@@ -1073,7 +1073,7 @@ public abstract class FontConfiguration 
+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
+@@ -1073,7 +1073,7 @@
       */
      HashMap<String, Boolean> existsMap;
      public boolean needToSearchForFile(String fileName) {
@@ -8699,7 +8577,7 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/awt/FontConfiguration.java ./jdk/sr
              return false;
          } else if (existsMap == null) {
             existsMap = new HashMap<String, Boolean>();
-@@ -1309,7 +1309,7 @@ public abstract class FontConfiguration 
+@@ -1309,7 +1309,7 @@
                                     + "<filename."
                                     + getString(table_componentFontNameIDs[ii])
                                     + "> entry is missing!!!");
@@ -8708,10 +8586,123 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/awt/FontConfiguration.java ./jdk/sr
                      errors++;
                  }
              }
-diff -uNpr ../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-04-24 03:34:17.000000000 -0400
-+++ ./jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java	2009-05-14 23:41:34.000000000 -0400
-@@ -76,7 +76,7 @@ import sun.font.NativeFont;
+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
+@@ -159,6 +159,13 @@
+     private boolean supportsJA;
+     private boolean supportsCJK;
+ 
++    /* These are for faster access to the name of the font as
++     * typically exposed via API to applications.
++     */
++    private Locale nameLocale;
++    private String localeFamilyName;
++    private String localeFullName;
++
+     /**
+      * - does basic verification of the file
+      * - reads the header table for this font (within a collection)
+@@ -1058,6 +1065,10 @@
+              * greater than 32767, so read and store those as ints
+              */
+             int stringPtr = sbuffer.get() & 0xffff;
++
++            nameLocale = sun.awt.SunToolkit.getStartupLocale();
++            short nameLocaleID = FontManager.getLCIDFromLocale(nameLocale);
++
+             for (int i=0; i<numRecords; i++) {
+                 short platformID = sbuffer.get();
+                 if (platformID != MS_PLATFORM_ID) {
+@@ -1069,15 +1080,24 @@
+                 short nameID     = sbuffer.get();
+                 int nameLen    = ((int) sbuffer.get()) & 0xffff;
+                 int namePtr    = (((int) sbuffer.get()) & 0xffff) + stringPtr;
+-
++                String tmpName = null;
+                 switch (nameID) {
+ 
+                 case FAMILY_NAME_ID:
+ 
+-                    if (familyName == null || langID == ENGLISH_LOCALE_ID) {
++                    if (familyName == null || langID == ENGLISH_LOCALE_ID ||
++                        langID == nameLocaleID)
++                    {
+                         buffer.position(namePtr);
+                         buffer.get(name, 0, nameLen);
+-                        familyName = makeString(name, nameLen, encodingID);
++                        tmpName = makeString(name, nameLen, encodingID);
++
++                        if (familyName == null || langID == ENGLISH_LOCALE_ID){
++                            familyName = tmpName;
++                        }
++                        if (langID == nameLocaleID) {
++                            localeFamilyName = tmpName;
++                        }
+                     }
+ /*
+                     for (int ii=0;ii<nameLen;ii++) {
+@@ -1095,15 +1115,29 @@
+ 
+                 case FULL_NAME_ID:
+ 
+-                    if (fullName == null || langID == ENGLISH_LOCALE_ID) {
++                    if (fullName == null || langID == ENGLISH_LOCALE_ID ||
++                        langID == nameLocaleID)
++                    {
+                         buffer.position(namePtr);
+                         buffer.get(name, 0, nameLen);
+-                        fullName = makeString(name, nameLen, encodingID);
++                        tmpName = makeString(name, nameLen, encodingID);
++
++                        if (fullName == null || langID == ENGLISH_LOCALE_ID) {
++                            fullName = tmpName;
++                        }
++                        if (langID == nameLocaleID) {
++                            localeFullName = tmpName;
++                        }
+                     }
+                     break;
+-
+                 }
+             }
++            if (localeFamilyName == null) {
++                localeFamilyName = familyName;
++            }
++            if (localeFullName == null) {
++                localeFullName = fullName;
++            }
+         }
+     }
+ 
+@@ -1186,6 +1220,8 @@
+     public String getFontName(Locale locale) {
+         if (locale == null) {
+             return fullName;
++        } else if (locale.equals(nameLocale) && localeFullName != null) {
++            return localeFullName;
+         } else {
+             short localeID = FontManager.getLCIDFromLocale(locale);
+             String name = lookupName(localeID, FULL_NAME_ID);
+@@ -1200,11 +1236,13 @@
+     public String getFamilyName(Locale locale) {
+         if (locale == null) {
+             return familyName;
++        } else if (locale.equals(nameLocale) && localeFamilyName != null) {
++            return localeFamilyName;
+         } else {
+             short localeID = FontManager.getLCIDFromLocale(locale);
+             String name = lookupName(localeID, FAMILY_NAME_ID);
+             if (name == null) {
+-                return familyName;
++               return familyName;
+             } else {
+                 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
+@@ -76,7 +76,7 @@
  public abstract class SunGraphicsEnvironment extends GraphicsEnvironment
      implements FontSupport, DisplayChangedListener {
  
@@ -8720,7 +8711,7 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java
      public static boolean isSolaris;
      public static boolean isWindows;
      public static boolean noType1Font;
-@@ -164,7 +164,15 @@ public abstract class SunGraphicsEnviron
+@@ -164,7 +164,15 @@
              public Object run() {
                  String osName = System.getProperty("os.name");
                  if ("Linux".equals(osName)) {
@@ -8737,7 +8728,7 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java
                  } else if ("SunOS".equals(osName)) {
                      isSolaris = true;
                  } else if ("Windows".equals(osName)) {
-@@ -227,8 +235,8 @@ public abstract class SunGraphicsEnviron
+@@ -227,8 +235,8 @@
                   * Pass "true" to registerFonts method as on-screen these
                   * JRE fonts always go through the T2K rasteriser.
                   */
@@ -8748,10 +8739,22 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java
                      registerFontDir(jreFontDirName);
                  }
                  registerFontsInDir(jreFontDirName, true, Font2D.JRE_RANK,
-diff -uNpr ../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-04-24 03:34:21.000000000 -0400
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java	2009-05-14 23:41:34.000000000 -0400
-@@ -1531,7 +1531,9 @@ public class PSPrinterJob extends Raster
+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
+@@ -96,7 +96,7 @@
+             bboxX1 = x1+1;
+         } else {
+             if (bboxX0 > x0) bboxX0 = x0;
+-            if (bboxX1 < x1) bboxX1 = x1;
++            if (bboxX1 < x1 + 1) bboxX1 = x1 + 1;
+             while (bboxY1++ < y) {
+                 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
+@@ -1531,7 +1531,9 @@
              pFlags |= NOSHEET;
              ncomps+=1;
          }
@@ -8762,26 +8765,94 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/print/PSPrinterJob.java ./jdk/src/s
              execCmd = new String[ncomps];
              execCmd[n++] = "/usr/bin/lpr";
              if ((pFlags & PRINTER) != 0) {
-diff -uNpr ../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-04-24 03:34:25.000000000 -0400
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider	2009-05-14 23:41:34.000000000 -0400
+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
+@@ -49,8 +49,12 @@
+             AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+                     public Boolean run() {
+                             String osname = System.getProperty("os.name");
+-                            if (osname.startsWith("SunOS") ||
+-                                osname.startsWith("Linux")) {
++                            if (osname.startsWith("SunOS")
++                                    || osname.startsWith("Linux")
++                                    || osname.startsWith("FreeBSD")
++                                    || osname.startsWith("NetBSD")
++                                    || osname.startsWith("OpenBSD")
++                                    || osname.startsWith("Darwin")) {
+                                 return new Boolean(System.getProperty
+                                     (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
+@@ -82,7 +82,11 @@
+                             String osname = System.getProperty("os.name");
+                             if (osname.startsWith("SunOS")) {
+                                 gssLib = "libgss.so";
+-                            } else if (osname.startsWith("Linux")) {
++                            } else if (osname.startsWith("Linux")
++                                    || osname.startsWith("FreeBSD")
++                                    || osname.startsWith("NetBSD")
++                                    || osname.startsWith("OpenBSD")
++                                    || osname.startsWith("Darwin")) {
+                                 gssLib = "libgssapi.so";
+                             }
+                         }
+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
+@@ -711,7 +711,11 @@
+                     }
+                 } else if (osname.startsWith("SunOS")) {
+                     name =  "/etc/krb5/krb5.conf";
+-                } else if (osname.startsWith("Linux")) {
++                } else if (osname.startsWith("Linux")
++                        || osname.startsWith("FreeBSD")
++                        || osname.startsWith("NetBSD")
++                        || osname.startsWith("OpenBSD")
++                        || osname.startsWith("Darwin")) {
+                     name =  "/etc/krb5.conf";
+                 }
+             }
+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
+@@ -383,8 +383,12 @@
+             String uidStr = null;
+             long uid = 0;
+ 
+-            if (osname.startsWith("SunOS") ||
+-                (osname.startsWith("Linux"))) {
++            if (osname.startsWith("SunOS")
++                    || osname.startsWith("Linux")
++                    || osname.startsWith("FreeBSD")
++                    || osname.startsWith("NetBSD")
++                    || osname.startsWith("OpenBSD")
++                    || osname.startsWith("Darwin")) {
+                 try {
+                     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
 @@ -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 -uNpr ../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-04-24 03:34:25.000000000 -0400
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java	2009-05-14 23:41:34.000000000 -0400
-@@ -46,6 +46,7 @@ class Main {
+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
+@@ -48,6 +48,7 @@
      String zname = "";
      String[] files;
      String rootjar = null;
 +    String cwd;
-     Hashtable filesTable = new Hashtable();
-     Vector paths = new Vector();
-     Vector v;
-@@ -770,6 +771,19 @@ class Main {
+ 
+     // An entryName(path)->File map generated during "expand", it helps to
+     // decide whether or not an existing entry in a jar file needs to be
+@@ -860,6 +861,19 @@
       * Extracts specified entries from JAR file.
       */
      void extract(InputStream in, String files[]) throws IOException {
@@ -8800,8 +8871,8 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/tools/jar/Main.java ./jdk/src/share
 +
          ZipInputStream zis = new ZipInputStream(in);
          ZipEntry e;
-         // Set of all directory entries specified in archive.  Dissallows
-@@ -817,6 +831,10 @@ class Main {
+         // Set of all directory entries specified in archive.  Disallows
+@@ -921,6 +935,10 @@
          ZipEntry rc = null;
          String name = e.getName();
          File f = new File(e.getName().replace('/', File.separatorChar));
@@ -8812,7 +8883,7 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/tools/jar/Main.java ./jdk/src/share
          if (e.isDirectory()) {
              if (f.exists()) {
                  if (!f.isDirectory()) {
-@@ -838,6 +856,10 @@ class Main {
+@@ -942,6 +960,10 @@
          } else {
              if (f.getParent() != null) {
                  File d = new File(f.getParent());
@@ -8823,10 +8894,10 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/tools/jar/Main.java ./jdk/src/share
                  if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
                      throw new IOException(formatMsg(
                          "error.create.dir", d.getPath()));
-diff -uNpr ../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-04-24 03:34:25.000000000 -0400
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties	2009-05-14 23:41:34.000000000 -0400
-@@ -44,6 +44,8 @@ error.create.dir=\
+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
+@@ -44,6 +44,8 @@
          {0} : could not create directory
  error.incorrect.length=\
          incorrect length while processing: {0}
@@ -8835,10 +8906,10 @@ diff -uNpr ../orig/jdk/src/share/classes/sun/tools/jar/resources/jar.properties
  out.added.manifest=\
          added manifest
  out.update.manifest=\
-diff -uNpr ../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-04-24 03:34:28.000000000 -0400
-+++ ./jdk/src/share/hpi/include/hpi_impl.h	2009-05-14 23:41:34.000000000 -0400
-@@ -138,7 +138,11 @@ int sysConnect(int fd, struct sockaddr *
+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
+@@ -138,7 +138,11 @@
  int sysBind(int fd, struct sockaddr *him, int len);
  int sysAccept(int fd, struct sockaddr *him, int *len);
  int sysGetSockName(int fd, struct sockaddr *him, int *len);
@@ -8851,28 +8922,9 @@ diff -uNpr ../orig/jdk/src/share/hpi/include/hpi_impl.h ./jdk/src/share/hpi/incl
  ssize_t sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to,
                int tolen);
  ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags,
-diff -uNpr ../orig/jdk/src/share/lib/security/java.security-openbsd ./jdk/src/share/lib/security/java.security-openbsd
---- ../orig/jdk/src/share/lib/security/java.security-openbsd	2009-05-14 23:40:17.000000000 -0400
-+++ ./jdk/src/share/lib/security/java.security-openbsd	2009-05-14 23:41:34.000000000 -0400
-@@ -66,7 +66,14 @@ security.provider.8=sun.security.smartca
- # On Windows systems, the URLs file:/dev/random and file:/dev/urandom
- # enables use of the Microsoft CryptoAPI seed functionality.
- #
--securerandom.source=file:/dev/urandom
-+# On OpenBSD use file:///dev/srandom for strong but blocking random
-+# generator, file:/dev/random for hardware random generators,
-+# file:///dev/arandom for non-blocking high-quality pseudo-random
-+# data and file:///dev/urandom for non-blocking random data that
-+# does not guarantee the data to be strong. See random(4) for more
-+# info.
-+#
-+securerandom.source=file:///dev/arandom
- #
- # The entropy gathering device is described as a URL and can also
- # be specified with the system property "java.security.egd". For example,
-diff -uNpr ../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-04-24 03:34:28.000000000 -0400
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -32,6 +32,10 @@
  #include <unistd.h>
  #endif
@@ -8884,7 +8936,7 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ./j
  #ifndef FULL
  #define FULL 1 /* Adds <500 bytes to the zipped final product. */
  #endif
-@@ -89,11 +93,13 @@ extern void assert_failed(const char*);
+@@ -89,11 +93,13 @@
  // bytes and byte arrays
  
  typedef unsigned int uint;
@@ -8898,9 +8950,9 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h ./j
  #ifdef _MSC_VER
  typedef LONGLONG        jlong;
  typedef DWORDLONG       julong;
-diff -uNpr ../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-04-24 03:34:28.000000000 -0400
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -33,9 +33,14 @@
  #include <limits.h>
  #include <time.h>
@@ -8917,7 +8969,7 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp ./jd
  #endif
  
  #include "defines.h"
-@@ -58,9 +63,9 @@ int main(int argc, char **argv) {
+@@ -58,9 +63,9 @@
  // Single-threaded, implementation, not reentrant.
  // Includes a weak error check against MT access.
  #ifndef THREAD_SELF
@@ -8929,7 +8981,7 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp ./jd
  
  unpacker* unpacker::non_mt_current = null;
  unpacker* unpacker::current() {
-@@ -69,7 +74,7 @@ unpacker* unpacker::current() {
+@@ -69,7 +74,7 @@
  }
  static void set_current_unpacker(unpacker* u) {
    unpacker::non_mt_current = u;
@@ -8938,9 +8990,9 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp ./jd
            true));
  }
  
-diff -uNpr ../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-04-24 03:34:28.000000000 -0400
-+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -33,7 +33,11 @@
  
  #include <jni.h>
@@ -8953,10 +9005,10 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
  #include "SoundDefs.h"
  #include "DirectAudio.h"
  #include "Utilities.h"
-diff -uNpr ../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-04-24 03:34:28.000000000 -0400
-+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c	2009-05-14 23:41:34.000000000 -0400
-@@ -99,5 +99,17 @@ JNIEXPORT jint JNICALL Java_com_sun_medi
+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
+@@ -99,5 +99,17 @@
          return com_sun_media_sound_Platform_LIB_ALSA;
      }
  #endif
@@ -8974,9 +9026,9 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/media/sound/Platform.c ./jdk/src
 +#endif
      return 0;
  }
-diff -uNpr ../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-04-24 03:34:28.000000000 -0400
-+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -31,6 +31,7 @@
  #define X_WINDOWS       1
  #define X_SOLARIS       2
@@ -8994,7 +9046,7 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h ./jdk/sr
  #include <sys/types.h>
  #endif
  
-@@ -129,4 +130,9 @@ typedef char            SBYTE;
+@@ -129,4 +130,9 @@
  #endif
  
  
@@ -9004,10 +9056,10 @@ diff -uNpr ../orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h ./jdk/sr
 +
 +
  #endif  // __SOUNDDEFS_INCLUDED__
-diff -uNpr ../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-04-24 03:34:28.000000000 -0400
-+++ ./jdk/src/share/native/common/check_code.c	2009-05-14 23:41:34.000000000 -0400
-@@ -1069,7 +1069,7 @@ verify_method(context_type *context, jcl
+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
+@@ -1069,7 +1069,7 @@
   * Make sure that branches don't go into the middle of nowhere.
   */
  
@@ -9016,7 +9068,7 @@ diff -uNpr ../orig/jdk/src/share/native/common/check_code.c ./jdk/src/share/nati
  {
      unsigned char *p = (unsigned char *)&n;
      return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
-@@ -1148,26 +1148,26 @@ verify_opcode_operands(context_type *con
+@@ -1148,26 +1148,26 @@
              }
          }
          if (opcode == opc_tableswitch) {
@@ -9050,7 +9102,7 @@ diff -uNpr ../orig/jdk/src/share/native/common/check_code.c ./jdk/src/share/nati
              if (!isLegalTarget(context, target))
                  CCerror(context, "Illegal branch in opc_tableswitch");
              saved_operand[k + 1] = code_data[target];
-@@ -1615,7 +1615,7 @@ static int instruction_length(unsigned c
+@@ -1615,7 +1615,7 @@
              if (lpc + 2 >= (int *)end) {
                  return -1; /* do not read pass the end */
              }
@@ -9059,7 +9111,7 @@ diff -uNpr ../orig/jdk/src/share/native/common/check_code.c ./jdk/src/share/nati
              if ((index < 0) || (index > 65535)) {
                  return -1;      /* illegal */
              } else {
-@@ -1628,7 +1628,7 @@ static int instruction_length(unsigned c
+@@ -1628,7 +1628,7 @@
              int npairs;
              if (lpc + 1 >= (int *)end)
                  return -1; /* do not read pass the end */
@@ -9068,9 +9120,9 @@ diff -uNpr ../orig/jdk/src/share/native/common/check_code.c ./jdk/src/share/nati
              /* There can't be more than 64K labels because of the limit
               * on per-method byte code length.
               */
-diff -uNpr ../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-04-24 03:34:29.000000000 -0400
-+++ ./jdk/src/share/native/java/io/io_util.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -29,7 +29,15 @@
  extern jfieldID IO_fd_fdID;
  extern jfieldID IO_handle_fdID;
@@ -9088,9 +9140,9 @@ diff -uNpr ../orig/jdk/src/share/native/java/io/io_util.h ./jdk/src/share/native
  #define O_SYNC  (0x0800)
  #define O_DSYNC (0x2000)
  #endif
-diff -uNpr ../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-04-24 03:34:29.000000000 -0400
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -25,6 +25,10 @@
   * have any questions.
   */
@@ -9116,9 +9168,9 @@ diff -uNpr ../orig/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h ./jdk/
  
  /*
   * ANSI/POSIX
-diff -uNpr ../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-04-24 03:34:29.000000000 -0400
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -61,7 +61,7 @@
  #define log1p   jlog1p
  #define expm1   jexpm1
@@ -9128,10 +9180,10 @@ diff -uNpr ../orig/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h ./jdk
  #define __ieee754_sqrt          __j__ieee754_sqrt
  #define __ieee754_acos          __j__ieee754_acos
  #define __ieee754_acosh         __j__ieee754_acosh
-diff -uNpr ../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-04-24 03:34:29.000000000 -0400
-+++ ./jdk/src/share/native/java/util/zip/Inflater.c	2009-05-14 23:41:34.000000000 -0400
-@@ -67,6 +67,10 @@ Java_java_util_zip_Inflater_init(JNIEnv 
+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
+@@ -67,6 +67,10 @@
          return jlong_zero;
      } else {
          char *msg;
@@ -9142,7 +9194,7 @@ diff -uNpr ../orig/jdk/src/share/native/java/util/zip/Inflater.c ./jdk/src/share
          switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) {
            case Z_OK:
              return ptr_to_jlong(strm);
-@@ -202,6 +206,10 @@ Java_java_util_zip_Inflater_reset(JNIEnv
+@@ -202,6 +206,10 @@
      if (inflateReset(jlong_to_ptr(strm)) != Z_OK) {
          JNU_ThrowInternalError(env, 0);
      }
@@ -9153,9 +9205,9 @@ diff -uNpr ../orig/jdk/src/share/native/java/util/zip/Inflater.c ./jdk/src/share
  }
  
  JNIEXPORT void JNICALL
-diff -uNpr ../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-04-24 03:34:29.000000000 -0400
-+++ ./jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -42,44 +42,49 @@
  /* for _LP64 */
  #include <sys/types.h>
@@ -9239,10 +9291,10 @@ diff -uNpr ../orig/jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h ./jdk/s
  #endif
  
  #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-diff -uNpr ../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-04-24 03:34:29.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h	2009-05-14 23:41:34.000000000 -0400
-@@ -50,7 +50,9 @@ typedef void * dmutex_t;
+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
+@@ -50,7 +50,9 @@
  #include <stdio.h>
  #include <string.h>
  #include <assert.h>
@@ -9252,9 +9304,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/debug/debug_util.h ./jdk/src/sha
  #include <limits.h>
  
  /* keep these after the other headers */
-diff -uNpr ../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-04-24 03:34:29.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -24,7 +24,11 @@
   */
  
@@ -9267,9 +9319,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c ./jdk/
  
  #include "sun_awt_image_BufImgSurfaceData.h"
  
-diff -uNpr ../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-04-24 03:34:29.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,7 +23,11 @@
   * have any questions.
   */
@@ -9282,10 +9334,10 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/image/DataBufferNative.c ./jdk/s
  
  #include "SurfaceData.h"
  #include "sun_awt_image_DataBufferNative.h"
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c	2009-05-14 23:41:34.000000000 -0400
-@@ -86,7 +86,7 @@ typedef struct {
+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
+@@ -86,7 +86,7 @@
  #endif /* MLIB_USE_FTOI_CLAMPING */
  
  /***************************************************************/
@@ -9294,7 +9346,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c .
  
  /* NB: Explicit cast to DTYPE is necessary to avoid warning from Microsoft VC compiler.
        And we need to explicitly define cast behavior if source exceeds destination range.
-@@ -103,7 +103,7 @@ typedef struct {
+@@ -103,7 +103,7 @@
    dp[0    ] = (DTYPE) ((res0) & DTYPE_MASK);                      \
    dp[chan1] = (DTYPE) ((res1) & DTYPE_MASK)
  
@@ -9303,7 +9355,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c .
  
  /***************************************************************/
  #ifdef _NO_LONGLONG
-@@ -114,17 +114,17 @@ typedef struct {
+@@ -114,17 +114,17 @@
  
  #else /* _NO_LONGLONG */
  
@@ -9324,9 +9376,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c .
  
  #endif /* _NO_LONGLONG */
  
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -9366,9 +9418,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -9408,9 +9460,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c .
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -9450,9 +9502,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c .
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -95,7 +95,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -9492,9 +9544,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c ./
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -126,7 +126,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -9534,9 +9586,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -94,7 +94,7 @@
  #define D2I(x) CLAMP_S32((x) SAT_OFF)
  
@@ -9576,10 +9628,10 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
  #endif /* _NO_LONGLONG */
  
  /***************************************************************/
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c	2009-05-14 23:41:34.000000000 -0400
-@@ -95,7 +95,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+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
+@@ -95,7 +95,7 @@
      dst = dp[0];
      if (ld_offset + size < 32) {
        dmask = (mask0 << (32 - size)) >> ld_offset;
@@ -9588,7 +9640,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
        src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
        src = (src0 >> (ld_offset - ls_offset));
        dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -104,12 +104,12 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+@@ -104,12 +104,12 @@
  #else
        src = (src0 >> (ld_offset - ls_offset));
        dp[0] = (dst & (~dmask)) | (src & dmask);
@@ -9603,7 +9655,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
      src = (src0 >> (ld_offset - ls_offset));
      dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -118,7 +118,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+@@ -118,7 +118,7 @@
  #else
      src = (src0 >> (ld_offset - ls_offset));
      dp[0] = (dst & ~dmask) | (src & dmask);
@@ -9612,7 +9664,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      j = 32 - ld_offset;
      dp++;
      ls_offset += j;
-@@ -131,7 +131,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+@@ -131,7 +131,7 @@
  
      if (ld_offset + size < 32) {
        dmask = (mask0 << (32 - size)) >> ld_offset;
@@ -9621,7 +9673,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
        src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
        src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
        src = (src0 << shift) | (src1 >> (32 - shift));
-@@ -141,12 +141,12 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+@@ -141,12 +141,12 @@
  #else
        src = (src0 << shift) | (src1 >> (32 - shift));
        dp[0] = (dst & ~dmask) | (src & dmask);
@@ -9636,7 +9688,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
      src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
      src = (src0 << shift) | (src1 >> (32 - shift));
-@@ -156,7 +156,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+@@ -156,7 +156,7 @@
  #else
      src = (src0 << shift) | (src1 >> (32 - shift));
      dp[0] = (dst & ~dmask) | (src & dmask);
@@ -9645,7 +9697,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      j = 32 - ld_offset;
      dp++;
      sp++;
-@@ -164,19 +164,19 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+@@ -164,19 +164,19 @@
    }
  
    if (j < size) src1 = sp[0];
@@ -9669,7 +9721,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      sp++;
      dp++;
    }
-@@ -187,7 +187,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+@@ -187,7 +187,7 @@
      if (ls_offset + j > 32) src1 = sp[1];
      dst = dp[0];
      dmask = mask0 << (32 - j);
@@ -9678,7 +9730,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
      src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
      dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -196,7 +196,7 @@ void mlib_ImageCopy_bit_na(const mlib_u8
+@@ -196,7 +196,7 @@
  #else
      src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
      dp[0] = (dst & ~dmask) | (src & dmask);
@@ -9687,7 +9739,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
    }
  
  #else /* _LONGLONG */
-@@ -315,7 +315,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -315,7 +315,7 @@
      dst = dp[0];
      if (ld_offset >= size) {
        dmask = (lmask0 << (32 - size)) >> (ld_offset - size);
@@ -9696,7 +9748,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
        src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
        src = (src0 << (ls_offset - ld_offset));
        dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -324,12 +324,12 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -324,12 +324,12 @@
  #else
        src = (src0 << (ls_offset - ld_offset));
        dp[0] = (dst & (~dmask)) | (src & dmask);
@@ -9711,7 +9763,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
      src = (src0 << (ls_offset - ld_offset));
      dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -338,7 +338,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -338,7 +338,7 @@
  #else
      src = (src0 << (ls_offset - ld_offset));
      dp[0] = (dst & ~dmask) | (src & dmask);
@@ -9720,7 +9772,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      j = ld_offset;
      dp--;
      ls_offset -= j;
-@@ -351,7 +351,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -351,7 +351,7 @@
  
      if (ld_offset >= size) {
        dmask = (lmask0 << (32 - size)) >> (ld_offset - size);
@@ -9729,7 +9781,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
        src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
        src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
        src = (src0 >> shift) | (src1 << (32 - shift));
-@@ -361,12 +361,12 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -361,12 +361,12 @@
  #else
        src = (src0 >> shift) | (src1 << (32 - shift));
        dp[0] = (dst & ~dmask) | (src & dmask);
@@ -9744,7 +9796,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
      src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
      src = (src0 >> shift) | (src1 << (32 - shift));
-@@ -376,7 +376,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -376,7 +376,7 @@
  #else
      src = (src0 >> shift) | (src1 << (32 - shift));
      dp[0] = (dst & ~dmask) | (src & dmask);
@@ -9753,7 +9805,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      j = ld_offset;
      dp--;
      sp--;
-@@ -384,22 +384,22 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -384,22 +384,22 @@
    }
  
    if (j < size) src1 = sp[0];
@@ -9780,7 +9832,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      sp--;
      dp--;
    }
-@@ -410,7 +410,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -410,7 +410,7 @@
      if (ls_offset < j) src1 = sp[-1];
      dst = dp[0];
      dmask = lmask0 >> (32 - j);
@@ -9789,7 +9841,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
      src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
      src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
      dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
-@@ -419,7 +419,7 @@ void mlib_ImageCopy_bit_na_r(const mlib_
+@@ -419,7 +419,7 @@
  #else
      src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
      dp[0] = (dst & ~dmask) | (src & dmask);
@@ -9798,9 +9850,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c ./
    }
  
  #else  /* _LONGLONG */
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -168,7 +168,7 @@
  }
  
@@ -9819,7 +9871,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
  
  /***************************************************************/
  void mlib_ImageLookUp_U8_D64(const mlib_u8  *src,
-@@ -612,7 +612,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -612,7 +612,7 @@
  #pragma pipeloop(0)
  #endif /* __SUNPRO_C */
        for (i = 0; i < size - 7; i += 4, dp += 8, sa++) {
@@ -9828,7 +9880,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
-@@ -622,12 +622,12 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -622,12 +622,12 @@
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
          t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
@@ -9843,7 +9895,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
-@@ -637,7 +637,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -637,7 +637,7 @@
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
          t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
@@ -9852,7 +9904,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          s0 = sa[0];
          dp[4] = t0;
          dp[5] = t1;
-@@ -645,7 +645,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -645,7 +645,7 @@
          dp[7] = t3;
        }
  
@@ -9861,7 +9913,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
-@@ -655,12 +655,12 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -655,12 +655,12 @@
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
        t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
@@ -9876,7 +9928,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
-@@ -670,7 +670,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -670,7 +670,7 @@
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
        t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
@@ -9885,7 +9937,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        dp[4] = t0;
        dp[5] = t1;
        dp[6] = t2;
-@@ -718,7 +718,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -718,7 +718,7 @@
  #pragma pipeloop(0)
  #endif /* __SUNPRO_C */
        for (i = 0; i < size - 7; i += 4, dp += 12, sa++) {
@@ -9894,7 +9946,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
-@@ -732,14 +732,14 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -732,14 +732,14 @@
          t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
          t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
          t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
@@ -9911,7 +9963,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
-@@ -753,7 +753,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -753,7 +753,7 @@
          t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
          t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
          t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
@@ -9920,7 +9972,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          s0 = sa[0];
          dp[6] = t0;
          dp[7] = t1;
-@@ -763,7 +763,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -763,7 +763,7 @@
          dp[11] = t5;
        }
  
@@ -9929,7 +9981,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
-@@ -777,14 +777,14 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -777,14 +777,14 @@
        t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
        t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
        t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
@@ -9946,7 +9998,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
-@@ -798,7 +798,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -798,7 +798,7 @@
        t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
        t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
        t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
@@ -9955,7 +10007,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        dp[6] = t0;
        dp[7] = t1;
        dp[8] = t2;
-@@ -851,7 +851,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -851,7 +851,7 @@
  #pragma pipeloop(0)
  #endif /* __SUNPRO_C */
        for (i = 0; i < size - 7; i += 4, dp += 16, sa++) {
@@ -9964,7 +10016,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
-@@ -861,12 +861,12 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -861,12 +861,12 @@
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
          t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8));
@@ -9979,7 +10031,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
-@@ -876,12 +876,12 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -876,12 +876,12 @@
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
          t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8));
@@ -9994,7 +10046,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
-@@ -891,12 +891,12 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -891,12 +891,12 @@
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
          t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8));
@@ -10009,7 +10061,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
-@@ -906,7 +906,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -906,7 +906,7 @@
          t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
          t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
          t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8));
@@ -10018,7 +10070,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
          s0 = sa[0];
          dp[12] = t0;
          dp[13] = t1;
-@@ -914,7 +914,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -914,7 +914,7 @@
          dp[15] = t3;
        }
  
@@ -10027,7 +10079,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
-@@ -924,12 +924,12 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -924,12 +924,12 @@
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
        t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 21) & 0x7F8));
@@ -10042,7 +10094,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
-@@ -939,12 +939,12 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -939,12 +939,12 @@
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
        t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 13) & 0x7F8));
@@ -10057,7 +10109,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
-@@ -954,12 +954,12 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -954,12 +954,12 @@
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 5) & 0x7F8));
        t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 >> 5) & 0x7F8));
@@ -10072,7 +10124,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 21) & 0x7F8));
-@@ -969,7 +969,7 @@ void mlib_ImageLookUpSI_U8_D64(const mli
+@@ -969,7 +969,7 @@
        t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
        t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
        t3 = *(mlib_d64 *) ((mlib_u8 *) tab3 + ((s0 << 3) & 0x7F8));
@@ -10081,10 +10133,10 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c .
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c	2009-05-14 23:41:34.000000000 -0400
-@@ -88,7 +88,7 @@ typedef union {
+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
+@@ -88,7 +88,7 @@
  } d64_2_f32;
  
  /***************************************************************/
@@ -10093,7 +10145,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
  
  static const mlib_u32 mlib_bit_mask[16] = {
    0x00000000u, 0xFF000000u, 0x00FF0000u, 0xFFFF0000u,
-@@ -126,7 +126,7 @@ static const mlib_u32 mlib_bit_mask_3[3*
+@@ -126,7 +126,7 @@
    0x00000000u, 0x00FFFFFFu, 0xFF000000u, 0xFFFFFFFFu
  };
  
@@ -10102,7 +10154,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
  
  /***************************************************************/
  mlib_status mlib_ImageLookUp_Bit_U8_1(const mlib_u8 *src,
-@@ -228,13 +228,13 @@ mlib_status mlib_ImageLookUp_Bit_U8_1(co
+@@ -228,13 +228,13 @@
  #endif /* __SUNPRO_C */
      for (; i <= (size - 16); i += 16) {
        s0 = *(mlib_u16*)sa;
@@ -10118,7 +10170,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
        sa += 2;
      }
  
-@@ -258,20 +258,20 @@ mlib_status mlib_ImageLookUp_Bit_U8_1(co
+@@ -258,20 +258,20 @@
          val1 = p_dd[2*val0+1];
        }
  
@@ -10143,7 +10195,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
  
        ((mlib_u64*)da)[0] = (((mlib_u64*)dd_array)[sa[0]] & emask) | (((mlib_u64*)da)[0] &~ emask);
  
-@@ -323,13 +323,13 @@ mlib_status mlib_ImageLookUp_Bit_U8_2(co
+@@ -323,13 +323,13 @@
  
    val0 = table[0][0];
    val1 = table[0][1];
@@ -10159,7 +10211,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
    val0 |= (val0 << 16);
    val1 |= (val1 << 16);
  
-@@ -394,11 +394,11 @@ mlib_status mlib_ImageLookUp_Bit_U8_2(co
+@@ -394,11 +394,11 @@
          dd1 = dd2;
        }
  
@@ -10173,7 +10225,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
        ((mlib_u32*)da)[0] = (dd1 & emask) | (((mlib_u32*)da)[0] &~ emask);
  
  #else /* _NO_LONGLONG */
-@@ -412,11 +412,11 @@ mlib_status mlib_ImageLookUp_Bit_U8_2(co
+@@ -412,11 +412,11 @@
          dd = ((mlib_u64*)dd_array)[s0 & 0xf];
        }
  
@@ -10187,7 +10239,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
        ((mlib_u64*)da)[0] = (dd & emask) | (((mlib_u64*)da)[0] &~ emask);
  
  #endif /* _NO_LONGLONG */
-@@ -462,7 +462,7 @@ mlib_status mlib_ImageLookUp_Bit_U8_3(co
+@@ -462,7 +462,7 @@
  
    buffs = buff + size;
  
@@ -10196,7 +10248,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
    l0 = (table[0][0] << 24) | (table[2][0] << 16) | (table[1][0] << 8) | (table[0][0]);
    h0 = (table[0][1] << 24) | (table[2][1] << 16) | (table[1][1] << 8) | (table[0][1]);
    l1 = (l0 >> 8); l1 |= (l1 << 24);
-@@ -476,7 +476,7 @@ mlib_status mlib_ImageLookUp_Bit_U8_3(co
+@@ -476,7 +476,7 @@
    h1 = (h0 << 8); h1 |= (h1 >> 24);
    l2 = (l1 << 8); l2 |= (l2 >> 24);
    h2 = (h1 << 8); h2 |= (h2 >> 24);
@@ -10205,7 +10257,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
  
    /* calculate lookup table */
  #ifdef __SUNPRO_C
-@@ -564,11 +564,11 @@ mlib_status mlib_ImageLookUp_Bit_U8_3(co
+@@ -564,11 +564,11 @@
          dd = ((mlib_u32*)(d_array12 + (s0 & 0xF)))[1];
        }
  
@@ -10219,7 +10271,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
        da[0] = (dd & emask) | (da[0] &~ emask);
      }
  
-@@ -611,13 +611,13 @@ mlib_status mlib_ImageLookUp_Bit_U8_4(co
+@@ -611,13 +611,13 @@
  
    buffs = buff + size;
  
@@ -10235,9 +10287,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
  
    ((mlib_u32*)lh)[0] = l;  ((mlib_u32*)lh)[1] = l;
    ((mlib_u32*)lh)[2] = l;  ((mlib_u32*)lh)[3] = h;
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -30,7 +30,7 @@
  typedef union {
    mlib_d64 db;
@@ -10247,10 +10299,10 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c ./jdk
      mlib_s32 int1, int0;
  #else
      mlib_s32 int0, int1;
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c	2009-05-14 23:41:34.000000000 -0400
-@@ -275,11 +275,11 @@ void mlib_ImageCopy_bit_al(const mlib_u8
+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
+@@ -275,11 +275,11 @@
        for (i = 0; j <= (b_size - 4); j += 4, i++) {
          src0 = src1;
          src1 = pws[i + 1];
@@ -10264,7 +10316,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c ./jd
        }
  
        sa += i << 2;
-@@ -381,11 +381,11 @@ void mlib_c_ImageCopy_u8(const mlib_imag
+@@ -381,11 +381,11 @@
          for (; j <= (src_width - 4); j += 4) {
            src0 = src1;
            src1 = ps[1];
@@ -10278,7 +10330,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c ./jd
            ps++;
          }
        }
-@@ -414,11 +414,11 @@ void mlib_c_ImageCopy_u8(const mlib_imag
+@@ -414,11 +414,11 @@
          for (; j <= (src_width - 8); j += 8) {
            src0 = src1;
            src1 = ps[1];
@@ -10292,7 +10344,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c ./jd
            ps++;
          }
        }
-@@ -484,11 +484,11 @@ void mlib_c_ImageCopy_s16(const mlib_ima
+@@ -484,11 +484,11 @@
          for (; j <= (src_width - 2); j += 2) {
            src0 = src1;
            src1 = ps[1];
@@ -10306,7 +10358,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c ./jd
            ps++;
          }
        }
-@@ -516,11 +516,11 @@ void mlib_c_ImageCopy_s16(const mlib_ima
+@@ -516,11 +516,11 @@
          for (; j <= (src_width - 4); j += 4) {
            src0 = src1;
            src1 = ps[1];
@@ -10320,7 +10372,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c ./jd
            ps++;
          }
        }
-@@ -585,11 +585,11 @@ void mlib_c_ImageCopy_s32(const mlib_ima
+@@ -585,11 +585,11 @@
          for (; j <= (src_width - 2); j += 2) {
            src0 = src1;
            src1 = ps[1];
@@ -10334,7 +10386,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c ./jd
            ps++;
          }
        }
-@@ -687,11 +687,11 @@ void mlib_ImageCopy_na(const mlib_u8 *sp
+@@ -687,11 +687,11 @@
  #endif /* __SUNPRO_C */
        for (; n > SIZE; n -= SIZE) {
          s1 = *tmp++;
@@ -10348,9 +10400,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c ./jd
          s0 = s1;
          dp += SIZE;
          sp += SIZE;
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -120,7 +120,7 @@
    }                                                               \
  }
@@ -10378,7 +10430,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
  
  /***************************************************************/
  void mlib_c_ImageLookUp_U8_U8(const mlib_u8 *src,
-@@ -297,11 +297,11 @@ void mlib_c_ImageLookUp_U8_U8(const mlib
+@@ -297,11 +297,11 @@
          da[0] = t;
          da++;
          dp = (mlib_u8 *) da;
@@ -10392,7 +10444,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          sp = (mlib_u8 *) sa;
          i += 5;
          for (; i < size; i++, dp++, sp++)
-@@ -403,11 +403,11 @@ void mlib_c_ImageLookUp_U8_U8(const mlib
+@@ -403,11 +403,11 @@
          da[0] = t;
          da++;
          dp = (mlib_u8 *) da;
@@ -10406,7 +10458,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          sp = (mlib_u8 *) sa;
          i += 5;
  
-@@ -544,11 +544,11 @@ void mlib_c_ImageLookUp_U8_U8(const mlib
+@@ -544,11 +544,11 @@
          da[0] = t;
          da++;
          dp = (mlib_u8 *) da;
@@ -10420,7 +10472,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          sp = (mlib_u8 *) sa;
          i += 5;
  
-@@ -694,11 +694,11 @@ void mlib_c_ImageLookUp_U8_U8(const mlib
+@@ -694,11 +694,11 @@
          da[0] = t;
          da++;
          dp = (mlib_u8 *) da;
@@ -10434,7 +10486,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          sp = (mlib_u8 *) sa;
          i += 5;
  
-@@ -1852,21 +1852,21 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -1852,21 +1852,21 @@
      s0 = tab0[0];
      s1 = tab1[0];
      for (i = 1; i < 256; i++) {
@@ -10460,7 +10512,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
      tab[255] = (mlib_u16) s2;
  
      for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -1897,11 +1897,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -1897,11 +1897,11 @@
          for (i = 0; i < size - 3; i += 2, da++, sa += 2) {
            t0 = tab[s0];
            t1 = tab[s1];
@@ -10474,7 +10526,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            s0 = sa[0];
            s1 = sa[1];
            da[0] = t;
-@@ -1909,11 +1909,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -1909,11 +1909,11 @@
  
          t0 = tab[s0];
          t1 = tab[s1];
@@ -10488,7 +10540,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          da[0] = t;
          da++;
  
-@@ -1927,13 +1927,13 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -1927,13 +1927,13 @@
  
          if (off > 1) {
            t0 = tab[sa[0]];
@@ -10504,7 +10556,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            sa++;
            size--;
            dp += 2;
-@@ -1941,11 +1941,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -1941,11 +1941,11 @@
  
          t0 = tab[sa[0]];
          sa++;
@@ -10518,7 +10570,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
  
          da = (mlib_s32 *) dp;
  
-@@ -1959,11 +1959,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -1959,11 +1959,11 @@
          for (i = 0; i < size - 4; i += 2, da++, sa += 2) {
            t1 = tab[s0];
            t2 = tab[s1];
@@ -10532,7 +10584,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            t0 = t2;
            s0 = sa[0];
            s1 = sa[1];
-@@ -1972,29 +1972,29 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -1972,29 +1972,29 @@
  
          t1 = tab[s0];
          t2 = tab[s1];
@@ -10568,7 +10620,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          }
        }
      }
-@@ -2012,22 +2012,22 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -2012,22 +2012,22 @@
      s1 = tab1[0];
      s2 = tab2[0];
      for (i = 1; i < 256; i++) {
@@ -10595,7 +10647,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
      tab[255] = s3;
  
      for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -2064,24 +2064,24 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -2064,24 +2064,24 @@
        for (i = 0; i < size - 7; i += 4, da += 3, sa += 4) {
          t0 = tab[s0];
          t1 = tab[s1];
@@ -10624,7 +10676,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[2];
          s1 = sa[3];
          da[1] = res2;
-@@ -2090,24 +2090,24 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -2090,24 +2090,24 @@
  
        t0 = tab[s0];
        t1 = tab[s1];
@@ -10653,7 +10705,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        da[1] = res2;
        da[2] = res1;
        da += 3;
-@@ -2143,11 +2143,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -2143,11 +2143,11 @@
      s2 = tab2[0];
      s3 = tab3[0];
      for (i = 1; i < 256; i++) {
@@ -10667,7 +10719,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        s0 = tab0[i];
        s1 = tab1[i];
        s2 = tab2[i];
-@@ -2155,11 +2155,11 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -2155,11 +2155,11 @@
        tab[i - 1] = s4;
      }
  
@@ -10681,7 +10733,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
      tab[255] = s4;
  
      for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -2225,13 +2225,13 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -2225,13 +2225,13 @@
          for (i = 0; i < size - 4; i += 2, da += 2, sa += 2) {
            t1 = tab[s0];
            t2 = tab[s1];
@@ -10697,7 +10749,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            t0 = t2;
            s0 = sa[0];
            s1 = sa[1];
-@@ -2241,28 +2241,28 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -2241,28 +2241,28 @@
  
          t1 = tab[s0];
          t2 = tab[s1];
@@ -10731,7 +10783,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            dp[3] = (mlib_u8) (t0 >> 24);
            dp[2] = (mlib_u8) (t0 >> 16);
            dp[1] = (mlib_u8) (t0 >> 8);
-@@ -2272,7 +2272,7 @@ void mlib_c_ImageLookUpSI_U8_U8(const ml
+@@ -2272,7 +2272,7 @@
            dp[1] = (mlib_u8) (t0 >> 16);
            dp[2] = (mlib_u8) (t0 >> 8);
            dp[3] = (mlib_u8) t0;
@@ -10740,7 +10792,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          }
        }
      }
-@@ -2348,13 +2348,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2348,13 +2348,13 @@
          t3 = tab0[s1];
          t4 = tab1[s1];
          t5 = tab2[s1];
@@ -10756,7 +10808,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[0];
          s1 = sa[1];
          t0 = tab0[s0];
-@@ -2363,13 +2363,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2363,13 +2363,13 @@
          t3 = tab0[s1];
          t4 = tab1[s1];
          t5 = tab2[s1];
@@ -10772,7 +10824,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[2];
          s1 = sa[3];
          da[1] = res2;
-@@ -2382,13 +2382,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2382,13 +2382,13 @@
        t3 = tab0[s1];
        t4 = tab1[s1];
        t5 = tab2[s1];
@@ -10788,7 +10840,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        s0 = sa[0];
        s1 = sa[1];
        t0 = tab0[s0];
-@@ -2397,13 +2397,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2397,13 +2397,13 @@
        t3 = tab0[s1];
        t4 = tab1[s1];
        t5 = tab2[s1];
@@ -10804,7 +10856,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        da[1] = res2;
        da[2] = res1;
        da += 3;
-@@ -2455,11 +2455,11 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2455,11 +2455,11 @@
            t1 = tab1[s0];
            t2 = tab2[s0];
            t3 = tab3[s0];
@@ -10818,7 +10870,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            s0 = sa[0];
            da[0] = res;
          }
-@@ -2468,11 +2468,11 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2468,11 +2468,11 @@
          t1 = tab1[s0];
          t2 = tab2[s0];
          t3 = tab3[s0];
@@ -10832,7 +10884,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          da[0] = res;
  
        }
-@@ -2496,11 +2496,11 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2496,11 +2496,11 @@
          t2 = tab2[s0];
          t3 = tab3[s0];
  
@@ -10846,7 +10898,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
  
          s0 = sa[0];
          sa++;
-@@ -2513,13 +2513,13 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2513,13 +2513,13 @@
            t1 = tab1[s0];
            t2 = tab2[s0];
            t3 = tab3[s0];
@@ -10862,7 +10914,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            res1 = res2;
            s0 = sa[0];
            da[0] = res;
-@@ -2529,21 +2529,21 @@ void mlib_c_ImageLookUpSI_S16_U8(const m
+@@ -2529,21 +2529,21 @@
          t1 = tab1[s0];
          t2 = tab2[s0];
          t3 = tab3[s0];
@@ -10888,7 +10940,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        }
      }
    }
-@@ -2617,13 +2617,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2617,13 +2617,13 @@
          t3 = tab0[s1];
          t4 = tab1[s1];
          t5 = tab2[s1];
@@ -10904,7 +10956,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[0];
          s1 = sa[1];
          t0 = tab0[s0];
-@@ -2632,13 +2632,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2632,13 +2632,13 @@
          t3 = tab0[s1];
          t4 = tab1[s1];
          t5 = tab2[s1];
@@ -10920,7 +10972,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[2];
          s1 = sa[3];
          da[1] = res2;
-@@ -2651,13 +2651,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2651,13 +2651,13 @@
        t3 = tab0[s1];
        t4 = tab1[s1];
        t5 = tab2[s1];
@@ -10936,7 +10988,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        s0 = sa[0];
        s1 = sa[1];
        t0 = tab0[s0];
-@@ -2666,13 +2666,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2666,13 +2666,13 @@
        t3 = tab0[s1];
        t4 = tab1[s1];
        t5 = tab2[s1];
@@ -10952,7 +11004,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        da[1] = res2;
        da[2] = res1;
        da += 3;
-@@ -2724,11 +2724,11 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2724,11 +2724,11 @@
            t1 = tab1[s0];
            t2 = tab2[s0];
            t3 = tab3[s0];
@@ -10966,7 +11018,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            s0 = sa[0];
            da[0] = res;
          }
-@@ -2737,11 +2737,11 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2737,11 +2737,11 @@
          t1 = tab1[s0];
          t2 = tab2[s0];
          t3 = tab3[s0];
@@ -10980,7 +11032,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          da[0] = res;
  
        }
-@@ -2765,11 +2765,11 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2765,11 +2765,11 @@
          t2 = tab2[s0];
          t3 = tab3[s0];
  
@@ -10994,7 +11046,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
  
          s0 = sa[0];
          sa++;
-@@ -2782,13 +2782,13 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2782,13 +2782,13 @@
            t1 = tab1[s0];
            t2 = tab2[s0];
            t3 = tab3[s0];
@@ -11010,7 +11062,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            res1 = res2;
            s0 = sa[0];
            da[0] = res;
-@@ -2798,21 +2798,21 @@ void mlib_c_ImageLookUpSI_U16_U8(const m
+@@ -2798,21 +2798,21 @@
          t1 = tab1[s0];
          t2 = tab2[s0];
          t3 = tab3[s0];
@@ -11036,7 +11088,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        }
      }
    }
-@@ -2863,21 +2863,21 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -2863,21 +2863,21 @@
      s0 = tab0[0];
      s1 = tab1[0];
      for (i = 1; i < 256; i++) {
@@ -11062,7 +11114,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
      tab[255] = s2;
  
      for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -2919,11 +2919,11 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -2919,11 +2919,11 @@
        else {
  
          t0 = tab[*sa++];
@@ -11076,7 +11128,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          da = (mlib_u32 *) dp;
          s0 = sa[0];
          s1 = sa[1];
-@@ -2935,13 +2935,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -2935,13 +2935,13 @@
          for (i = 0; i < size - 4; i += 2, da += 2, sa += 2) {
            t1 = tab[s0];
            t2 = tab[s1];
@@ -11092,7 +11144,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            t0 = t2;
            s0 = sa[0];
            s1 = sa[1];
-@@ -2951,32 +2951,32 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -2951,32 +2951,32 @@
  
          t1 = tab[s0];
          t2 = tab[s1];
@@ -11131,7 +11183,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          }
        }
      }
-@@ -2994,13 +2994,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -2994,13 +2994,13 @@
      s1 = tab1[0];
      s2 = tab2[0];
      for (i = 1; i < 256; i++) {
@@ -11147,7 +11199,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        s0 = tab0[i];
        s1 = tab1[i];
        s2 = tab2[i];
-@@ -3008,13 +3008,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3008,13 +3008,13 @@
        tab[2 * i - 1] = s4;
      }
  
@@ -11163,7 +11215,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
      tab[511] = s4;
  
      for (j = 0; j < ysize; j++, dst += dlb, src += slb) {
-@@ -3050,13 +3050,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3050,13 +3050,13 @@
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
@@ -11179,7 +11231,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[0] << 3;
          s1 = sa[1] << 3;
          da[0] = res1;
-@@ -3068,13 +3068,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3068,13 +3068,13 @@
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
@@ -11195,7 +11247,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        da[0] = res1;
        da[1] = res2;
        da[2] = t3;
-@@ -3105,13 +3105,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3105,13 +3105,13 @@
      s2 = tab2[0];
      s3 = tab3[0];
      for (i = 1; i < 256; i++) {
@@ -11211,7 +11263,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        s0 = tab0[i];
        s1 = tab1[i];
        s2 = tab2[i];
-@@ -3120,13 +3120,13 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3120,13 +3120,13 @@
        tab[2 * i - 1] = s5;
      }
  
@@ -11227,7 +11279,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
      tab[510] = s4;
      tab[511] = s5;
  
-@@ -3181,18 +3181,18 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3181,18 +3181,18 @@
  
          t4 = tab[2 * sa[0]];
          t5 = tab[2 * sa[0] + 1];
@@ -11250,7 +11302,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[0] << 3;
          s1 = sa[1] << 3;
          sa += 2;
-@@ -3205,7 +3205,7 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3205,7 +3205,7 @@
            t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
            t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
            t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
@@ -11259,7 +11311,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            res1 = (t5 >> 16) + (t0 << 16);
            res2 = (t0 >> 16) + (t1 << 16);
            res3 = (t1 >> 16) + (t2 << 16);
-@@ -3215,7 +3215,7 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3215,7 +3215,7 @@
            res2 = (t0 << 16) + (t1 >> 16);
            res3 = (t1 << 16) + (t2 >> 16);
            res4 = (t2 << 16) + (t3 >> 16);
@@ -11268,7 +11320,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
            s0 = sa[0] << 3;
            s1 = sa[1] << 3;
            da[0] = res1;
-@@ -3229,7 +3229,7 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3229,7 +3229,7 @@
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab + s0 + 4);
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab + s1);
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab + s1 + 4);
@@ -11277,7 +11329,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          res1 = (t5 >> 16) + (t0 << 16);
          res2 = (t0 >> 16) + (t1 << 16);
          res3 = (t1 >> 16) + (t2 << 16);
-@@ -3239,36 +3239,36 @@ void mlib_c_ImageLookUpSI_U8_S16(const m
+@@ -3239,36 +3239,36 @@
          res2 = (t0 << 16) + (t1 >> 16);
          res3 = (t1 << 16) + (t2 >> 16);
          res4 = (t2 << 16) + (t3 >> 16);
@@ -11321,7 +11373,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          }
        }
      }
-@@ -3439,7 +3439,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3439,7 +3439,7 @@
  #pragma pipeloop(0)
  #endif /* __SUNPRO_C */
        for (i = 0; i < size - 7; i += 4, dp += 8, sa++) {
@@ -11330,7 +11382,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
-@@ -3449,12 +3449,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3449,12 +3449,12 @@
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
@@ -11345,7 +11397,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
-@@ -3464,7 +3464,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3464,7 +3464,7 @@
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
@@ -11354,7 +11406,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[0];
          dp[4] = t0;
          dp[5] = t1;
-@@ -3472,7 +3472,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3472,7 +3472,7 @@
          dp[7] = t3;
        }
  
@@ -11363,7 +11415,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
-@@ -3482,12 +3482,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3482,12 +3482,12 @@
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
@@ -11378,7 +11430,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
-@@ -3497,7 +3497,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3497,7 +3497,7 @@
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
@@ -11387,7 +11439,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        dp[4] = t0;
        dp[5] = t1;
        dp[6] = t2;
-@@ -3545,7 +3545,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3545,7 +3545,7 @@
  #pragma pipeloop(0)
  #endif /* __SUNPRO_C */
        for (i = 0; i < size - 7; i += 4, dp += 12, sa++) {
@@ -11396,7 +11448,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
-@@ -3559,14 +3559,14 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3559,14 +3559,14 @@
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
          t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
          t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
@@ -11413,7 +11465,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
-@@ -3580,7 +3580,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3580,7 +3580,7 @@
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
          t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
          t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
@@ -11422,7 +11474,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[0];
          dp[6] = t0;
          dp[7] = t1;
-@@ -3590,7 +3590,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3590,7 +3590,7 @@
          dp[11] = t5;
        }
  
@@ -11431,7 +11483,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
-@@ -3604,14 +3604,14 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3604,14 +3604,14 @@
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
        t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
        t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
@@ -11448,7 +11500,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
-@@ -3625,7 +3625,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3625,7 +3625,7 @@
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
        t4 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
        t5 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
@@ -11457,7 +11509,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        dp[6] = t0;
        dp[7] = t1;
        dp[8] = t2;
-@@ -3678,7 +3678,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3678,7 +3678,7 @@
  #pragma pipeloop(0)
  #endif /* __SUNPRO_C */
        for (i = 0; i < size - 7; i += 4, dp += 16, sa++) {
@@ -11466,7 +11518,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
-@@ -3688,12 +3688,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3688,12 +3688,12 @@
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 22) & 0x3FC));
@@ -11481,7 +11533,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
-@@ -3703,12 +3703,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3703,12 +3703,12 @@
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 14) & 0x3FC));
@@ -11496,7 +11548,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
-@@ -3718,12 +3718,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3718,12 +3718,12 @@
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 6) & 0x3FC));
@@ -11511,7 +11563,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
-@@ -3733,7 +3733,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3733,7 +3733,7 @@
          t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
          t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
          t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 << 2) & 0x3FC));
@@ -11520,7 +11572,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
          s0 = sa[0];
          dp[12] = t0;
          dp[13] = t1;
-@@ -3741,7 +3741,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3741,7 +3741,7 @@
          dp[15] = t3;
        }
  
@@ -11529,7 +11581,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 << 2) & 0x3FC));
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
-@@ -3751,12 +3751,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3751,12 +3751,12 @@
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 22) & 0x3FC));
@@ -11544,7 +11596,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 6) & 0x3FC));
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
-@@ -3766,12 +3766,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3766,12 +3766,12 @@
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 14) & 0x3FC));
@@ -11559,7 +11611,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 14) & 0x3FC));
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 14) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 14) & 0x3FC));
-@@ -3781,12 +3781,12 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3781,12 +3781,12 @@
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 6) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 6) & 0x3FC));
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 >> 6) & 0x3FC));
@@ -11574,7 +11626,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        t0 = *(mlib_u32 *) ((mlib_u8 *) tab0 + ((s0 >> 22) & 0x3FC));
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 >> 22) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 >> 22) & 0x3FC));
-@@ -3796,7 +3796,7 @@ void mlib_c_ImageLookUpSI_U8_S32(const m
+@@ -3796,7 +3796,7 @@
        t1 = *(mlib_u32 *) ((mlib_u8 *) tab1 + ((s0 << 2) & 0x3FC));
        t2 = *(mlib_u32 *) ((mlib_u8 *) tab2 + ((s0 << 2) & 0x3FC));
        t3 = *(mlib_u32 *) ((mlib_u8 *) tab3 + ((s0 << 2) & 0x3FC));
@@ -11583,9 +11635,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
        dp[12] = t0;
        dp[13] = t1;
        dp[14] = t2;
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -27,6 +27,11 @@
  #ifndef MLIB_IMAGE_H
  #define MLIB_IMAGE_H
@@ -11598,9 +11650,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_image.h ./jdk/src/
  #include <mlib_types.h>
  #include <mlib_status.h>
  #include <mlib_sys.h>
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -26,9 +26,15 @@
  
  #include <stdlib.h>
@@ -11617,7 +11669,7 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_sys.c ./jdk/src/sh
  
  /***************************************************************/
  
-@@ -86,7 +92,12 @@ void *__mlib_malloc(mlib_u32 size)
+@@ -86,7 +92,12 @@
     * alignment. -- from stdlib.h of MS VC++5.0.
     */
    return (void *) malloc(size);
@@ -11631,10 +11683,10 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_sys.c ./jdk/src/sh
    return (void *) memalign(8, size);
  #endif /* _MSC_VER */
  }
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h	2009-05-14 23:41:34.000000000 -0400
-@@ -59,7 +59,10 @@ typedef double             mlib_d64;
+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
+@@ -59,7 +59,10 @@
  
  #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
  
@@ -11646,9 +11698,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h ./jdk/src/
  #include <stdint.h>                     /* for uintptr_t */
  #include <malloc.h>                     /* for ptrdiff_t */
  #else
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,7 +23,11 @@
   * have any questions.
   */
@@ -11661,9 +11713,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/font/AccelGlyphCache.c ./jdk/src/sha
  #include "jni.h"
  #include "AccelGlyphCache.h"
  #include "Trace.h"
-diff -uNpr ../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-04-24 03:34:30.000000000 -0400
-+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -26,7 +26,11 @@
  #include "jlong.h"
  #include "math.h"
@@ -11676,9 +11728,21 @@ diff -uNpr ../orig/jdk/src/share/native/sun/font/DrawGlyphList.c ./jdk/src/share
  #include "sunfontids.h"
  #include "fontscalerdefs.h"
  #include "glyphblitting.h"
-diff -uNpr ../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-04-24 03:34:31.000000000 -0400
-+++ ./jdk/src/share/native/sun/font/sunFont.c	2009-05-14 23:41:34.000000000 -0400
+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
+@@ -1291,7 +1291,7 @@
+                                    sunFontIDs.rect2DFloatClass,
+                                    sunFontIDs.rect2DFloatCtr4,
+                                    F26Dot6ToFloat(bbox.xMin),
+-                                   F26Dot6ToFloat(bbox.yMax),
++                                   F26Dot6ToFloat(-bbox.yMax),
+                                    F26Dot6ToFloat(bbox.xMax-bbox.xMin),
+                                    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
 @@ -24,7 +24,9 @@
   */
  
@@ -11689,9 +11753,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/font/sunFont.c ./jdk/src/share/nativ
  #include "string.h"
  #include "gdefs.h"
  #include "jlong.h"
-diff -uNpr ../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-04-24 03:34:31.000000000 -0400
-+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -28,7 +28,11 @@
  #include "jni_util.h"
  #include "Disposer.h"
@@ -11704,9 +11768,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/java2d/SurfaceData.c ./jdk/src/share
  #include "string.h"
  
  /**
-diff -uNpr ../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-04-24 03:34:31.000000000 -0400
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -26,6 +26,9 @@
  #ifndef OGLFuncs_h_Included
  #define OGLFuncs_h_Included
@@ -11717,9 +11781,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h ./jdk/src/s
  #include "jni.h"
  #include "J2D_GL/gl.h"
  #include "J2D_GL/glext.h"
-diff -uNpr ../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-04-24 03:34:31.000000000 -0400
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -25,7 +25,11 @@
  
  #ifndef HEADLESS
@@ -11732,9 +11796,9 @@ diff -uNpr ../orig/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c ./jdk
  
  #include "sun_java2d_pipe_BufferedOpCodes.h"
  
-diff -uNpr ../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-04-24 03:34:31.000000000 -0400
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -25,7 +25,11 @@
  
  #ifndef HEADLESS
@@ -11747,10 +11811,10 @@ diff -uNpr ../orig/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c ./jd
  #include <math.h>
  #include <jlong.h>
  
-diff -uNpr ../orig/jdk/src/share/transport/socket/socketTransport.c ./jdk/src/share/transport/socket/socketTransport.c
---- ../orig/jdk/src/share/transport/socket/socketTransport.c	2009-04-24 03:34:32.000000000 -0400
-+++ ./jdk/src/share/transport/socket/socketTransport.c	2009-05-14 23:41:34.000000000 -0400
-@@ -65,6 +65,9 @@ static jdwpTransportEnv single_env = (jd
+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
+@@ -65,6 +65,9 @@
  #define HEADER_SIZE     11
  #define MAX_DATA_SIZE 1000
  
@@ -11760,7 +11824,7 @@ diff -uNpr ../orig/jdk/src/share/transport/socket/socketTransport.c ./jdk/src/sh
  /*
   * Record the last error for this thread.
   */
-@@ -153,7 +156,7 @@ handshake(int fd, jlong timeout) {
+@@ -153,7 +156,7 @@
          }
          buf = b;
          buf += received;
@@ -11769,7 +11833,7 @@ diff -uNpr ../orig/jdk/src/share/transport/socket/socketTransport.c ./jdk/src/sh
          if (n == 0) {
              setLastError(0, "handshake failed - connection prematurally closed");
              return JDWPTRANSPORT_ERROR_IO_ERROR;
-@@ -179,7 +182,7 @@ handshake(int fd, jlong timeout) {
+@@ -179,7 +182,7 @@
          }
      }
  
@@ -11778,7 +11842,7 @@ diff -uNpr ../orig/jdk/src/share/transport/socket/socketTransport.c ./jdk/src/sh
          RETURN_IO_ERROR("send failed during handshake");
      }
      return JDWPTRANSPORT_ERROR_NONE;
-@@ -554,19 +557,19 @@ socketTransport_writePacket(jdwpTranspor
+@@ -554,19 +557,19 @@
      /* Do one send for short packets, two for longer ones */
      if (data_len <= MAX_DATA_SIZE) {
          memcpy(header + HEADER_SIZE, data, data_len);
@@ -11802,7 +11866,7 @@ diff -uNpr ../orig/jdk/src/share/transport/socket/socketTransport.c ./jdk/src/sh
              RETURN_IO_ERROR("send failed");
          }
      }
-@@ -574,13 +577,33 @@ socketTransport_writePacket(jdwpTranspor
+@@ -574,13 +577,33 @@
      return JDWPTRANSPORT_ERROR_NONE;
  }
  
@@ -11837,9 +11901,9 @@ diff -uNpr ../orig/jdk/src/share/transport/socket/socketTransport.c ./jdk/src/sh
              return res;
          } else if (res == 0) {
              break; /* eof, return nbytes which is less than len */
-diff -uNpr ../orig/jdk/src/solaris/back/exec_md.c ./jdk/src/solaris/back/exec_md.c
---- ../orig/jdk/src/solaris/back/exec_md.c	2009-04-24 03:34:32.000000000 -0400
-+++ ./jdk/src/solaris/back/exec_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -30,7 +30,7 @@
  #include "sys.h"
  #include "util.h"
@@ -11849,9 +11913,9 @@ diff -uNpr ../orig/jdk/src/solaris/back/exec_md.c ./jdk/src/solaris/back/exec_md
    /* Linux */
    #define FORK() fork()
  #else
-diff -uNpr ../orig/jdk/src/solaris/back/linker_md.c ./jdk/src/solaris/back/linker_md.c
---- ../orig/jdk/src/solaris/back/linker_md.c	2009-04-24 03:34:32.000000000 -0400
-+++ ./jdk/src/solaris/back/linker_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -48,6 +48,12 @@
  #include "threads_md.h"
  #endif
@@ -11865,7 +11929,7 @@ diff -uNpr ../orig/jdk/src/solaris/back/linker_md.c ./jdk/src/solaris/back/linke
  /*
   * create a string for the JNI native function name by adding the
   * appropriate decorations.
-@@ -77,9 +83,9 @@ dbgsysBuildLibName(char *holder, int hol
+@@ -77,9 +83,9 @@
      }
  
      if (pnamelen == 0) {
@@ -11877,9 +11941,9 @@ diff -uNpr ../orig/jdk/src/solaris/back/linker_md.c ./jdk/src/solaris/back/linke
      }
  }
  
-diff -uNpr ../orig/jdk/src/solaris/back/util_md.h ./jdk/src/solaris/back/util_md.h
---- ../orig/jdk/src/solaris/back/util_md.h	2009-04-24 03:34:32.000000000 -0400
-+++ ./jdk/src/solaris/back/util_md.h	2009-05-14 23:41:34.000000000 -0400
+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 @@
  
  #include <limits.h>
@@ -11888,7 +11952,7 @@ diff -uNpr ../orig/jdk/src/solaris/back/util_md.h ./jdk/src/solaris/back/util_md
  
  #ifdef _LP64
  typedef unsigned long UNSIGNED_JLONG;
-@@ -43,7 +44,7 @@ typedef unsigned long UNSIGNED_JINT;
+@@ -43,7 +44,7 @@
  
  /* On little endian machines, convert java big endian numbers. */
  
@@ -11897,9 +11961,9 @@ diff -uNpr ../orig/jdk/src/solaris/back/util_md.h ./jdk/src/solaris/back/util_md
  
  #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 -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
---- ../orig/jdk/src/solaris/bin/java_md.c	2009-04-24 03:34:32.000000000 -0400
-+++ ./jdk/src/solaris/bin/java_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -24,6 +24,7 @@
   */
  
@@ -11977,7 +12041,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
  static const char *user_dir     = "/java";
  #else /* Solaris */
  static const char *system_dir   = "/usr/jdk";
-@@ -404,10 +438,10 @@ CreateExecutionEnvironment(int *_argcp,
+@@ -404,10 +438,10 @@
         * If not on Solaris, assume only a single LD_LIBRARY_PATH
         * variable.
         */
@@ -11990,7 +12054,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
        /*
         * On linux, if a binary is running as sgid or suid, glibc sets
         * LD_LIBRARY_PATH to the empty string for security purposes.  (In
-@@ -431,7 +465,7 @@ CreateExecutionEnvironment(int *_argcp,
+@@ -431,7 +465,7 @@
        new_runpath = JLI_MemAlloc( ((runpath!=NULL)?strlen(runpath):0) +
                                2*strlen(jrepath) + 2*strlen(arch) +
                                strlen(jvmpath) + 52);
@@ -11999,7 +12063,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
  
  
        /*
-@@ -446,7 +480,7 @@ CreateExecutionEnvironment(int *_argcp,
+@@ -446,7 +480,7 @@
  
          /* jvmpath, ((running != wanted)?((wanted==64)?"/"LIBARCH64NAME:"/.."):""), */
  
@@ -12008,7 +12072,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
                  "%s:"
                  "%s/lib/%s:"
                  "%s/../lib/%s",
-@@ -977,6 +1011,7 @@ jboolean RemovableMachineDependentOption
+@@ -977,6 +1011,7 @@
  /* Compute physical memory by asking the OS */
  uint64_t
  physical_memory(void) {
@@ -12016,7 +12080,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
    const uint64_t pages     = (uint64_t) sysconf(_SC_PHYS_PAGES);
    const uint64_t page_size = (uint64_t) sysconf(_SC_PAGESIZE);
    const uint64_t result    = pages * page_size;
-@@ -988,6 +1023,28 @@ physical_memory(void) {
+@@ -988,6 +1023,28 @@
             "  physical memory: " UINT64_FORMAT " (%.3fGB)\n",
             pages, page_size, result, result / (double) GB);
    }
@@ -12045,7 +12109,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
    return result;
  }
  
-@@ -1083,7 +1140,7 @@ get_cpuid(uint32_t arg,
+@@ -1083,7 +1140,7 @@
  
  #endif /* __sun && i586 */
  
@@ -12054,7 +12118,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
  
  /*
   * A utility method for asking the CPU about itself.
-@@ -1692,9 +1749,23 @@ UnsetEnv(char *name)
+@@ -1692,9 +1749,23 @@
      return(borrowed_unsetenv(name));
  }
  
@@ -12079,7 +12143,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
  
  static void* hSplashLib = NULL;
  
-@@ -1722,13 +1793,15 @@ jlong_format_specifier() {
+@@ -1722,13 +1793,15 @@
      return "%lld";
  }
  
@@ -12097,7 +12161,7 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
      pthread_t tid;
      pthread_attr_t attr;
      pthread_attr_init(&attr);
-@@ -1765,13 +1838,11 @@ ContinueInNewThread(int (JNICALL *contin
+@@ -1765,13 +1838,11 @@
        rslt = continuation(args);
      }
  #endif
@@ -12114,9 +12178,9 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.c ./jdk/src/solaris/bin/java_md.c
  /* Coarse estimation of number of digits assuming the worst case is a 64-bit pid. */
  #define MAX_PID_STR_SZ   20
  
-diff -uNpr ../orig/jdk/src/solaris/bin/java_md.h ./jdk/src/solaris/bin/java_md.h
---- ../orig/jdk/src/solaris/bin/java_md.h	2009-04-24 03:34:32.000000000 -0400
-+++ ./jdk/src/solaris/bin/java_md.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -58,10 +58,14 @@
  #include <sys/time.h>
  #define CounterGet()              (gethrtime()/1000)
@@ -12133,10 +12197,10 @@ diff -uNpr ../orig/jdk/src/solaris/bin/java_md.h ./jdk/src/solaris/bin/java_md.h
  
  /*
   * Function prototypes.
-diff -uNpr ../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-04-24 03:34:33.000000000 -0400
-+++ ./jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	2009-05-14 23:41:34.000000000 -0400
-@@ -403,7 +403,7 @@ public class X11GraphicsEnvironment
+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
+@@ -403,7 +403,7 @@
          if (fontID != null) {
              fileName = (String)fontNameMap.get(fontID);
              /* On Linux check for the Lucida Oblique fonts */
@@ -12145,7 +12209,7 @@ diff -uNpr ../orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java .
                  if (oblmap == null) {
                      initObliqueLucidaFontMap();
                  }
-@@ -639,7 +639,7 @@ public class X11GraphicsEnvironment
+@@ -639,7 +639,7 @@
          if (fontConfigDirs == null) {
              return;
          }
@@ -12154,10 +12218,10 @@ diff -uNpr ../orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java .
              fontConfigDirs.add(jreLibDirName+File.separator+"oblique-fonts");
          }
          fontdirs = (String[])fontConfigDirs.toArray(new String[0]);
-diff -uNpr ../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-04-24 03:34:33.000000000 -0400
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java	2009-05-14 23:41:34.000000000 -0400
-@@ -119,7 +119,11 @@ public class UnixPrintServiceLookup exte
+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
+@@ -119,7 +119,11 @@
      }
  
      static boolean isBSD() {
@@ -12170,10 +12234,10 @@ diff -uNpr ../orig/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
      }
  
      static final int UNINITIALIZED = -1;
-diff -uNpr ../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-05-14 23:40:17.000000000 -0400
-+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java	2009-05-14 23:41:34.000000000 -0400
-@@ -38,9 +38,6 @@ import java.util.Properties;
+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
+@@ -38,9 +38,6 @@
   */
  public class BsdVirtualMachine extends HotSpotVirtualMachine {
  
@@ -12183,7 +12247,7 @@ diff -uNpr ../orig/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.ja
      // The patch to the socket file created by the target VM
      String path;
  
-@@ -65,25 +62,10 @@ public class BsdVirtualMachine extends H
+@@ -65,25 +62,10 @@
          // Then we attempt to find the socket file again.
          path = findSocketFile(pid);
          if (path == null) {
@@ -12212,7 +12276,7 @@ diff -uNpr ../orig/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.ja
  
                  // give the target VM time to start the attach mechanism
                  int i = 0;
-@@ -265,37 +247,14 @@ public class BsdVirtualMachine extends H
+@@ -265,37 +247,14 @@
          // First check for a .java_pid<pid> file in the working directory
          // of the target process
          String fn = ".java_pid" + pid;
@@ -12252,7 +12316,7 @@ diff -uNpr ../orig/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.ja
      /*
       * Write/sends the given to the target VM. String is transmitted in
       * UTF-8 encoding.
-@@ -318,12 +277,6 @@ public class BsdVirtualMachine extends H
+@@ -318,12 +277,6 @@
  
      //-- native methods
  
@@ -12265,7 +12329,7 @@ diff -uNpr ../orig/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.ja
      static native void sendQuitTo(int pid) throws IOException;
  
      static native void checkPermissions(String path) throws IOException;
-@@ -338,8 +291,9 @@ public class BsdVirtualMachine extends H
+@@ -338,8 +291,9 @@
  
      static native void write(int fd, byte buf[], int off, int bufLen) throws IOException;
  
@@ -12276,9 +12340,9 @@ diff -uNpr ../orig/jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.ja
 -        isBsdThreads = isBsdThreads();
      }
  }
-diff -uNpr ../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-04-24 03:34:33.000000000 -0400
-+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -33,7 +33,7 @@
  #include <sys/stat.h>
  #include <fcntl.h>
@@ -12288,7 +12352,7 @@ diff -uNpr ../orig/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c ./jdk/src/solaris
  #include <procfs.h>
  #endif
  
-@@ -76,7 +76,7 @@ md_sleep(unsigned seconds)
+@@ -76,7 +76,7 @@
  void
  md_init(void)
  {
@@ -12297,7 +12361,7 @@ diff -uNpr ../orig/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c ./jdk/src/solaris
      /* No Hi-Res timer option? */
  #else
      if ( gdata->micro_state_accounting ) {
-@@ -238,7 +238,7 @@ md_timeofday(void)
+@@ -238,7 +238,7 @@
  jlong
  md_get_microsecs(void)
  {
@@ -12306,7 +12370,7 @@ diff -uNpr ../orig/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c ./jdk/src/solaris
      return (jlong)(md_timeofday() * (jlong)1000); /* Milli to micro */
  #else
      return (jlong)(gethrtime()/(hrtime_t)1000); /* Nano seconds to micro seconds */
-@@ -256,7 +256,7 @@ md_get_timemillis(void)
+@@ -256,7 +256,7 @@
  jlong
  md_get_thread_cpu_timemillis(void)
  {
@@ -12315,7 +12379,7 @@ diff -uNpr ../orig/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c ./jdk/src/solaris
      return md_timeofday();
  #else
      return (jlong)(gethrvtime()/1000); /* Nano seconds to milli seconds */
-@@ -271,7 +271,7 @@ md_get_prelude_path(char *path, int path
+@@ -271,7 +271,7 @@
      Dl_info dlinfo;
  
      libdir[0] = 0;
@@ -12324,10 +12388,10 @@ diff -uNpr ../orig/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c ./jdk/src/solaris
      addr = (void*)&Agent_OnLoad;
  #else
      /* Just using &Agent_OnLoad will get the first external symbol with
-diff -uNpr ../orig/jdk/src/solaris/hpi/include/interrupt.h ./jdk/src/solaris/hpi/include/interrupt.h
---- ../orig/jdk/src/solaris/hpi/include/interrupt.h	2009-04-24 03:34:33.000000000 -0400
-+++ ./jdk/src/solaris/hpi/include/interrupt.h	2009-05-14 23:41:34.000000000 -0400
-@@ -75,7 +75,7 @@ void intrDispatch(int interrupt, void *s
+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
+@@ -75,7 +75,7 @@
   *      N_INTERRUPTS  - The number of interrupt channels.  These
   *                      are numbered from 0 to (N_INTERRUPTS - 1).
   */
@@ -12336,7 +12400,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/include/interrupt.h ./jdk/src/solaris/hpi
  #define       N_INTERRUPTS    NSIG    /* 0 to NSIG - 1*/
  #else
  #define N_INTERRUPTS    32      /* 0 to 31 */
-@@ -111,6 +111,10 @@ void intrInitMD(void);
+@@ -111,6 +111,10 @@
  #error signal.h has not been included?
  #endif
  
@@ -12347,9 +12411,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/include/interrupt.h ./jdk/src/solaris/hpi
  #ifdef SA_SIGINFO
  /* Thread implementation dependent interrupt dispatcher. */
  void intrDispatchMD(int sig, siginfo_t *info, void *uc);
-diff -uNpr ../orig/jdk/src/solaris/hpi/include/largefile.h ./jdk/src/solaris/hpi/include/largefile.h
---- ../orig/jdk/src/solaris/hpi/include/largefile.h	2009-04-24 03:34:33.000000000 -0400
-+++ ./jdk/src/solaris/hpi/include/largefile.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -34,6 +34,10 @@
  #include "largefile_linux.h"
  #endif
@@ -12361,9 +12425,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/include/largefile.h ./jdk/src/solaris/hpi
  /*
   * Prototypes for wrappers that we define.  These wrapper functions
   * are low-level I/O routines that will use 64 bit versions if
-diff -uNpr ../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-05-14 23:40:17.000000000 -0400
-+++ ./jdk/src/solaris/hpi/include/largefile_bsd.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,14 +23,28 @@
   * have any questions.
   */
@@ -12400,9 +12464,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/include/largefile_bsd.h ./jdk/src/solaris
 +#define                pwrite64        pwrite
 +
 +#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */
-diff -uNpr ../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-04-24 03:34:33.000000000 -0400
-+++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -36,6 +36,8 @@
  #define N_TRACED_REGS 12
  #elif i386
@@ -12425,7 +12489,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/include/threads_md.h ./jdk
  
  /*
   * Thread C stack overflow check
-@@ -132,7 +136,7 @@ struct sys_thread {
+@@ -132,7 +136,7 @@
      lwpid_t lwpid;
  #endif
  
@@ -12434,7 +12498,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/include/threads_md.h ./jdk
      void *sp;
  #else
      unsigned long  sp;   /* sp at time of last (native) thread switch */
-@@ -186,12 +190,14 @@ struct sys_thread {
+@@ -186,12 +190,14 @@
  
  #define SYS_THREAD_NULL         ((sys_thread_t *) 0)
  
@@ -12449,10 +12513,10 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/include/threads_md.h ./jdk
  
  #ifdef __linux__
  extern thread_key_t intrJmpbufkey;
-diff -uNpr ../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-04-24 03:34:33.000000000 -0400
-+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c	2009-05-14 23:41:34.000000000 -0400
-@@ -58,7 +58,7 @@ condvarDestroy(condvar_t *condvar)
+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
+@@ -58,7 +58,7 @@
  {
      int err;
  
@@ -12461,10 +12525,10 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/condvar_md.c ./jdk/src
      err = pthread_cond_destroy((cond_t *) &condvar->cond);
  #else
      err = cond_destroy((cond_t *) condvar);
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c	2009-05-14 23:41:34.000000000 -0400
-@@ -147,7 +147,7 @@ sysMonitorEnter(sys_thread_t *self, sys_
+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
+@@ -147,7 +147,7 @@
          mid->monitor_owner = self;
          mid->entry_count = 1;
          return SYS_OK;
@@ -12473,9 +12537,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/monitor_md.c ./jdk/src
          if (mid->monitor_owner == self) {
              mid->entry_count++;
              return SYS_OK;
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/hpi/native_threads/src/sys_api_td.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -39,6 +39,10 @@
  #include <sys/ioctl.h>
  #endif
@@ -12498,9 +12562,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/sys_api_td.c ./jdk/src
  #ifdef NO_INTERRUPTIBLE_IO
  #undef CLOSEIO
  #else
-diff -uNpr ../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-05-14 23:40:17.000000000 -0400
-+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,79 +23,44 @@
   * have any questions.
   */
@@ -12606,7 +12670,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c ./jdk/sr
  /*
   * Suspend said thread.  Used to implement java.lang.Thread.suspend(),
   * which is deprecated.
-@@ -103,10 +68,16 @@ static void checkForCorrectLibthread() _
+@@ -103,10 +68,16 @@
  int
  np_suspend(sys_thread_t *tid)
  {
@@ -12625,7 +12689,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c ./jdk/sr
  /*
   * Resume a suspended thread.  Used to implement java.lang.Thread.resume(),
   * which is deprecated.
-@@ -114,7 +85,14 @@ np_suspend(sys_thread_t *tid)
+@@ -114,7 +85,14 @@
  int
  np_continue(sys_thread_t *tid)
  {
@@ -12641,7 +12705,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c ./jdk/sr
  }
  
  /*
-@@ -127,26 +105,74 @@ void np_initialize_thread(sys_thread_t *
+@@ -127,26 +105,74 @@
  
  
  /*
@@ -12729,7 +12793,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c ./jdk/sr
  }
  
  /*
-@@ -155,309 +181,194 @@ np_stackinfo(void **addr, long *size)
+@@ -155,309 +181,194 @@
  void
  np_profiler_init(sys_thread_t *tid)
  {
@@ -13164,7 +13228,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c ./jdk/sr
  
      tid = ThreadQueue;
      for (i = 0; i < ActiveThreadCount && tid != 0; i++) {
-@@ -466,7 +377,14 @@ record_thread_regs()
+@@ -466,7 +377,14 @@
  
              if (tid->sys_thread != 0) {
                  /* if thread has already been initialized */
@@ -13180,7 +13244,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c ./jdk/sr
              } else {
                  /*
                   * thread is still in the process of being initalized.
-@@ -475,192 +393,11 @@ record_thread_regs()
+@@ -475,192 +393,11 @@
                   */
                  tid->sp = 0;
              }
@@ -13376,10 +13440,10 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_bsd.c ./jdk/sr
 -
 -    print_lwps();
  }
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c	2009-05-14 23:41:34.000000000 -0400
-@@ -54,6 +54,10 @@ extern int InitializeIO(rlim_t limit);
+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
+@@ -54,6 +54,10 @@
  #error That can NOT possibly be right.
  #endif
  
@@ -13390,7 +13454,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c ./jdk/src
  #ifdef SA_SIGINFO
  static void sigusr1Handler(int sig, siginfo_t *info, void *uc);
  #else
-@@ -97,9 +101,14 @@ static thread_key_t tid_key = (thread_ke
+@@ -97,9 +101,14 @@
  #ifdef __linux__
  thread_key_t intrJmpbufkey;
  static sigset_t squm = {{sigmask(SIGUSR1), 0, 0, 0}};
@@ -13405,7 +13469,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c ./jdk/src
  #endif
  
  /*
-@@ -170,9 +179,6 @@ sysThreadCheckStack()
+@@ -170,9 +179,6 @@
      }
  }
  
@@ -13415,7 +13479,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c ./jdk/src
  
  
  /*
-@@ -187,7 +193,7 @@ sysThreadAlloc(sys_thread_t **tidP)
+@@ -187,7 +193,7 @@
      if (tid == NULL) {
          return SYS_NOMEM;
      }
@@ -13424,7 +13488,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c ./jdk/src
      memset((char *)tid, 0, sizeof(sys_thread_t));
  #endif
  
-@@ -474,7 +480,7 @@ sysThreadCreate(sys_thread_t **tidP, lon
+@@ -474,7 +480,7 @@
      }
      *tidP = tid;
  
@@ -13433,7 +13497,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c ./jdk/src
      memset((char *)tid, 0, sizeof(sys_thread_t));
  #endif
      /* Install the backpointer to the Thread object */
-@@ -517,6 +523,7 @@ sysThreadCreate(sys_thread_t **tidP, lon
+@@ -517,6 +523,7 @@
      }
      /* Create the thread. The thread will block waiting to be suspended */
      err = pthread_create(&tid->sys_thread, &attr, _start, (void *)tid);
@@ -13441,7 +13505,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c ./jdk/src
      sysAssert(err == 0);
      if (err == 0) {
          err = sem_wait(&tid->sem_suspended);
-@@ -1049,7 +1056,18 @@ sysGetSysInfo()
+@@ -1049,7 +1056,18 @@
           * we want the number of processors configured not the number online
           * since processors may be turned on and off dynamically.
           */
@@ -13460,9 +13524,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/native_threads/src/threads_md.c ./jdk/src
  
          info.isMP = (cpus < 0) ? 1 : (cpus > 1);
          info.name = "native threads";
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/hpi/src/linker_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -44,11 +44,19 @@
  #include "threads_md.h"
  #endif
@@ -13483,7 +13547,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/linker_md.c ./jdk/src/solaris/hpi/src
  
  /*
   * glibc-2.0 libdl is not MT safe.  If you are building with any glibc,
-@@ -66,6 +74,14 @@ sys_mon_t _dl_lock;
+@@ -66,6 +74,14 @@
      #define NEED_DL_LOCK
  #endif
  
@@ -13498,7 +13562,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/linker_md.c ./jdk/src/solaris/hpi/src
  /*
   * create a string for the JNI native function name by adding the
   * appropriate decorations.
-@@ -95,14 +111,14 @@ sysBuildLibName(char *holder, int holder
+@@ -95,14 +111,14 @@
      }
  
      if (pnamelen == 0) {
@@ -13516,7 +13580,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/linker_md.c ./jdk/src/solaris/hpi/src
      static int thr_main(void)
      {
          return -1;
-@@ -120,10 +136,10 @@ sysLoadLibrary(const char *name, char *e
+@@ -120,10 +136,10 @@
  
  #ifdef NEED_DL_LOCK
      sysMonitorEnter(sysThreadSelf(), &_dl_lock);
@@ -13529,9 +13593,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/linker_md.c ./jdk/src/solaris/hpi/src
  #endif
      /*
       * This is a bit of bulletproofing to catch the commonly occurring
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/hpi/src/memory_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -50,12 +50,24 @@
  #include <stdlib.h>
  #include <stdio.h>      /* For perror() */
@@ -13557,7 +13621,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/memory_md.c ./jdk/src/solaris/hpi/src
  #include <sys/mman.h>
  #include <fcntl.h>
  #ifdef __linux__
-@@ -73,6 +85,18 @@ static int devZeroFD;
+@@ -73,6 +85,18 @@
  #define MAP_FAILED ((caddr_t)-1)
  #endif
  static size_t memGrainSize;     /* A page for Linux */
@@ -13576,7 +13640,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/memory_md.c ./jdk/src/solaris/hpi/src
  #else
  static unsigned int memGrainSize;       /* A page for Solaris */
  #endif
-@@ -154,7 +178,7 @@ mapChunk(long length)
+@@ -154,7 +178,7 @@
  {
      char *ret;
  
@@ -13585,7 +13649,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/memory_md.c ./jdk/src/solaris/hpi/src
       ret = (char *) mmap(0, length, PROT_ALL,
                           MAP_NORESERVE | MAP_PRIVATE | MAP_ANONYMOUS,
                           -1, (off_t) 0);
-@@ -176,7 +200,7 @@ static char *
+@@ -176,7 +200,7 @@
  mapChunkReserve(char *addr, long length)
  {
      char *ret;
@@ -13594,7 +13658,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/memory_md.c ./jdk/src/solaris/hpi/src
       ret = (char *) mmap(addr, length, PROT_ALL,
                           MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS,
                           -1, (off_t) 0);
-@@ -199,7 +223,7 @@ mapChunkNoreserve(char *addr, long lengt
+@@ -199,7 +223,7 @@
  {
      char *ret;
  
@@ -13603,7 +13667,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/memory_md.c ./jdk/src/solaris/hpi/src
       ret = (char *) mmap(addr, length, PROT_ALL,
                         MAP_FIXED | MAP_PRIVATE |
                           MAP_NORESERVE | MAP_ANONYMOUS,
-@@ -242,7 +266,7 @@ sysMapMem(size_t requestedSize, size_t *
+@@ -242,7 +266,7 @@
      *mappedSize = roundUpToGrain(requestedSize);
  #ifdef USE_MALLOC
      mappedAddr = (void *) sysMalloc(*mappedSize); /* Returns 0 on failure */
@@ -13612,7 +13676,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/memory_md.c ./jdk/src/solaris/hpi/src
       if (mappedAddr) {
         memset(mappedAddr, 0, *mappedSize);
         mappedAddr = (void *) roundUpToGrain(mappedAddr);
-@@ -331,7 +355,7 @@ sysCommitMem(void *requestedAddr, size_t
+@@ -331,7 +355,7 @@
      *committedSize = roundUpToGrain(requestedSize);
      committedAddr = (void *) roundDownToGrain((long) requestedAddr);
  #ifdef USE_MALLOC
@@ -13621,9 +13685,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/memory_md.c ./jdk/src/solaris/hpi/src
      ret = committedAddr;
  #else
      ret = requestedAddr;
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/hpi/src/system_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -41,6 +41,7 @@
  #include <dlfcn.h>
  
@@ -13642,7 +13706,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/system_md.c ./jdk/src/solaris/hpi/src
  int sysThreadBootstrap(sys_thread_t **tidP, sys_mon_t **lockP, int nb)
  {
      threadBootstrapMD(tidP, lockP, nb);
-@@ -85,7 +83,7 @@ sysGetMilliTicks()
+@@ -85,7 +83,7 @@
  {
      struct timeval tv;
  
@@ -13651,7 +13715,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/system_md.c ./jdk/src/solaris/hpi/src
      return((tv.tv_sec * 1000) + (tv.tv_usec / 1000));
  }
  
-@@ -93,7 +91,7 @@ jlong
+@@ -93,7 +91,7 @@
  sysTimeMillis()
  {
      struct timeval t;
@@ -13660,7 +13724,7 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/system_md.c ./jdk/src/solaris/hpi/src
      return ((jlong)t.tv_sec) * 1000 + (jlong)(t.tv_usec/1000);
  }
  
-@@ -122,13 +120,13 @@ sysGetLastErrorString(char *buf, int len
+@@ -122,13 +120,13 @@
  
  /*
   * Open a file. Unlink the file immediately after open returns
@@ -13677,9 +13741,9 @@ diff -uNpr ../orig/jdk/src/solaris/hpi/src/system_md.c ./jdk/src/solaris/hpi/src
      fd = open64_w(path, oflag, mode);
      if (delete != 0) {
          unlink(path);
-diff -uNpr ../orig/jdk/src/solaris/instrument/EncodingSupport_md.c ./jdk/src/solaris/instrument/EncodingSupport_md.c
---- ../orig/jdk/src/solaris/instrument/EncodingSupport_md.c	2009-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -28,7 +28,10 @@
  #include <string.h>
  #include <ctype.h>
@@ -13691,7 +13755,7 @@ diff -uNpr ../orig/jdk/src/solaris/instrument/EncodingSupport_md.c ./jdk/src/sol
  #include <iconv.h>
  
  /* Routines to convert back and forth between Platform Encoding and UTF-8 */
-@@ -63,6 +66,7 @@ utfInitialize(void)
+@@ -63,6 +66,7 @@
      /* Set the locale from the environment */
      (void)setlocale(LC_ALL, "");
  
@@ -13699,7 +13763,7 @@ diff -uNpr ../orig/jdk/src/solaris/instrument/EncodingSupport_md.c ./jdk/src/sol
      /* Get the codeset name */
      codeset = (char*)nl_langinfo(CODESET);
      if ( codeset == NULL || codeset[0] == 0 ) {
-@@ -77,6 +81,9 @@ utfInitialize(void)
+@@ -77,6 +81,9 @@
          UTF_DEBUG(("NO iconv() being used because it is not needed\n"));
          return;
      }
@@ -13709,9 +13773,9 @@ diff -uNpr ../orig/jdk/src/solaris/instrument/EncodingSupport_md.c ./jdk/src/sol
  
      /* Open conversion descriptors */
      iconvToPlatform   = iconv_open(codeset, "UTF-8");
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/javavm/export/jvm_md.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -39,7 +39,14 @@
  #define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
  
@@ -13736,9 +13800,9 @@ diff -uNpr ../orig/jdk/src/solaris/javavm/export/jvm_md.h ./jdk/src/solaris/java
  
  /* Signals */
  
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -32,10 +32,16 @@
  
  #include <sys/types.h>
@@ -13780,7 +13844,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem
      struct dirent* p;
      if (readdir_r(dirp, entry, &p) == 0) {
          return p;
-@@ -124,7 +136,7 @@ static jlong get_total_or_available_swap
+@@ -124,7 +136,7 @@
      free(strtab);
      return available ? ((jlong)avail * page_size) :
                         ((jlong)total * page_size);
@@ -13789,7 +13853,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem
      int ret;
      FILE *fp;
      jlong total = 0, avail = 0;
-@@ -138,6 +150,13 @@ static jlong get_total_or_available_swap
+@@ -138,6 +150,13 @@
      avail = (jlong)si.freeswap * si.mem_unit;
  
      return available ? avail : total;
@@ -13803,7 +13867,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem
  #endif
  }
  
-@@ -179,7 +198,7 @@ Java_com_sun_management_UnixOperatingSys
+@@ -179,7 +198,7 @@
  
      JVM_Close(fd);
      return (jlong) psinfo.pr_size * 1024;
@@ -13812,7 +13876,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem
      FILE *fp;
      unsigned long vsize = 0;
  
-@@ -197,6 +216,12 @@ Java_com_sun_management_UnixOperatingSys
+@@ -197,6 +216,12 @@
  
      fclose(fp);
      return (jlong)vsize;
@@ -13825,7 +13889,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem
  #endif
  }
  
-@@ -222,9 +247,13 @@ Java_com_sun_management_UnixOperatingSys
+@@ -222,9 +247,13 @@
      jlong cpu_time_ns;
      struct tms time;
  
@@ -13841,7 +13905,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem
      clk_tck = 100;
  #endif
      if (clk_tck == -1) {
-@@ -244,22 +273,51 @@ JNIEXPORT jlong JNICALL
+@@ -244,22 +273,51 @@
  Java_com_sun_management_UnixOperatingSystem_getFreePhysicalMemorySize
    (JNIEnv *env, jobject mbean)
  {
@@ -13893,7 +13957,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem
      DIR *dirp;
      struct dirent dbuf;
      struct dirent* dentp;
-@@ -282,6 +340,7 @@ Java_com_sun_management_UnixOperatingSys
+@@ -282,6 +340,7 @@
      closedir(dirp);
      // subtract by 1 which was the fd open for this implementation
      return (fds - 1);
@@ -13901,9 +13965,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem
  }
  
  JNIEXPORT jlong JNICALL
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -41,6 +41,11 @@
  #include "java_io_FileSystem.h"
  #include "java_io_UnixFileSystem.h"
@@ -13916,7 +13980,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c ./jdk/src/
  
  /* -- Field IDs -- */
  
-@@ -58,7 +63,7 @@ Java_java_io_UnixFileSystem_initIDs(JNIE
+@@ -58,7 +63,7 @@
                                    "path", "Ljava/lang/String;");
  }
  
@@ -13925,7 +13989,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c ./jdk/src/
  /* -- Large-file support -- */
  
  /* LINUX_FIXME: ifdef __solaris__ here is wrong.  We need to move the
-@@ -98,6 +103,7 @@ struct  stat64 {
+@@ -98,6 +103,7 @@
  };
  
  #endif  /* !_LFS_LARGEFILE */
@@ -13933,7 +13997,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c ./jdk/src/
  
  typedef int (*STAT64)(const char *, struct stat64 *);
  
-@@ -107,6 +113,7 @@ static STAT64 stat64_ptr = &stat64;
+@@ -107,6 +113,7 @@
  static STAT64 stat64_ptr = NULL;
  #endif
  
@@ -13941,7 +14005,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c ./jdk/src/
  #ifndef __linux__
  #ifdef __GNUC__
  static void init64IO(void) __attribute__((constructor));
-@@ -120,7 +127,7 @@ static void init64IO(void) {
+@@ -120,7 +127,7 @@
      stat64_ptr = (STAT64) dlsym(handle, "_stat64");
      dlclose(handle);
  }
@@ -13950,7 +14014,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c ./jdk/src/
  
  /* -- Path operations -- */
  
-@@ -483,7 +490,7 @@ Java_java_io_UnixFileSystem_setLastModif
+@@ -483,7 +490,7 @@
  #endif
  
          /* Preserve access time */
@@ -13959,9 +14023,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/io/UnixFileSystem_md.c ./jdk/src/
          struct stat sb;
  
          if (stat(path, &sb) == 0) {
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -33,7 +33,9 @@
  #include <sys/stat.h>
  #include <errno.h>
@@ -13972,10 +14036,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/io/canonicalize_md.c ./jdk/src/so
  
  
  /* Note: The comments in this file use the terminology
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/io/io_util_md.c	2009-05-14 23:41:34.000000000 -0400
-@@ -36,7 +36,7 @@ fileOpen(JNIEnv *env, jobject this, jstr
+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
+@@ -36,7 +36,7 @@
      WITH_PLATFORM_STRING(env, path, ps) {
          FD fd;
  
@@ -13984,9 +14048,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/io/io_util_md.c ./jdk/src/solaris
          /* Remove trailing slashes, since the kernel won't */
          char *p = (char *)ps + strlen(ps) - 1;
          while ((p > ps) && (*p == '/'))
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -28,6 +28,11 @@
  #include "jni.h"
  #include "jni_util.h"
@@ -13999,7 +14063,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c ./jd
  JNIEXPORT jobjectArray JNICALL
  Java_java_lang_ProcessEnvironment_environ(JNIEnv *env, jclass ign)
  {
-@@ -37,7 +42,9 @@ Java_java_lang_ProcessEnvironment_enviro
+@@ -37,7 +42,9 @@
       * no standard (not even de-facto) header file where the
       * declaration is to be found.  See:
       * http://www.opengroup.org/onlinepubs/007908799/xbd/envvar.html */
@@ -14009,7 +14073,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c ./jd
  
      jsize count = 0;
      jsize i, j;
-@@ -46,7 +53,7 @@ Java_java_lang_ProcessEnvironment_enviro
+@@ -46,7 +53,7 @@
  
      for (i = 0; environ[i]; i++) {
          /* Ignore corrupted environment variables */
@@ -14018,7 +14082,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c ./jd
              count++;
      }
  
-@@ -56,7 +63,7 @@ Java_java_lang_ProcessEnvironment_enviro
+@@ -56,7 +63,7 @@
      for (i = 0, j = 0; environ[i]; i++) {
          const char * varEnd = strchr(environ[i], '=');
          /* Ignore corrupted environment variables */
@@ -14027,9 +14091,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c ./jd
              jbyteArray var, val;
              const char * valBeg = varEnd + 1;
              jsize varLength = varEnd - environ[i];
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -40,7 +40,11 @@
  #include <stdlib.h>
  #include <sys/types.h>
@@ -14060,7 +14124,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c ./jdk/src/s
  #ifndef STDIN_FILENO
  #define STDIN_FILENO 0
  #endif
-@@ -259,11 +274,89 @@ Java_java_lang_UNIXProcess_waitForProces
+@@ -259,11 +274,89 @@
      }
  }
  
@@ -14151,7 +14215,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c ./jdk/src/s
      int from_fd = FAIL_FILENO + 1;
  
      /* We're trying to close all file descriptors, but opendir() might
-@@ -276,13 +369,13 @@ closeDescriptors(void)
+@@ -276,13 +369,13 @@
      close(from_fd);             /* for possible use by opendir() */
      close(from_fd + 1);         /* another one for good luck */
  
@@ -14167,7 +14231,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c ./jdk/src/s
          int fd;
          if (isdigit(dirp->d_name[0]) &&
              (fd = strtol(dirp->d_name, NULL, 10)) >= from_fd + 2)
-@@ -293,6 +386,7 @@ closeDescriptors(void)
+@@ -293,6 +386,7 @@
  
      return 1;
  }
@@ -14175,7 +14239,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c ./jdk/src/s
  
  static void
  moveDescriptor(int fd_from, int fd_to)
-@@ -438,7 +532,9 @@ execvpe(const char *file, const char *co
+@@ -449,7 +543,9 @@
       * "All identifiers in this volume of IEEE Std 1003.1-2001, except
       * environ, are defined in at least one of the headers" (!)
       */
@@ -14185,7 +14249,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c ./jdk/src/s
  
      if (envp != NULL)
          environ = (char **) envp;
-@@ -502,10 +598,15 @@ readFully(int fd, void *buf, size_t nbyt
+@@ -513,10 +609,15 @@
      }
  }
  
@@ -14201,7 +14265,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c ./jdk/src/s
  
  JNIEXPORT jint JNICALL
  Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
-@@ -567,6 +668,30 @@ Java_java_lang_UNIXProcess_forkAndExec(J
+@@ -578,6 +679,30 @@
      if (resultPid == 0) {
          /* Child process */
  
@@ -14232,9 +14296,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/UNIXProcess_md.c ./jdk/src/s
          /* Close the parent sides of the pipe.
             Give the child sides of the pipes the right fileno's.
             Closing pipe fds here is redundant, since closeDescriptors()
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,7 +23,7 @@
   * have any questions.
   */
@@ -14270,7 +14334,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
  
  /* Take an array of string pairs (map of key->value) and a string (key).
   * Examine each pair in the map to see if the first string (key) matches the
-@@ -188,7 +197,12 @@ GetJavaProperties(JNIEnv *env)
+@@ -188,7 +197,12 @@
      {
          char *lc;
          lc = setlocale(LC_CTYPE, "");
@@ -14284,7 +14348,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
          if (lc == NULL) {
              /*
               * 'lc == null' means system doesn't support user's environment
-@@ -219,7 +233,7 @@ GetJavaProperties(JNIEnv *env)
+@@ -219,7 +233,7 @@
              char *p, encoding_variant[64];
              int i, found;
  
@@ -14293,7 +14357,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
              /*
               * Workaround for Solaris bug 4201684: Xlib doesn't like @euro
               * locales. Since we don't depend on the libc @euro behavior,
-@@ -236,6 +250,13 @@ GetJavaProperties(JNIEnv *env)
+@@ -236,6 +250,13 @@
                  *p = '\0';
              setlocale(LC_ALL, temp);
  #endif
@@ -14307,7 +14371,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
  
              strcpy(temp, lc);
  
-@@ -316,6 +337,9 @@ GetJavaProperties(JNIEnv *env)
+@@ -316,6 +337,9 @@
              else
                  p = nl_langinfo(CODESET);
  
@@ -14317,7 +14381,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
              /* Convert the bare "646" used on Solaris to a proper IANA name */
              if (strcmp(p, "646") == 0)
                  p = "ISO646-US";
-@@ -325,6 +349,7 @@ GetJavaProperties(JNIEnv *env)
+@@ -325,6 +349,7 @@
              std_encoding = (*p != '\0') ? p : "ISO8859-1";
  
  
@@ -14325,7 +14389,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
  #ifdef __linux__
              /*
               * Remap the encoding string to a different value for japanese
-@@ -355,11 +380,19 @@ GetJavaProperties(JNIEnv *env)
+@@ -355,11 +380,19 @@
                      std_encoding = "Big5_Solaris";
              }
  #endif
@@ -14345,7 +14409,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
  #ifdef __linux__
  #if __BYTE_ORDER == __LITTLE_ENDIAN
      sprops.unicode_encoding = "UnicodeLittle";
-@@ -369,6 +402,7 @@ GetJavaProperties(JNIEnv *env)
+@@ -369,6 +402,7 @@
  #else
      sprops.unicode_encoding = "UnicodeBig";
  #endif
@@ -14353,7 +14417,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
  
      /* user properties */
      {
-@@ -405,12 +439,14 @@ GetJavaProperties(JNIEnv *env)
+@@ -405,12 +439,14 @@
      sprops.path_separator = ":";
      sprops.line_separator = "\n";
  
@@ -14368,9 +14432,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/lang/java_props_md.c ./jdk/src/so
  
      return &sprops;
  }
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -35,17 +35,293 @@
  #include <stdlib.h>
  #include <ctype.h>
@@ -14666,7 +14730,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ./jdk/src/
  /* gethostname() is in libc.so but I can't find a header file for it */
  extern int gethostname(char *buf, int buf_len);
  #endif
-@@ -85,13 +361,13 @@ Java_java_net_Inet4AddressImpl_getLocalH
+@@ -85,13 +361,13 @@
          char buf2[HENT_BUF_SIZE];
          int h_error=0;
  
@@ -14682,7 +14746,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ./jdk/src/
              gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
                              &res2, buf2, sizeof(buf2), &hp, &h_error);
  #else
-@@ -178,7 +454,7 @@ Java_java_net_Inet4AddressImpl_lookupAll
+@@ -178,7 +454,7 @@
      }
  
      /* Try once, with our static buffer. */
@@ -14691,7 +14755,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ./jdk/src/
      gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
  #else
      hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
-@@ -191,7 +467,7 @@ Java_java_net_Inet4AddressImpl_lookupAll
+@@ -191,7 +467,7 @@
       */
      if (hp == NULL && errno == ERANGE) {
          if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
@@ -14700,7 +14764,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ./jdk/src/
              gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
                              &hp, &h_error);
  #else
-@@ -281,7 +557,7 @@ Java_java_net_Inet4AddressImpl_getHostBy
+@@ -281,7 +557,7 @@
      addr |= ((caddr[2] <<8) & 0xff00);
      addr |= (caddr[3] & 0xff);
      addr = htonl(addr);
@@ -14709,7 +14773,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ./jdk/src/
      gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
                      buf, sizeof(buf), &hp, &h_error);
  #else
-@@ -295,7 +571,7 @@ Java_java_net_Inet4AddressImpl_getHostBy
+@@ -295,7 +571,7 @@
       */
      if (hp == NULL && errno == ERANGE) {
          if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
@@ -14718,7 +14782,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ./jdk/src/
              gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
                              &hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error);
  #else
-@@ -317,6 +593,8 @@ Java_java_net_Inet4AddressImpl_getHostBy
+@@ -317,6 +593,8 @@
      return ret;
  }
  
@@ -14727,9 +14791,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ./jdk/src/
  #define SET_NONBLOCKING(fd) {           \
          int flags = fcntl(fd, F_GETFL); \
          flags |= O_NONBLOCK;            \
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -32,6 +32,9 @@
  #include <strings.h>
  #include <stdlib.h>
@@ -14749,7 +14813,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet6AddressImpl.c ./jdk/src/
  /* gethostname() is in libc.so but I can't find a header file for it */
  extern int gethostname(char *buf, int buf_len);
  #endif
-@@ -71,10 +74,18 @@ Java_java_net_Inet6AddressImpl_getLocalH
+@@ -71,10 +74,18 @@
          /* Something went wrong, maybe networking is not setup? */
          strcpy(hostname, "localhost");
      } else {
@@ -14770,7 +14834,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet6AddressImpl.c ./jdk/src/
  #else
          /* Solaris doesn't want to give us a fully qualified domain name.
           * We do a reverse lookup to try and get one.  This works
-@@ -110,7 +121,7 @@ Java_java_net_Inet6AddressImpl_getLocalH
+@@ -110,7 +121,7 @@
              }
          }
  #endif /* AF_INET6 */
@@ -14779,9 +14843,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/Inet6AddressImpl.c ./jdk/src/
      }
      return (*env)->NewStringUTF(env, hostname);
  }
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,13 +23,13 @@
   * have any questions.
   */
@@ -14818,7 +14882,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c ./jdk/src/
  
  #ifdef __linux__
  #define ifr_index ifr_ifindex
-@@ -584,6 +597,7 @@ static netif *enumInterfaces(JNIEnv *env
+@@ -584,6 +597,7 @@
  }
  
  
@@ -14826,7 +14890,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c ./jdk/src/
  /*
   * Enumerates and returns all IPv4 interfaces
   */
-@@ -694,6 +708,176 @@ static netif *enumIPv4Interfaces(JNIEnv 
+@@ -694,6 +708,176 @@
      return ifs;
  }
  
@@ -15003,7 +15067,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c ./jdk/src/
  
  #if defined(__solaris__) && defined(AF_INET6)
  /*
-@@ -1014,7 +1198,13 @@ netif *addif(JNIEnv *env, netif *ifs, ch
+@@ -1014,7 +1198,13 @@
              JNU_ThrowOutOfMemoryError(env, "heap allocation failed");
              return ifs;
          }
@@ -15017,7 +15081,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c ./jdk/src/
          currif->addr = NULL;
          currif->childs = NULL;
          currif->virtual = isVirtual;
-@@ -1302,6 +1492,31 @@ int getMacAddress(JNIEnv *env, const str
+@@ -1302,6 +1492,31 @@
     * All bytes to 0 means no hardware address.
     */
    return -1;
@@ -15049,7 +15113,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c ./jdk/src/
  #else
    struct arpreq arpreq;
    struct sockaddr_in* sin;
-@@ -1467,7 +1682,7 @@ JNIEXPORT jint JNICALL Java_java_net_Net
+@@ -1467,7 +1682,7 @@
                                   "Socket creation failed");
    } else {
  
@@ -15058,9 +15122,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/NetworkInterface.c ./jdk/src/
      memset((char *) &if2, 0, sizeof(if2));
      strcpy(if2.ifr_name, name_utf);
  
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,12 +23,12 @@
   * have any questions.
   */
@@ -15076,7 +15140,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ./j
  
  #ifdef __solaris__
  #include <fcntl.h>
-@@ -335,7 +335,7 @@ Java_java_net_PlainDatagramSocketImpl_di
+@@ -335,7 +335,7 @@
      /* The fdObj'fd */
      jint fd;
  
@@ -15085,7 +15149,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ./j
      SOCKADDR addr;
      int len;
  #endif
-@@ -345,26 +345,39 @@ Java_java_net_PlainDatagramSocketImpl_di
+@@ -345,26 +345,39 @@
      }
      fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
  
@@ -15125,7 +15189,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ./j
          // After disconnecting a UDP socket, Linux kernel will set
          // local port to zero if the port number comes from implicit
          // bind. Successive send/recv on the same socket will fail.
-@@ -387,6 +400,7 @@ Java_java_net_PlainDatagramSocketImpl_di
+@@ -387,6 +400,7 @@
              NET_Bind(fd, (struct sockaddr *)&addr, len);
          }
      }
@@ -15133,7 +15197,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ./j
  #else
      JVM_Connect(fd, 0, 0);
  #endif
-@@ -2374,18 +2388,30 @@ static void mcast_join_leave(JNIEnv *env
+@@ -2374,18 +2388,30 @@
              mname6.ipv6mr_interface = idx;
          }
  
@@ -15167,10 +15231,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ./j
                  }
              }
          }
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c	2009-05-14 23:41:34.000000000 -0400
-@@ -528,9 +528,11 @@ Java_java_net_PlainSocketImpl_socketConn
+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
+@@ -528,9 +528,11 @@
          if (connect_rv == JVM_IO_INTR) {
              JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
                              "operation interrupted");
@@ -15182,10 +15246,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c ./jdk/src/s
          } else if (errno == ECONNREFUSED) {
              NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ConnectException",
                             "Connection refused");
-diff -uNpr ../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-05-14 23:40:17.000000000 -0400
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c	2009-05-14 23:41:34.000000000 -0400
-@@ -57,7 +57,7 @@ typedef struct {
+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
+@@ -57,7 +57,7 @@
  /*
   * Signal to unblock thread
   */
@@ -15194,9 +15258,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/bsd_close.c ./jdk/src/solaris
  
  /*
   * The fd table and the number of file descriptors
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -34,6 +34,15 @@
  #include <stdlib.h>
  #include <dlfcn.h>
@@ -15213,7 +15277,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/net_util_md.c ./jdk/src/solar
  #ifdef __solaris__
  #include <sys/sockio.h>
  #include <stropts.h>
-@@ -219,6 +228,14 @@ NET_GetFileDescriptorID(JNIEnv *env)
+@@ -219,6 +228,14 @@
      return (*env)->GetFieldID(env, cls, "fd", "I");
  }
  
@@ -15228,7 +15292,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/net_util_md.c ./jdk/src/solar
  jint  IPv6_supported()
  {
  #ifndef AF_INET6
-@@ -355,6 +372,7 @@ jint  IPv6_supported()
+@@ -355,6 +372,7 @@
      close(fd);
      return JNI_TRUE;
  }
@@ -15236,7 +15300,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/net_util_md.c ./jdk/src/solar
  
  void
  NET_AllocSockaddr(struct sockaddr **him, int *len) {
-@@ -689,6 +707,10 @@ NET_InetAddressToSockaddr(JNIEnv *env, j
+@@ -689,6 +707,10 @@
          him6->sin6_family = AF_INET6;
          *len = sizeof(struct sockaddr_in6) ;
  
@@ -15247,7 +15311,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/net_util_md.c ./jdk/src/solar
          /*
           * On Linux if we are connecting to a link-local address
           * we need to specify the interface in the scope_id (2.4 kernel only)
-@@ -1133,6 +1155,24 @@ NET_SetSockOpt(int fd, int level, int  o
+@@ -1133,6 +1155,24 @@
  #define IPTOS_PREC_MASK 0xe0
  #endif
  
@@ -15272,7 +15336,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/net_util_md.c ./jdk/src/solar
      /*
       * IPPROTO/IP_TOS :-
       * 1. IPv6 on Solaris: no-op and will be set in flowinfo
-@@ -1165,6 +1205,10 @@ NET_SetSockOpt(int fd, int level, int  o
+@@ -1165,6 +1205,10 @@
          *iptos &= (IPTOS_TOS_MASK | IPTOS_PREC_MASK);
      }
  
@@ -15283,7 +15347,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/net_util_md.c ./jdk/src/solar
      /*
       * SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On Solaris need to
       * ensure that value is <= max_buf as otherwise we get
-@@ -1212,6 +1256,83 @@ NET_SetSockOpt(int fd, int level, int  o
+@@ -1212,6 +1256,83 @@
      }
  #endif
  
@@ -15367,9 +15431,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/net_util_md.c ./jdk/src/solar
      return setsockopt(fd, level, opt, arg, len);
  }
  
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -37,7 +37,7 @@
  #endif
  
@@ -15379,10 +15443,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/net/net_util_md.h ./jdk/src/solar
  extern int NET_Timeout(int s, long timeout);
  extern int NET_Read(int s, void* buf, size_t len);
  extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/nio/MappedByteBuffer.c	2009-05-14 23:41:34.000000000 -0400
-@@ -38,7 +38,11 @@ Java_java_nio_MappedByteBuffer_isLoaded0
+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
+@@ -38,7 +38,11 @@
                                          jlong address, jlong len)
  {
      jboolean loaded = JNI_TRUE;
@@ -15394,7 +15458,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/nio/MappedByteBuffer.c ./jdk/src/
      jint numPages = (len + pageSize - 1) / pageSize;
      int result = 0;
      int i = 0;
-@@ -92,7 +96,11 @@ JNIEXPORT void JNICALL
+@@ -92,7 +96,11 @@
  Java_java_nio_MappedByteBuffer_force0(JNIEnv *env, jobject obj, jlong address,
                                        jlong len)
  {
@@ -15406,10 +15470,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/nio/MappedByteBuffer.c ./jdk/src/
      unsigned long lAddress = address;
  
      jlong offset = lAddress % pageSize;
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c	2009-05-14 23:41:34.000000000 -0400
-@@ -47,8 +47,11 @@ Java_java_util_prefs_FileSystemPreferenc
+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
+@@ -47,8 +47,11 @@
      return (jint) result;
  }
  
@@ -15422,7 +15486,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/FileSystemPreferences.c ./jd
  
  /**
   * Try to open a named lock file.
-@@ -86,7 +89,11 @@ Java_java_util_prefs_FileSystemPreferenc
+@@ -86,7 +89,11 @@
      if (fd < 0) {
          result[0] = 0;
      } else {
@@ -15434,7 +15498,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/FileSystemPreferences.c ./jd
          result[1] = errno;
          if (rc < 0) {
              result[0]= 0;
-@@ -116,7 +123,11 @@ Java_java_util_prefs_FileSystemPreferenc
+@@ -116,7 +123,11 @@
      fl.l_start = 0;
      fl.l_type = F_UNLCK;
  
@@ -15446,9 +15510,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/FileSystemPreferences.c ./jd
  
      if (rc < 0) {
          close(fd);
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -31,7 +31,7 @@
  #include <errno.h>
  #include <stddef.h>
@@ -15475,7 +15539,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c ./jdk/src/sola
  
  /*
   * Returns a point to the zone ID portion of the given zoneinfo file
-@@ -199,7 +202,9 @@ getPlatformTimeZoneID()
+@@ -199,7 +202,9 @@
      int fd;
      char *buf;
      size_t size;
@@ -15485,7 +15549,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c ./jdk/src/sola
      /*
       * 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 @@ getPlatformTimeZoneID()
+@@ -254,14 +259,18 @@
              return tz;
          }
      }
@@ -15505,7 +15569,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c ./jdk/src/sola
      /*
       * 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 @@ getPlatformTimeZoneID()
+@@ -270,21 +279,25 @@
       * from /etc/localtime.)
       */
      if (S_ISLNK(statbuf.st_mode)) {
@@ -15537,7 +15601,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c ./jdk/src/sola
  
      /*
       * If it's a regular file, we need to find out the same zoneinfo file
-@@ -295,7 +308,7 @@ getPlatformTimeZoneID()
+@@ -295,7 +308,7 @@
      if (buf == NULL) {
          return NULL;
      }
@@ -15546,7 +15610,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c ./jdk/src/sola
          free((void *) buf);
          return NULL;
      }
-@@ -524,7 +537,7 @@ findJavaTZ_md(const char *java_home_dir,
+@@ -524,7 +537,7 @@
  
      tz = getenv("TZ");
  
@@ -15555,7 +15619,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c ./jdk/src/sola
      if (tz == NULL) {
  #else
  #ifdef __solaris__
-@@ -563,19 +576,32 @@ getGMTOffsetID()
+@@ -563,19 +576,32 @@
  {
      time_t offset;
      char sign, buf[16];
@@ -15592,9 +15656,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/java/util/TimeZone_md.c ./jdk/src/sola
      sprintf(buf, (const char *)"GMT%c%02d:%02d",
              sign, (int)(offset/3600), (int)((offset%3600)/60));
      return strdup(buf);
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -25,6 +25,7 @@
  
  #include <jni.h>
@@ -15603,7 +15667,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c ./jdk/src/solaris/
  #include <dlfcn.h>
  #include <cups/cups.h>
  #include <cups/ppd.h>
-@@ -65,10 +66,11 @@ fn_ppdPageSize j2d_ppdPageSize;
+@@ -65,10 +66,11 @@
  JNIEXPORT jboolean JNICALL
  Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env,
                                           jobject printObj) {
@@ -15617,9 +15681,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c ./jdk/src/solaris/
      if (handle == NULL) {
        return JNI_FALSE;
      }
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -31,7 +31,11 @@
  #endif /* !HEADLESS */
  
@@ -15632,9 +15696,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/VDrawingArea.c ./jdk/src/solar
  
  #ifdef __linux__
  /* XXX: Shouldn't be necessary. */
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/X11Color.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -33,7 +33,9 @@
  #include <math.h>
  #include <sys/time.h>
@@ -15645,9 +15709,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/X11Color.c ./jdk/src/solaris/n
  #ifndef HEADLESS
  #include <X11/Xlib.h>
  #include <X11/Xatom.h>
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -30,7 +30,11 @@
  #include <Xm/XmP.h>
  
@@ -15660,10 +15724,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/XDrawingArea.c ./jdk/src/solar
  
  #ifdef DEBUG
  #include <jvm.h>  /* To get jio_fprintf() */
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c	2009-05-14 23:41:34.000000000 -0400
-@@ -334,7 +334,7 @@ loadFont(Display * display, char *name, 
+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
+@@ -334,7 +334,7 @@
              if (strcmp(style, "regular") == 0) {
                  altstyle = "roman";
              }
@@ -15672,9 +15736,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_Font.c ./jdk/src/solaris/n
              if (!strcmp(family, "lucidasans")) {
                  family = "lucida";
              }
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -40,6 +40,7 @@
  #include <jni.h>
  #include <jni_util.h>
@@ -15692,7 +15756,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
  #ifdef NETSCAPE
  #include <signal.h>
  extern int awt_init_xt;
-@@ -122,7 +125,7 @@ static char *x11GraphicsConfigClassName 
+@@ -122,7 +125,7 @@
   */
  
  #define MAXFRAMEBUFFERS 16
@@ -15701,7 +15765,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
  typedef struct {
     int   screen_number;
     short x_org;
-@@ -631,19 +634,22 @@ void checkNewXineramaScreen(JNIEnv* env,
+@@ -631,19 +634,22 @@
  #endif /* HEADLESS */
  
  #ifndef HEADLESS
@@ -15729,7 +15793,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
          XineramaQueryScreens = (XineramaQueryScreensFunc*)
              dlsym(libHandle, XineramaQueryScreensName);
  
-@@ -679,11 +685,10 @@ static void xinerama_init_linux()
+@@ -679,11 +685,10 @@
      }
  }
  #endif
@@ -15743,7 +15807,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
      unsigned char fbhints[MAXFRAMEBUFFERS];
      int32_t locNumScr = 0;
      /* load and run XineramaGetInfo */
-@@ -692,8 +697,8 @@ static void xinerama_init_solaris()
+@@ -692,8 +697,8 @@
      XineramaGetInfoFunc* XineramaSolarisFunc = NULL;
  
      /* load library */
@@ -15754,7 +15818,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
          XineramaSolarisFunc = (XineramaGetInfoFunc*)dlsym(libHandle, XineramaGetInfoName);
          XineramaSolarisCenterFunc =
              (XineramaGetCenterHintFunc*)dlsym(libHandle, XineramaGetCenterHintName);
-@@ -740,11 +745,11 @@ static void xineramaInit(void) {
+@@ -740,11 +745,11 @@
      }
  
      DTRACE_PRINTLN("Xinerama extension is available");
@@ -15768,7 +15832,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
  }
  #endif /* HEADLESS */
  
-@@ -1600,7 +1605,7 @@ Java_sun_awt_X11GraphicsEnvironment_getX
+@@ -1600,7 +1605,7 @@
  {
      jobject point = NULL;
  #ifndef HEADLESS    /* return NULL in HEADLESS, Linux */
@@ -15777,7 +15841,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
      int x,y;
  
      AWT_LOCK();
-@@ -1613,7 +1618,7 @@ Java_sun_awt_X11GraphicsEnvironment_getX
+@@ -1613,7 +1618,7 @@
          DTRACE_PRINTLN("unable to call XineramaSolarisCenterFunc: symbol is null");
      }
      AWT_FLUSH_UNLOCK();
@@ -15786,7 +15850,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
  #endif /* HEADLESS */
      return point;
  }
-@@ -1678,7 +1683,11 @@ X11GD_InitXrandrFuncs(JNIEnv *env)
+@@ -1678,7 +1683,11 @@
  {
      int rr_maj_ver = 0, rr_min_ver = 0;
  
@@ -15799,10 +15863,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c ./jdk/src/so
      if (pLibRandR == NULL) {
          J2dRlsTraceLn(J2D_TRACE_ERROR,
                        "X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c	2009-05-14 23:41:34.000000000 -0400
-@@ -69,7 +69,7 @@ static void PreeditDrawCallback(XIC, XPo
+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
+@@ -69,7 +69,7 @@
                                  XIMPreeditDrawCallbackStruct *);
  static void PreeditCaretCallback(XIC, XPointer,
                                   XIMPreeditCaretCallbackStruct *);
@@ -15811,7 +15875,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  static void StatusStartCallback(XIC, XPointer, XPointer);
  static void StatusDoneCallback(XIC, XPointer, XPointer);
  static void StatusDrawCallback(XIC, XPointer,
-@@ -83,7 +83,7 @@ static void StatusDrawCallback(XIC, XPoi
+@@ -83,7 +83,7 @@
  #define PreeditDoneIndex        1
  #define PreeditDrawIndex        2
  #define PreeditCaretIndex       3
@@ -15820,7 +15884,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  #define StatusStartIndex        4
  #define StatusDoneIndex         5
  #define StatusDrawIndex         6
-@@ -101,14 +101,14 @@ static XIMProc callback_funcs[NCALLBACKS
+@@ -101,14 +101,14 @@
      (XIMProc)PreeditDoneCallback,
      (XIMProc)PreeditDrawCallback,
      (XIMProc)PreeditCaretCallback,
@@ -15837,7 +15901,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  #define MAX_STATUS_LEN  100
  typedef struct {
      Window   w;                /*status window id        */
-@@ -148,7 +148,7 @@ typedef struct _X11InputMethodData {
+@@ -148,7 +148,7 @@
  #endif /* XAWT */
      jobject     x11inputmethod; /* global ref to X11InputMethod instance */
                                  /* associated with the XIC */
@@ -15846,7 +15910,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
      StatusWindow *statusWindow; /* our own status window  */
  #else
  #ifndef XAWT
-@@ -427,7 +427,7 @@ destroyX11InputMethodData(JNIEnv *env, X
+@@ -427,7 +427,7 @@
  static void
  freeX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData)
  {
@@ -15855,7 +15919,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
      if (pX11IMData->statusWindow != NULL){
          StatusWindow *sw = pX11IMData->statusWindow;
          XFreeGC(awt_display, sw->lightGC);
-@@ -533,7 +533,7 @@ awt_x11inputmethod_lookupString(XKeyPres
+@@ -533,7 +533,7 @@
      pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
  
      if (pX11IMData == NULL) {
@@ -15864,7 +15928,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
          return False;
  #else
          return result;
-@@ -541,7 +541,7 @@ awt_x11inputmethod_lookupString(XKeyPres
+@@ -541,7 +541,7 @@
      }
  
      if ((ic = pX11IMData->current_ic) == (XIC)0){
@@ -15873,7 +15937,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
          return False;
  #else
          return result;
-@@ -650,7 +650,7 @@ awt_x11inputmethod_lookupString(XKeyPres
+@@ -650,7 +650,7 @@
      return result;
  }
  
@@ -15882,7 +15946,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  static StatusWindow *createStatusWindow(
  #ifdef XAWT
                                  Window parent) {
-@@ -994,7 +994,7 @@ void adjustStatusWindow(Widget shell){
+@@ -994,7 +994,7 @@
          }
      }
  }
@@ -15891,7 +15955,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  /*
   * Creates two XICs, one for active clients and the other for passive
   * clients. All information on those XICs are stored in the
-@@ -1051,7 +1051,7 @@ createXIC(Widget w, X11InputMethodData *
+@@ -1051,7 +1051,7 @@
          return FALSE ;
      }
  
@@ -15900,7 +15964,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
      on_the_spot_styles |= XIMStatusNothing;
  
      /*kinput does not support XIMPreeditCallbacks and XIMStatusArea
-@@ -1064,7 +1064,7 @@ createXIC(Widget w, X11InputMethodData *
+@@ -1064,7 +1064,7 @@
              break;
          }
      }
@@ -15909,7 +15973,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  #ifdef XAWT
      on_the_spot_styles |= XIMStatusNothing;
  #else /* !XAWT */
-@@ -1087,7 +1087,7 @@ createXIC(Widget w, X11InputMethodData *
+@@ -1087,7 +1087,7 @@
          on_the_spot_styles |= XIMStatusNothing;
  
  #endif /* XAWT */
@@ -15918,7 +15982,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  
      for (i = 0; i < im_styles->count_styles; i++) {
          active_styles |= im_styles->supported_styles[i] & on_the_spot_styles;
-@@ -1135,7 +1135,7 @@ createXIC(Widget w, X11InputMethodData *
+@@ -1135,7 +1135,7 @@
                          NULL);
          if (preedit == (XVaNestedList)NULL)
              goto err;
@@ -15927,7 +15991,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
          /*always try XIMStatusCallbacks for active client...*/
          {
              status = (XVaNestedList)XVaCreateNestedList(0,
-@@ -1157,7 +1157,7 @@ createXIC(Widget w, X11InputMethodData *
+@@ -1157,7 +1157,7 @@
              XFree((void *)status);
              XFree((void *)preedit);
          }
@@ -15936,7 +16000,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  #ifndef XAWT
          if (on_the_spot_styles & XIMStatusArea) {
              Widget parent;
-@@ -1185,7 +1185,7 @@ createXIC(Widget w, X11InputMethodData *
+@@ -1185,7 +1185,7 @@
          }
  #endif /* XAWT */
          XFree((void *)preedit);
@@ -15945,7 +16009,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
          pX11IMData->ic_passive = XCreateIC(X11im,
                                             XNClientWindow, XtWindow(w),
                                             XNFocusWindow, XtWindow(w),
-@@ -1344,7 +1344,7 @@ PreeditCaretCallback(XIC ic, XPointer cl
+@@ -1344,7 +1344,7 @@
  
  }
  
@@ -15954,7 +16018,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  static void
  StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data)
  {
-@@ -1412,7 +1412,7 @@ StatusDrawCallback(XIC ic, XPointer clie
+@@ -1412,7 +1412,7 @@
   finally:
      AWT_UNLOCK();
  }
@@ -15963,7 +16027,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  
  static void CommitStringCallback(XIC ic, XPointer client_data, XPointer call_data) {
      JNIEnv *env = GetJNIEnv();
-@@ -1522,14 +1522,14 @@ Java_sun_awt_motif_MInputMethod_openXIMN
+@@ -1522,14 +1522,14 @@
  /* Use IMInstantiate call back only on Linux, as there is a bug in Solaris
     (4768335)
  */
@@ -15980,7 +16044,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
      }
  #endif
  
-@@ -1593,13 +1593,13 @@ Java_sun_awt_motif_MInputMethod_createXI
+@@ -1593,13 +1593,13 @@
  #endif /* XAWT */
      globalRef = (*env)->NewGlobalRef(env, this);
      pX11IMData->x11inputmethod = globalRef;
@@ -15997,7 +16061,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
  
      pX11IMData->lookup_buf = 0;
      pX11IMData->lookup_buf_len = 0;
-@@ -1746,14 +1746,14 @@ Java_sun_awt_X11_XInputMethod_setXICFocu
+@@ -1746,14 +1746,14 @@
          setXICFocus(pX11IMData->current_ic, req);
          currentX11InputMethodInstance = pX11IMData->x11inputmethod;
          currentFocusWindow =  XtWindow(w);
@@ -16014,7 +16078,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
          onoffStatusWindow(pX11IMData, 0, False);
          if (pX11IMData->current_ic != NULL)
  #endif
-@@ -1770,7 +1770,7 @@ JNIEXPORT void JNICALL
+@@ -1770,7 +1770,7 @@
  Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env,
                                                  jobject this)
  {
@@ -16023,7 +16087,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
      X11InputMethodData *pX11IMData;
      StatusWindow *statusWindow;
  
-@@ -1867,7 +1867,7 @@ Java_sun_awt_motif_MInputMethod_configur
+@@ -1867,7 +1867,7 @@
      X11InputMethodData *pX11IMData;
      XVaNestedList status;
  
@@ -16032,7 +16096,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
        /*do nothing for linux? */
  #else
      AWT_LOCK();
-@@ -1973,7 +1973,7 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_
+@@ -1973,7 +1973,7 @@
  JNIEXPORT void JNICALL Java_sun_awt_X11_XInputMethod_adjustStatusWindow
    (JNIEnv *env, jobject this, jlong window)
  {
@@ -16041,10 +16105,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_InputMethod.c ./jdk/src/so
      AWT_LOCK();
      adjustStatusWindow(window);
      AWT_UNLOCK();
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c	2009-05-14 23:41:34.000000000 -0400
-@@ -260,7 +260,11 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
+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
+@@ -260,7 +260,11 @@
          }
      }
  
@@ -16056,9 +16120,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c ./jdk/src/so
  
      JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
                                 "(Ljava/lang/String;)V",
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -63,8 +63,9 @@
  extern JavaVM *jvm;
  
@@ -16070,7 +16134,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_MToolkit.c ./jdk/src/solar
  #endif
  #endif /* !HEADLESS */
  
-@@ -1642,7 +1643,7 @@ processOneEvent(XtInputMask iMask) {
+@@ -1642,7 +1643,7 @@
                */
                Widget widget=XtWindowToWidget(awt_display, xev.xany.window);
                eventNumber++;
@@ -16079,9 +16143,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_MToolkit.c ./jdk/src/solar
                statusWindowEventHandler(xev);
  #endif
                xembed_eventHandler(&xev);
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -32,6 +32,7 @@
  #include <dlfcn.h>
  #include "jni.h"
@@ -16090,7 +16154,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_Mlib.c ./jdk/src/solaris/n
  #include "awt_Mlib.h"
  #include "java_awt_image_BufferedImage.h"
  
-@@ -67,11 +68,11 @@ mlib_status awt_getImagingLib(JNIEnv *en
+@@ -67,11 +68,11 @@
          ((strncmp(name.machine, "sun4v" , 5) == 0) &&
           (getenv("USE_VIS_ON_SUN4V") != NULL)))
      {
@@ -16104,9 +16168,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_Mlib.c ./jdk/src/solaris/n
      }
  
      if (handle == NULL) {
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -45,7 +45,7 @@
  #include "wsutils.h"
  #include "list.h"
@@ -16116,10 +16180,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_Robot.c ./jdk/src/solaris/
  #include <sys/socket.h>
  #endif
  
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h	2009-05-14 23:41:34.000000000 -0400
-@@ -187,15 +187,20 @@ JNU_GetCharField(JNIEnv *env, jobject se
+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
+@@ -187,15 +187,20 @@
  #ifdef __solaris__
  extern Widget awt_util_getXICStatusAreaWindow(Widget w);
  #else
@@ -16141,10 +16205,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_util.h ./jdk/src/solaris/n
  typedef struct _XmImRefRec {
    Cardinal      num_refs;       /* Number of referencing widgets. */
    Cardinal      max_refs;       /* Maximum length of refs array. */
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c	2009-05-14 23:41:34.000000000 -0400
-@@ -121,12 +121,19 @@ static Atom XA_KWM_WIN_ICONIFIED;
+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
+@@ -121,12 +121,19 @@
  static Atom XA_KWM_WIN_MAXIMIZED;
  
  /* OpenLook */
@@ -16164,7 +16228,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_wm.c ./jdk/src/solaris/nat
  /* For _NET_WM_STATE ClientMessage requests */
  #define _NET_WM_STATE_REMOVE    0 /* remove/unset property */
  #define _NET_WM_STATE_ADD       1 /* add/set property      */
-@@ -193,7 +200,12 @@ awt_wm_initAtoms(void)
+@@ -193,7 +200,12 @@
          { &_XA_OL_DECOR_HEADER,              "_OL_DECOR_HEADER"              },
          { &_XA_OL_DECOR_RESIZE,              "_OL_DECOR_RESIZE"              },
          { &_XA_OL_DECOR_PIN,                 "_OL_DECOR_PIN"                 },
@@ -16178,7 +16242,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_wm.c ./jdk/src/solaris/nat
      };
  #define ATOM_LIST_LENGTH (sizeof(atom_list)/sizeof(atom_list[0]))
  
-@@ -942,6 +954,39 @@ awt_wm_isMotif(void)
+@@ -942,6 +954,39 @@
      return True;
  }
  
@@ -16218,7 +16282,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_wm.c ./jdk/src/solaris/nat
  
  static Boolean
  awt_wm_isNetWMName(char *name)
-@@ -1280,6 +1325,12 @@ awt_wm_getRunningWM(void)
+@@ -1280,6 +1325,12 @@
      else if (awt_wm_isKDE2()) {
          awt_wmgr = KDE2_WM;
      }
@@ -16231,7 +16295,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_wm.c ./jdk/src/solaris/nat
      /*
       * We don't check for legacy WM when we already know that WM
       * supports WIN or _NET wm spec.
-@@ -1302,6 +1353,9 @@ awt_wm_getRunningWM(void)
+@@ -1302,6 +1353,9 @@
          awt_wmgr = MOTIF_WM;
      }
      else if (awt_wm_isOpenLook()) {
@@ -16241,10 +16305,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_wm.c ./jdk/src/solaris/nat
          awt_wmgr = OPENLOOK_WM;
      }
      else {
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h	2009-05-14 23:41:34.000000000 -0400
-@@ -45,7 +45,10 @@ enum wmgr_t {
+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
+@@ -45,7 +45,10 @@
      KDE2_WM,
      SAWFISH_WM,
      ICE_WM,
@@ -16256,10 +16320,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/awt_wm.h ./jdk/src/solaris/nat
  };
  
  extern void awt_wm_init(void);
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h	2009-05-14 23:41:34.000000000 -0400
-@@ -58,7 +58,7 @@ in this Software without prior written a
+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
+@@ -58,7 +58,7 @@
   */
  /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
  
@@ -16268,15 +16332,15 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/extutil.h ./jdk/src/solaris/na
  
  #ifndef _EXTUTIL_H_
  #define _EXTUTIL_H_
-@@ -248,4 +248,4 @@ char *proc (Display *dpy, int code, XExt
+@@ -248,4 +248,4 @@
          char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
  #endif
  
 -#endif /* __linux__ */
 +#endif /* __linux__ || _ALLBSD_SOURCE */
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -23,7 +23,7 @@
   * have any questions.
   */
@@ -16320,7 +16384,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/n
  /*
   * This can be set in the makefile to "/usr/X11" if so desired.
   */
-@@ -111,24 +126,40 @@ static char *fullSolarisFontPath[] = {
+@@ -111,24 +126,40 @@
      NULL, /* terminates the list */
  };
  
@@ -16373,7 +16437,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/n
      NULL, /* terminates the list */
  };
  #endif
-@@ -351,7 +382,7 @@ static char **getX11FontPath ()
+@@ -351,7 +382,7 @@
  
  #endif /* !HEADLESS */
  
@@ -16382,7 +16446,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/n
  /* from awt_LoadLibrary.c */
  JNIEXPORT jboolean JNICALL AWTIsHeadless();
  #endif
-@@ -476,8 +507,10 @@ static char *getPlatformFontPathChars(JN
+@@ -476,8 +507,10 @@
       */
      fcdirs = getFontConfigLocations();
  
@@ -16394,7 +16458,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/n
  #else /* IF SOLARIS */
      knowndirs = fullSolarisFontPath;
  #endif
-@@ -488,7 +521,8 @@ static char *getPlatformFontPathChars(JN
+@@ -488,7 +521,8 @@
       * be initialised.
       */
  #ifndef HEADLESS
@@ -16404,7 +16468,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/n
      if (!AWTIsHeadless()) { /* .. so need to call a function to check */
  #endif
      AWT_LOCK();
-@@ -496,7 +530,7 @@ static char *getPlatformFontPathChars(JN
+@@ -496,7 +530,7 @@
          x11dirs = getX11FontPath();
      }
      AWT_UNLOCK();
@@ -16413,7 +16477,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/n
      }
  #endif
  #endif /* !HEADLESS */
-@@ -608,7 +642,7 @@ Java_sun_font_FontManager_populateFontFi
+@@ -608,7 +642,7 @@
  }
  
  #include <dlfcn.h>
@@ -16422,7 +16486,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/n
  #include <link.h>
  #endif
  
-@@ -654,9 +688,9 @@ static void* openFontConfig() {
+@@ -654,9 +688,9 @@
       * certain symbols - and functionality - to be available.
       * Also add explicit search for .so.1 in case .so symlink doesn't exist.
       */
@@ -16434,9 +16498,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/fontpath.c ./jdk/src/solaris/n
          if (libfontconfig == NULL) {
              return NULL;
          }
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -30,8 +30,9 @@
  #include <string.h>
  #include "gtk2_interface.h"
@@ -16448,10 +16512,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/gtk2_interface.c ./jdk/src/sol
  
  #define G_TYPE_INVALID                  G_TYPE_MAKE_FUNDAMENTAL (0)
  #define G_TYPE_NONE                     G_TYPE_MAKE_FUNDAMENTAL (1)
-diff -uNpr ../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-04-24 03:34:34.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/list.c	2009-05-14 23:41:34.000000000 -0400
-@@ -66,7 +66,11 @@ from the X Consortium.
+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
+@@ -66,7 +66,11 @@
    ----------------------------------------------------------------------- **/
  
  #include <stdio.h>
@@ -16463,9 +16527,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/list.c ./jdk/src/solaris/nativ
  #include "list.h"
  
  
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/awt/robot_common.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -27,6 +27,9 @@
      #error This file should not be included in headless library
  #endif
@@ -16476,9 +16540,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/awt/robot_common.c ./jdk/src/solar
  #include "robot_common.h"
  
  /*
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -32,7 +32,11 @@
   * into X11FontScaler_md.c, which is compiled into another library.
   */
@@ -16491,9 +16555,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/font/X11FontScaler.c ./jdk/src/sol
  #include <ctype.h>
  #include <sys/utsname.h>
  
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -39,7 +39,11 @@
  #include "GraphicsPrimitiveMgr.h"
  #include "glyphblitting.h"
@@ -16506,9 +16570,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/font/X11TextRenderer.c ./jdk/src/s
  
  
  JNIEXPORT void JNICALL AWTDrawGlyphList
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -28,11 +28,11 @@
  #include <sys/types.h>
  
@@ -16524,9 +16588,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/j2d_md.h ./jdk/src/solaris/
  
  typedef unsigned char   jubyte;
  typedef unsigned short  jushort;
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -66,6 +66,10 @@
   *    MLIB_EDGE_SRC_PADDED
   */
@@ -16538,7 +16602,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c .
  #include <mlib_image.h>
  #include <mlib_ImageZoom.h>
  
-@@ -102,7 +106,7 @@ typedef union {
+@@ -102,7 +106,7 @@
  
  /***************************************************************/
  
@@ -16547,7 +16611,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c .
  
  static const mlib_u32 mlib_bit_mask4[16] = {
    0x00000000u, 0xFF000000u, 0x00FF0000u, 0xFFFF0000u,
-@@ -111,7 +115,7 @@ static const mlib_u32 mlib_bit_mask4[16]
+@@ -111,7 +115,7 @@
    0x0000FFFFu, 0xFF00FFFFu, 0x00FFFFFFu, 0xFFFFFFFFu
  };
  
@@ -16556,7 +16620,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c .
  
  static const mlib_u32 mlib_bit_mask4[16] = {
    0x00000000u, 0x000000FFu, 0x0000FF00u, 0x0000FFFFu,
-@@ -120,7 +124,7 @@ static const mlib_u32 mlib_bit_mask4[16]
+@@ -120,7 +124,7 @@
    0xFFFF0000u, 0xFFFF00FFu, 0xFFFFFF00u, 0xFFFFFFFFu
  };
  
@@ -16565,7 +16629,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c .
  
  /***************************************************************/
  
-@@ -344,11 +348,11 @@ mlib_status mlib_ImageZoom_BIT_1_Nearest
+@@ -344,11 +348,11 @@
  #ifdef _NO_LONGLONG
  
  typedef struct {
@@ -16580,7 +16644,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c .
  } two_uint;
  
  /***************************************************************/
-@@ -511,11 +515,11 @@ mlib_status mlib_ImageZoom_BitToGray_1_N
+@@ -511,11 +515,11 @@
          DTYPE mask;
          MASK(mask);
          off *= 8;
@@ -16595,7 +16659,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c .
  
  #ifdef __SUNPRO_C
  #pragma pipeloop(0)
-@@ -540,30 +544,30 @@ mlib_status mlib_ImageZoom_BitToGray_1_N
+@@ -540,30 +544,30 @@
  
            res = (res & 0xff) | (res >> 8);
            dd = gray_mask[res];
@@ -16632,10 +16696,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c .
          LOGIC(da[0], dtmp, dtmp1, |);
        }
        else {                                               /* aligned */
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c	2009-05-14 23:41:34.000000000 -0400
-@@ -794,7 +794,7 @@ static AnyFunc* hash_table_vis[HASH_SIZE
+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
+@@ -794,7 +794,7 @@
  static int initialized;
  static int usevis = JNI_TRUE;
  
@@ -16644,9 +16708,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c ./jdk
  #   define ULTRA_CHIP   "sparc64"
  #else
  #   define ULTRA_CHIP   "sun4u"
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -27,7 +27,10 @@
  #define OGLFuncs_md_h_Included
  
@@ -16658,7 +16722,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h ./jdk/
  #include "J2D_GL/glx.h"
  #include "OGLFuncMacros.h"
  
-@@ -113,7 +116,7 @@ do { \
+@@ -113,7 +116,7 @@
      { \
          char *libGLPath = getenv("J2D_ALT_LIBGL_PATH"); \
          if (libGLPath == NULL) { \
@@ -16667,9 +16731,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h ./jdk/
          } \
          OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
      } \
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -32,6 +32,7 @@
  #include "gdefs.h"
  
@@ -16678,7 +16742,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c ./jdk/
  #include "awt_Component.h"
  #include "awt_GraphicsEnv.h"
  
-@@ -128,7 +129,7 @@ Java_sun_java2d_x11_X11SurfaceData_initI
+@@ -128,7 +129,7 @@
  
      if (tryDGA && (getenv("NO_J2D_DGA") == NULL)) {
      /* we use RTLD_NOW because of bug 4032715 */
@@ -16687,9 +16751,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c ./jdk/
      }
      dgaAvailable = JNI_FALSE;
      if (lib != NULL) {
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -44,6 +44,7 @@
  #include <X11/Xlib.h>
  
@@ -16698,7 +16762,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/jdga/dgalock.c ./jdk/src/solaris/n
  #include "jdga.h"
  #include "jdgadevice.h"
  
-@@ -84,10 +85,10 @@ Drawable GetVirtualDrawableStub(Display 
+@@ -84,10 +85,10 @@
  static GetVirtualDrawableFunc * GetVirtualDrawable = GetVirtualDrawableStub;
  
  static void Solaris_DGA_XineramaInit(Display *display) {
@@ -16712,9 +16776,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/jdga/dgalock.c ./jdk/src/solaris/n
              void *sym = dlsym(handle, "IsXineramaOn");
              IsXineramaOn = (IsXineramaOnFunc *)sym;
              if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -26,6 +26,10 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -16726,9 +16790,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/management/FileSystemImpl.c ./jdk/
  #include "jni.h"
  #include "jni_util.h"
  #include "sun_management_FileSystemImpl.h"
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -33,7 +33,7 @@
  #include <strings.h>
  #endif
@@ -16738,9 +16802,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.
  #include <string.h>
  #endif
  
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -26,11 +26,12 @@
  #include "jni.h"
  #include "jni_util.h"
@@ -16755,7 +16819,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c ./j
  #include <string.h>
  #else
  #include <strings.h>
-@@ -109,8 +110,9 @@ Java_sun_net_spi_DefaultProxySelector_in
+@@ -109,8 +110,9 @@
    /**
     * Let's try to load le GConf-2 library
     */
@@ -16767,9 +16831,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c ./j
      gconf_ver = 2;
    }
    if (gconf_ver > 0) {
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -35,7 +35,7 @@
  #include <string.h>
  #include <errno.h>
@@ -16779,7 +16843,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c ./jdk
  #include <netinet/in.h>
  #endif
  
-@@ -86,7 +86,7 @@ Java_sun_nio_ch_DatagramChannelImpl_disc
+@@ -86,7 +86,7 @@
      rv = connect(fd, 0, 0);
  #endif
  
@@ -16788,7 +16852,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c ./jdk
      {
          int len;
          SOCKADDR sa;
-@@ -96,17 +96,30 @@ Java_sun_nio_ch_DatagramChannelImpl_disc
+@@ -96,17 +96,30 @@
  #ifdef AF_INET6
          if (ipv6_available()) {
              struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&sa;
@@ -16819,9 +16883,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c ./jdk
      }
  #endif
  
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -26,15 +26,21 @@
  #include "jni.h"
  #include "jni_util.h"
@@ -16844,7 +16908,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c ./jdk/src
  static jfieldID chan_fd;        /* jobject 'fd' in sun.io.FileChannelImpl */
  
  #ifdef __solaris__
-@@ -59,6 +65,10 @@ sendfile_func* my_sendfile_func = NULL;
+@@ -59,6 +65,10 @@
  typedef ssize_t sendfile64_func(int out_fd, int in_fd, off64_t *offset, size_t count);
  
  sendfile64_func* my_sendfile64_func = NULL;
@@ -16855,7 +16919,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c ./jdk/src
  #endif
  
  JNIEXPORT jlong JNICALL
-@@ -68,7 +78,8 @@ Java_sun_nio_ch_FileChannelImpl_initIDs(
+@@ -68,7 +78,8 @@
      chan_fd = (*env)->GetFieldID(env, clazz, "fd", "Ljava/io/FileDescriptor;");
  
  #ifdef __solaris__
@@ -16865,7 +16929,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c ./jdk/src
          my_sendfile_func = (sendfile_func*) dlsym(RTLD_DEFAULT, "sendfilev64");
      }
  #endif
-@@ -278,6 +289,58 @@ Java_sun_nio_ch_FileChannelImpl_transfer
+@@ -278,6 +289,58 @@
          return result;
      }
  #endif
@@ -16924,7 +16988,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c ./jdk/src
  }
  
  JNIEXPORT jint JNICALL
-@@ -329,6 +392,23 @@ Java_sun_nio_ch_FileChannelImpl_release0
+@@ -329,6 +392,23 @@
      fl.l_start = (off64_t)pos;
      fl.l_type = F_UNLCK;
      lockResult = fcntl(fd, cmd, &fl);
@@ -16948,9 +17012,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c ./jdk/src
      if (lockResult < 0) {
          JNU_ThrowIOExceptionWithLastError(env, "Release failed");
      }
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -32,8 +32,12 @@
  #include <sys/socket.h>
  #include <fcntl.h>
@@ -16964,9 +17028,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c ./jdk/src/
  
  static int preCloseFD = -1;     /* File descriptor to which we dup other fd's
                                     before closing them for real */
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -30,6 +30,10 @@
  #include "nio_util.h"
  #include "sun_nio_ch_FileKey.h"
@@ -16978,10 +17042,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/FileKey.c ./jdk/src/solaris
  static jfieldID key_st_dev;    /* id for FileKey.st_dev */
  static jfieldID key_st_ino;    /* id for FileKey.st_ino */
  
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c	2009-05-14 23:41:34.000000000 -0400
-@@ -140,8 +140,31 @@ Java_sun_nio_ch_Net_localPort(JNIEnv *en
+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
+@@ -140,8 +140,31 @@
      SOCKADDR sa;
      int sa_len = SOCKADDR_LEN;
      if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
@@ -17013,7 +17077,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/Net.c ./jdk/src/solaris/nat
      }
      return NET_GetPortFromSockaddr((struct sockaddr *)&sa);
  }
-@@ -153,12 +176,76 @@ Java_sun_nio_ch_Net_localInetAddress(JNI
+@@ -153,12 +176,76 @@
      int sa_len = SOCKADDR_LEN;
      int port;
      if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
@@ -17092,7 +17156,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/Net.c ./jdk/src/solaris/nat
  
  #ifdef NEEDED
  
-@@ -224,7 +311,7 @@ Java_sun_nio_ch_Net_getIntOption0(JNIEnv
+@@ -224,7 +311,7 @@
      int result;
      struct linger linger;
      void *arg;
@@ -17101,7 +17165,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/Net.c ./jdk/src/solaris/nat
  
      if (NET_MapSocketOption(opt, &klevel, &kopt) < 0) {
          JNU_ThrowByNameWithLastError(env,
-@@ -262,7 +349,7 @@ Java_sun_nio_ch_Net_setIntOption0(JNIEnv
+@@ -262,7 +349,7 @@
      int result;
      struct linger linger;
      void *parg;
@@ -17110,7 +17174,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/Net.c ./jdk/src/solaris/nat
  
      if (NET_MapSocketOption(opt, &klevel, &kopt) < 0) {
          JNU_ThrowByNameWithLastError(env,
-@@ -304,9 +391,11 @@ handleSocketError(JNIEnv *env, jint erro
+@@ -304,9 +391,11 @@
      switch (errorValue) {
          case EINPROGRESS:       /* Non-blocking connect */
              return 0;
@@ -17122,9 +17186,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/nio/ch/Net.c ./jdk/src/solaris/nat
          case ECONNREFUSED:
              xn = JNU_JAVANETPKG "ConnectException";
              break;
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -26,7 +26,9 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -17135,9 +17199,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
  #include "NativeFunc.h"
  
  /* standard GSS method names (ordering is from mapfile) */
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -28,12 +28,19 @@
  #include <string.h>
  
@@ -17158,7 +17222,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c ./jd
  void *findFunction(JNIEnv *env, jlong jHandle, const char *functionName) {
      void *hModule = (void*)jHandle;
      void *fAddress = dlsym(hModule, functionName);
-@@ -51,7 +58,11 @@ JNIEXPORT jlong JNICALL Java_sun_securit
+@@ -51,7 +58,11 @@
  {
      const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL);
      // look up existing handle only, do not load
@@ -17170,7 +17234,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c ./jd
      dprintf2("-handle for %s: %u\n", libName, hModule);
      (*env)->ReleaseStringUTFChars(env, jLibName, libName);
      return (jlong)hModule;
-@@ -65,6 +76,9 @@ JNIEXPORT jlong JNICALL Java_sun_securit
+@@ -65,6 +76,9 @@
  
      dprintf1("-lib %s\n", libName);
      hModule = dlopen(libName, RTLD_LAZY);
@@ -17180,9 +17244,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c ./jd
      (*env)->ReleaseStringUTFChars(env, jLibName, libName);
      dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
  
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -64,7 +64,9 @@
  #include <assert.h>
  
@@ -17193,9 +17257,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c .
  
  #include <jni.h>
  
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -29,7 +29,9 @@
  #include <assert.h>
  
@@ -17206,9 +17270,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c ./j
  
  #include <winscard.h>
  
-diff -uNpr ../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-05-14 23:40:17.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -35,10 +35,10 @@
  #include <dirent.h>
  #include <ctype.h>
@@ -17307,7 +17371,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c .
   * Class:     sun_tools_attach_BsdVirtualMachine
   * Method:    socket
   * Signature: ()I
-@@ -188,146 +109,6 @@ JNIEXPORT void JNICALL Java_sun_tools_at
+@@ -188,146 +109,6 @@
  
  /*
   * Class:     sun_tools_attach_BsdVirtualMachine
@@ -17454,7 +17518,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c .
   * Method:    sendQuitTo
   * Signature: (I)V
   */
-@@ -350,7 +131,7 @@ JNIEXPORT void JNICALL Java_sun_tools_at
+@@ -350,7 +131,7 @@
      jboolean isCopy;
      const char* p = GetStringPlatformChars(env, path, &isCopy);
      if (p != NULL) {
@@ -17463,7 +17527,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c .
          uid_t uid, gid;
          int res;
  
-@@ -361,7 +142,7 @@ JNIEXPORT void JNICALL Java_sun_tools_at
+@@ -361,7 +142,7 @@
          uid = geteuid();
          gid = getegid();
  
@@ -17472,7 +17536,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c .
          if (res != 0) {
              /* save errno */
              res = errno;
-@@ -459,3 +240,40 @@ JNIEXPORT void JNICALL Java_sun_tools_at
+@@ -459,3 +240,40 @@
  
      } while (remaining > 0);
  }
@@ -17513,10 +17577,10 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c .
 +        JNU_ReleaseStringPlatformChars(env, path, _path);
 +    }
 +}
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c	2009-05-14 23:41:34.000000000 -0400
-@@ -228,10 +228,10 @@ KeymapEntry keymapTable[] =
+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
+@@ -228,10 +228,10 @@
      {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
  
      /* Keypad equivalents of Triangular Navigation Block */
@@ -17531,7 +17595,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/xawt/XWindow.c ./jdk/src/solaris/n
  
      /* Other vendor-specific Triangular Navigation Block */
      {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
-@@ -865,7 +865,7 @@ handleKeyEventWithNumLockMask(XEvent *ev
+@@ -865,7 +865,7 @@
  {
      KeySym originalKeysym = *keysym;
  
@@ -17540,9 +17604,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/xawt/XWindow.c ./jdk/src/solaris/n
      /* The following code on Linux will cause the keypad keys
       * not to echo on JTextField when the NumLock is on. The
       * keysyms will be 0, because the last parameter 2 is not defined.
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -24,6 +24,7 @@
   */
  
@@ -17551,7 +17615,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/xawt/awt_Desktop.c ./jdk/src/solar
  #include <dlfcn.h>
  
  typedef int gboolean;
-@@ -36,7 +37,7 @@ int init(){
+@@ -36,7 +37,7 @@
      gboolean (*gnome_vfs_init) (void);
      const char *errmsg;
  
@@ -17560,7 +17624,7 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/xawt/awt_Desktop.c ./jdk/src/solar
      if (vfs_handle == NULL) {
  #ifdef INTERNAL_BUILD
          fprintf(stderr, "can not load libgnomevfs-2.so\n");
-@@ -54,7 +55,7 @@ int init(){
+@@ -54,7 +55,7 @@
      // call gonme_vfs_init()
      (*gnome_vfs_init)();
  
@@ -17569,9 +17633,9 @@ diff -uNpr ../orig/jdk/src/solaris/native/sun/xawt/awt_Desktop.c ./jdk/src/solar
      if (gnome_handle == NULL) {
  #ifdef INTERNAL_BUILD
          fprintf(stderr, "can not load libgnome-2.so\n");
-diff -uNpr ../orig/jdk/src/solaris/npt/npt_md.h ./jdk/src/solaris/npt/npt_md.h
---- ../orig/jdk/src/solaris/npt/npt_md.h	2009-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/npt/npt_md.h	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -32,9 +32,10 @@
  #include <string.h>
  #include <errno.h>
@@ -17594,9 +17658,9 @@ diff -uNpr ../orig/jdk/src/solaris/npt/npt_md.h ./jdk/src/solaris/npt/npt_md.h
          if ( _handle == NULL ) NPT_ERROR("Cannot open library");        \
          _sym = dlsym(_handle, "nptInitialize");                         \
          if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize");     \
-diff -uNpr ../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-04-24 03:34:35.000000000 -0400
-+++ ./jdk/src/solaris/transport/socket/socket_md.c	2009-05-14 23:41:34.000000000 -0400
+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
 @@ -36,7 +36,7 @@
  #ifdef __solaris__
  #include <thread.h>
@@ -17606,7 +17670,7 @@ diff -uNpr ../orig/jdk/src/solaris/transport/socket/socket_md.c ./jdk/src/solari
  #include <pthread.h>
  #include <sys/poll.h>
  #endif
-@@ -283,7 +283,7 @@ dbgsysTlsGet(int index) {
+@@ -283,7 +283,7 @@
  
  #endif
  
@@ -17615,10 +17679,39 @@ diff -uNpr ../orig/jdk/src/solaris/transport/socket/socket_md.c ./jdk/src/solari
  int
  dbgsysTlsAlloc() {
      pthread_key_t key;
-diff -uNpr ../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-04-24 03:35:10.000000000 -0400
-+++ ./langtools/src/share/classes/com/sun/tools/javah/Util.java	2009-05-14 23:41:34.000000000 -0400
-@@ -180,6 +180,14 @@ public class Util {
+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
+@@ -22,7 +22,7 @@
+  */
+ /* @test
+  * @summary verify TextLayout.getBounds() return visual bounds
+- * @bug 6323611
++ * @bug 6323611 6761856
+  */
+ 
+ import java.awt.*;
+@@ -39,10 +39,15 @@
+        Rectangle2D tlBounds = tl.getBounds();
+        GlyphVector gv = f.createGlyphVector(frc, s);
+        Rectangle2D gvvBounds = gv.getVisualBounds();
++       Rectangle2D oBounds = tl.getOutline(null).getBounds2D();
+        System.out.println("tlbounds="+tlBounds);
+        System.out.println("gvbounds="+gvvBounds);
++       System.out.println("outlineBounds="+oBounds);
+        if (!gvvBounds.equals(tlBounds)) {
+-          throw new RuntimeException("Bounds differ");
++          throw new RuntimeException("Bounds differ [gvv != tl]");
++       }
++       if (!tlBounds.equals(oBounds)) {
++          throw new RuntimeException("Bounds differ [tl != outline]");
+        }
+     }
+ }
+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
+@@ -180,6 +180,14 @@
              os = "win32";
          } else if (os.indexOf("Linux") >= 0) {
              os = "Linux";
author	Alex Dupre <ale@FreeBSD.org>	2010-01-16 19:34:32 +0000
committer	Alex Dupre <ale@FreeBSD.org>	2010-01-16 19:34:32 +0000
commit	ab853e1dfcaf4917b2a4d9bd0cd5e253a953e962 (patch)
tree	4fec05e8b272ec3128e50a62c5e2e711646b1a8a
parent	Make sa-compile support conditional. (diff)