From owner-freebsd-java@FreeBSD.ORG Mon Jun 28 04:10:20 2010 Return-Path: Delivered-To: java@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12D4F106564A; Mon, 28 Jun 2010 04:10:20 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DF1D98FC19; Mon, 28 Jun 2010 04:10:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o5S4AJno091087; Mon, 28 Jun 2010 04:10:19 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o5S4AJZb091078; Mon, 28 Jun 2010 04:10:19 GMT (envelope-from edwin) Date: Mon, 28 Jun 2010 04:10:19 GMT Message-Id: <201006280410.o5S4AJZb091078@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, java@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/148202: [PATCH] java/openjdk6: update to b20 X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 04:10:20 -0000 Synopsis: [PATCH] java/openjdk6: update to b20 Responsible-Changed-From-To: freebsd-ports-bugs->java Responsible-Changed-By: edwin Responsible-Changed-When: Mon Jun 28 04:10:19 UTC 2010 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=148202 From owner-freebsd-java@FreeBSD.ORG Mon Jun 28 04:33:38 2010 Return-Path: Delivered-To: java@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E7805106564A for ; Mon, 28 Jun 2010 04:33:38 +0000 (UTC) (envelope-from glewis@misty.eyesbeyond.com) Received: from misty.eyesbeyond.com (gerbercreations.com [71.39.140.16]) by mx1.freebsd.org (Postfix) with ESMTP id E720F8FC16 for ; Mon, 28 Jun 2010 04:33:36 +0000 (UTC) Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1]) by misty.eyesbeyond.com (8.14.4/8.14.4) with ESMTP id o5S47bCM079373; Sun, 27 Jun 2010 21:07:37 -0700 (PDT) (envelope-from glewis@misty.eyesbeyond.com) Received: (from glewis@localhost) by misty.eyesbeyond.com (8.14.4/8.14.4/Submit) id o5S47b1j079372; Sun, 27 Jun 2010 21:07:37 -0700 (PDT) (envelope-from glewis) Date: Sun, 27 Jun 2010 21:07:37 -0700 (PDT) Message-Id: <201006280407.o5S47b1j079372@misty.eyesbeyond.com> To: FreeBSD-gnats-submit@freebsd.org From: Greg Lewis X-send-pr-version: 3.113 X-GNATS-Notify: Cc: java@freebsd.org Subject: [PATCH] java/openjdk6: update to b20 X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 04:33:39 -0000 >Submitter-Id: current-users >Originator: Greg Lewis >Organization: >Confidential: no >Synopsis: [PATCH] java/openjdk6: update to b20 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 7.3-RELEASE i386 >Environment: System: FreeBSD misty.eyesbeyond.com 7.3-RELEASE FreeBSD 7.3-RELEASE #0: Sat Apr 10 10:48:33 PDT 2010 >Description: - Update to b20 Will commit this once its had a little more testing and/or the ports freeze is over. Putting it into a PR so I can track it. Port maintainer (java@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- openjdk6-b20.patch begins here --- Index: Makefile =================================================================== RCS file: /var/fcvs/ports/java/openjdk6/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 21 May 2010 05:11:57 -0000 1.24 +++ Makefile 28 Jun 2010 04:04:56 -0000 @@ -6,22 +6,23 @@ # PORTNAME= openjdk6 -PORTVERSION= b19 -PORTREVISION= 1 +PORTVERSION= b20 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \ - https://jaxp.dev.java.net/files/documents/913/147491/:jaxp \ - http://kenai.com/projects/jdk6-drops/downloads/download/:jaxws \ + https://jaxp.dev.java.net/files/documents/913/150648/:jaxp \ + https://jax-ws.dev.java.net/files/documents/4202/150724/:jaxws \ + https://jax-ws.dev.java.net/files/documents/4202/150725/:jaf \ http://icedtea.classpath.org/builds/icedtea6/src/ \ http://icedtea.classpath.org/builds/icedtea6/src/drops/:jaxp \ http://icedtea.classpath.org/builds/icedtea6/src/drops/:jaxws \ + http://icedtea.classpath.org/builds/icedtea6/src/drops/:jaf \ ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \ http://download.java.net/openjdk/jtreg/promoted/${JTREGVERSION}/:jtreg DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${JAXPFILE}:jaxp \ ${JAXWSFILE}:jaxws \ - ${JAFFILE}:jaxws \ + ${JAFFILE}:jaf \ ${ANTFILE}:ant EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${ANTFILE} @@ -35,7 +36,9 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu -OPENJDK_BUILDDATE= 15_apr_2010 +LICENSE= GPLv2 + +OPENJDK_BUILDDATE= 21_jun_2010 OPTIONS= DEBUG "Enable legacy debugging support" off \ FASTDEBUG "Include fastdebug build" off \ @@ -50,12 +53,12 @@ USE_MOTIF= yes USE_XORG= xtst xi xt x11 -JAXP_BUILDDATE= 2010_01_15 -JAXPFILE= jdk6-jaxp-${JAXP_BUILDDATE}.zip -JAXWS_BUILDDATE=2009_10_27 -JAXWSFILE= jdk6-jaxws-${JAXWS_BUILDDATE}.zip -JAF_BUILDDATE= 2009_10_27 -JAFFILE= jdk6-jaf-${JAF_BUILDDATE}.zip +JAXP_BUILD= b20 +JAXPFILE= jdk6-jaxp-${JAXP_BUILD}.zip +JAXWS_BUILD= b20 +JAXWSFILE= jdk6-jaxws-${JAXWS_BUILD}.zip +JAF_BUILD= b20 +JAFFILE= jdk6-jaf-${JAF_BUILD}.zip JTREGVERSION= b03 JTREGFILE= jtreg-4_0-bin-${JTREGVERSION}-31_mar_2009.zip Index: distinfo =================================================================== RCS file: /var/fcvs/ports/java/openjdk6/distinfo,v retrieving revision 1.10 diff -u -r1.10 distinfo --- distinfo 21 May 2010 05:11:57 -0000 1.10 +++ distinfo 22 Jun 2010 05:28:18 -0000 @@ -1,15 +1,15 @@ -MD5 (openjdk-6-src-b19-15_apr_2010.tar.gz) = 39bbf623a6c83ca63b92593062a28146 -SHA256 (openjdk-6-src-b19-15_apr_2010.tar.gz) = 475e788dc9fe7f360edc147167e81111e46afae96df6b8a184c13d1e160ae8e4 -SIZE (openjdk-6-src-b19-15_apr_2010.tar.gz) = 44912180 -MD5 (jdk6-jaxp-2010_01_15.zip) = 8b7e78ef992ffb7f583617dd3036bdb7 -SHA256 (jdk6-jaxp-2010_01_15.zip) = 181615cfec1c3721a7d8f278fa25b392be4247a496c7774a10cb9df37684f94f -SIZE (jdk6-jaxp-2010_01_15.zip) = 5976848 -MD5 (jdk6-jaxws-2009_10_27.zip) = 3ea5728706169498b722b898a1008acf -SHA256 (jdk6-jaxws-2009_10_27.zip) = 155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2 -SIZE (jdk6-jaxws-2009_10_27.zip) = 5446377 -MD5 (jdk6-jaf-2009_10_27.zip) = 7a50bb540a27cdd0001885630088b758 -SHA256 (jdk6-jaf-2009_10_27.zip) = fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f -SIZE (jdk6-jaf-2009_10_27.zip) = 69593 +MD5 (openjdk-6-src-b20-21_jun_2010.tar.gz) = 0b36adbf67e4f261e1b827ed4be4f447 +SHA256 (openjdk-6-src-b20-21_jun_2010.tar.gz) = fcf8f1d614e5965e90ef1b1a6d5eecc2bcc3078eaffbb62b83dfba52da62e54b +SIZE (openjdk-6-src-b20-21_jun_2010.tar.gz) = 45078703 +MD5 (jdk6-jaxp-b20.zip) = 22e95fbdb9fb7d8b6b6fc0a1d76d1fbd +SHA256 (jdk6-jaxp-b20.zip) = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156 +SIZE (jdk6-jaxp-b20.zip) = 5944804 +MD5 (jdk6-jaxws-b20.zip) = 91adfd41e6f001add4f92ae31216b1e3 +SHA256 (jdk6-jaxws-b20.zip) = 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb +SIZE (jdk6-jaxws-b20.zip) = 5513069 +MD5 (jdk6-jaf-b20.zip) = bc95c133620bd68c161cac9891592901 +SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 +SIZE (jdk6-jaf-b20.zip) = 71243 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 Index: files/patch-set =================================================================== RCS file: /var/fcvs/ports/java/openjdk6/files/patch-set,v retrieving revision 1.7 diff -u -r1.7 patch-set --- files/patch-set 18 May 2010 13:29:10 -0000 1.7 +++ files/patch-set 28 Jun 2010 03:56:30 -0000 @@ -1,8 +1,8 @@ ---- Makefile 2010-04-15 11:30:12.000000000 +0400 -+++ Makefile 2010-04-17 21:48:07.000000000 +0400 -@@ -159,6 +159,18 @@ - clobber:: deploy-clobber - endif +--- Makefile 2010-06-21 14:11:11.000000000 -0700 ++++ Makefile 2010-06-20 21:56:15.000000000 -0700 +@@ -236,6 +236,18 @@ + + clean: clobber +# Add location of iconv headers & libs +ifeq ($(PLATFORM), bsd) @@ -17,10 +17,10 @@ +endif + # - # Generic debug build, fastdebug or debug. Needs special handling. - # Note that debug builds do NOT do INSTALL steps, but must be done ---- corba/make/common/Defs-bsd.gmk 2010-04-17 21:43:54.000000000 +0400 -+++ corba/make/common/Defs-bsd.gmk 2010-04-17 21:48:07.000000000 +0400 + # Dev builds + # +--- corba/make/common/Defs-bsd.gmk 2010-06-27 11:37:43.000000000 -0700 ++++ corba/make/common/Defs-bsd.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -40,18 +40,12 @@ # Get shared JDK settings include $(BUILDDIR)/common/shared/Defs.gmk @@ -142,8 +142,8 @@ override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = override THREADS_FLAG = native ---- corba/make/common/Defs-linux.gmk 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/common/Defs-linux.gmk 2010-04-17 21:48:07.000000000 +0400 +--- corba/make/common/Defs-linux.gmk 2010-06-21 14:11:20.000000000 -0700 ++++ corba/make/common/Defs-linux.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -290,7 +290,7 @@ override LIBTHREAD = override MOOT_PRIORITIES = true @@ -153,8 +153,8 @@ ifeq ($(ARCH), amd64) override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 else ---- corba/make/common/Defs.gmk 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/common/Defs.gmk 2010-04-17 21:48:07.000000000 +0400 +--- corba/make/common/Defs.gmk 2010-06-21 14:11:20.000000000 -0700 ++++ corba/make/common/Defs.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -53,6 +53,24 @@ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) @@ -190,8 +190,8 @@ endif # PROGRAM LDLIBS_COMMON += $(EXTRA_LIBS) ---- corba/make/common/Mapfile-vers.gmk 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/common/Mapfile-vers.gmk 2010-04-17 21:48:07.000000000 +0400 +--- corba/make/common/Mapfile-vers.gmk 2010-06-21 14:11:20.000000000 -0700 ++++ corba/make/common/Mapfile-vers.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -77,7 +77,7 @@ endif # PLATFORM @@ -201,8 +201,8 @@ ifeq ($(VARIANT), OPT) # OPT build MUST have a mapfile? ---- corba/make/common/shared/Compiler-gcc.gmk 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/common/shared/Compiler-gcc.gmk 2010-04-17 21:48:07.000000000 +0400 +--- corba/make/common/shared/Compiler-gcc.gmk 2010-06-21 14:11:20.000000000 -0700 ++++ corba/make/common/shared/Compiler-gcc.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -100,6 +100,24 @@ endif @@ -228,8 +228,8 @@ ifeq ($(PLATFORM), solaris) # Settings specific to Solaris ---- corba/make/common/shared/Compiler.gmk 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/common/shared/Compiler.gmk 2010-04-17 21:48:07.000000000 +0400 +--- corba/make/common/shared/Compiler.gmk 2010-06-21 14:11:20.000000000 -0700 ++++ corba/make/common/shared/Compiler.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -42,6 +42,11 @@ override CC_VERSION = gcc endif @@ -242,8 +242,8 @@ # Get the compiler specific settings include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk ---- corba/make/common/shared/Defs-bsd.gmk 2010-04-17 21:43:54.000000000 +0400 -+++ corba/make/common/shared/Defs-bsd.gmk 2010-04-17 21:48:07.000000000 +0400 +--- corba/make/common/shared/Defs-bsd.gmk 2010-06-27 11:37:43.000000000 -0700 ++++ corba/make/common/shared/Defs-bsd.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -54,7 +54,7 @@ endef @@ -262,8 +262,8 @@ endif # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK. ---- corba/make/common/shared/Defs-java.gmk 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/common/shared/Defs-java.gmk 2010-04-17 21:48:07.000000000 +0400 +--- corba/make/common/shared/Defs-java.gmk 2010-06-21 14:11:20.000000000 -0700 ++++ corba/make/common/shared/Defs-java.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -38,7 +38,7 @@ # Suspect this may not be needed anymore. JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline @@ -273,8 +273,8 @@ endif # ---- corba/make/common/shared/Defs-utils.gmk 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/common/shared/Defs-utils.gmk 2010-04-17 21:48:07.000000000 +0400 +--- corba/make/common/shared/Defs-utils.gmk 2010-06-21 14:11:20.000000000 -0700 ++++ corba/make/common/shared/Defs-utils.gmk 2010-06-20 21:56:15.000000000 -0700 @@ -53,6 +53,13 @@ UTILS_DEVTOOL_PATH=$(USRBIN_PATH) endif @@ -322,9 +322,9 @@ + TAR = $(UTILS_USR_BIN_PATH)tar + endif +endif ---- corba/make/common/shared/Platform.gmk 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/common/shared/Platform.gmk 2010-04-17 21:48:07.000000000 +0400 -@@ -265,6 +265,76 @@ +--- corba/make/common/shared/Platform.gmk 2010-06-21 14:11:20.000000000 -0700 ++++ corba/make/common/shared/Platform.gmk 2010-06-20 21:56:15.000000000 -0700 +@@ -261,6 +261,76 @@ MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) endif @@ -401,7 +401,7 @@ # Windows with and without CYGWIN will be slightly different ifeq ($(SYSTEM_UNAME), Windows_NT) PLATFORM = windows -@@ -376,7 +446,14 @@ +@@ -375,7 +445,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 +417,7 @@ ifneq ($(MB_OF_MEMORY),) LOW_MEMORY_MACHINE := $(shell \ if [ $(MB_OF_MEMORY) -le 512 ] ; then \ -@@ -388,7 +465,7 @@ +@@ -387,7 +464,7 @@ if [ $(MB_OF_MEMORY) -le 1024 ] ; then \ expr $(MB_OF_MEMORY) '-' 128 ; \ else \ @@ -426,30 +426,8 @@ fi) MIN_VM_MEMORY := $(shell \ if [ $(MAX_VM_MEMORY) -le 128 ] ; then \ ---- corba/make/sun/corba/core/Makefile 2010-04-15 11:30:23.000000000 +0400 -+++ corba/make/sun/corba/core/Makefile 2010-04-17 21:48:07.000000000 +0400 -@@ -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 -+ifeq ($(PLATFORM), bsd) -+OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(OS_NAME) -+else - OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(PLATFORM) -+endif - else - OTHER_LDLIBS=$(JVMLIB) -+ifeq ($(PLATFORM), bsd) -+OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(OS_NAME) -+else - OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(PLATFORM) - endif -+endif - - - FILES_c = ioser.c ---- hotspot/agent/make/Makefile 2010-04-15 11:31:15.000000000 +0400 -+++ hotspot/agent/make/Makefile 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/make/Makefile 2010-06-21 14:12:09.000000000 -0700 ++++ hotspot/agent/make/Makefile 2010-06-20 21:56:15.000000000 -0700 @@ -52,6 +52,9 @@ sun.jvm.hotspot.compiler \ sun.jvm.hotspot.debugger \ @@ -490,8 +468,8 @@ sun/jvm/hotspot/runtime/ia64/*.java \ sun/jvm/hotspot/runtime/linux/*.java \ sun/jvm/hotspot/runtime/linux_amd64/*.java \ ---- hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-06-20 21:56:15.000000000 -0700 @@ -22,6 +22,7 @@ * */ @@ -625,8 +603,8 @@ #endif /* amd64 */ ---- hotspot/agent/src/os/bsd/Makefile 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/Makefile 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/Makefile 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/Makefile 2010-06-20 21:56:15.000000000 -0700 @@ -22,7 +22,7 @@ # # @@ -687,8 +665,8 @@ + rm -f test.o + -rmdir $(ARCH) ---- hotspot/agent/src/os/bsd/elfmacros.h 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/elfmacros.h 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/elfmacros.h 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/elfmacros.h 2010-06-20 21:56:15.000000000 -0700 @@ -25,16 +25,19 @@ #ifndef _ELFMACROS_H_ #define _ELFMACROS_H_ @@ -724,8 +702,8 @@ #endif ---- hotspot/agent/src/os/bsd/hsearch_r.c 1970-01-01 03:00:00.000000000 +0300 -+++ hotspot/agent/src/os/bsd/hsearch_r.c 2010-03-14 20:12:55.000000000 +0300 +--- hotspot/agent/src/os/bsd/hsearch_r.c 1969-12-31 16:00:00.000000000 -0800 ++++ hotspot/agent/src/os/bsd/hsearch_r.c 2010-06-20 21:56:15.000000000 -0700 @@ -0,0 +1,217 @@ +/* Copyright (C) 1993,1995-1997,2002,2005,2007,2008 + Free Software Foundation, Inc. @@ -944,8 +922,8 @@ + *retval = NULL; + return 0; +} ---- hotspot/agent/src/os/bsd/hsearch_r.h 1970-01-01 03:00:00.000000000 +0300 -+++ hotspot/agent/src/os/bsd/hsearch_r.h 2010-03-14 20:12:55.000000000 +0300 +--- hotspot/agent/src/os/bsd/hsearch_r.h 1969-12-31 16:00:00.000000000 -0800 ++++ hotspot/agent/src/os/bsd/hsearch_r.h 2010-06-20 21:56:15.000000000 -0700 @@ -0,0 +1,42 @@ +/* Declarations for System V style searching functions. + Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. @@ -989,8 +967,8 @@ +extern void hdestroy_r (struct hsearch_data *__htab); + +#endif /* _HSEARCH_R_H_ */ ---- hotspot/agent/src/os/bsd/libproc.h 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/libproc.h 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/libproc.h 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/libproc.h 2010-06-20 21:56:15.000000000 -0700 @@ -27,7 +27,8 @@ #include @@ -1049,8 +1027,8 @@ // get number of shared objects int get_num_libs(struct ps_prochandle* ph); ---- hotspot/agent/src/os/bsd/libproc_impl.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/libproc_impl.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/libproc_impl.c 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/libproc_impl.c 2010-06-20 21:56:15.000000000 -0700 @@ -177,8 +177,11 @@ newlib->symtab = build_symtab(newlib->fd); if (newlib->symtab == NULL) { @@ -1140,8 +1118,8 @@ return PS_OK; } + ---- hotspot/agent/src/os/bsd/libproc_impl.h 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/libproc_impl.h 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/libproc_impl.h 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/libproc_impl.h 2010-06-20 21:56:15.000000000 -0700 @@ -47,7 +47,7 @@ typedef struct thread_info { lwpid_t lwp_id; @@ -1162,8 +1140,8 @@ } ps_prochandle_ops; // the ps_prochandle ---- hotspot/agent/src/os/bsd/mapfile 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/mapfile 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/mapfile 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/mapfile 2010-06-20 21:56:15.000000000 -0700 @@ -41,15 +41,21 @@ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0; @@ -1190,8 +1168,8 @@ # used by attach test program init_libproc; ---- hotspot/agent/src/os/bsd/proc_service.h 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/proc_service.h 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/proc_service.h 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/proc_service.h 2010-06-20 21:56:15.000000000 -0700 @@ -22,6 +22,8 @@ * */ @@ -1215,8 +1193,8 @@ const void *buf, size_t size); ps_err_e ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lid, const prfpregset_t *fpregs); ---- hotspot/agent/src/os/bsd/ps_core.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/ps_core.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/ps_core.c 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/ps_core.c 2010-06-20 21:56:15.000000000 -0700 @@ -142,6 +142,7 @@ map->next = ph->core->class_share_maps; @@ -1440,8 +1418,8 @@ struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle)); if (ph == NULL) { ---- hotspot/agent/src/os/bsd/ps_proc.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/ps_proc.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/ps_proc.c 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/ps_proc.c 2010-06-20 21:56:15.000000000 -0700 @@ -22,20 +22,22 @@ * */ @@ -1931,8 +1909,8 @@ - } return ph; } ---- hotspot/agent/src/os/bsd/salibelf.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/salibelf.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/salibelf.c 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/salibelf.c 2010-06-20 21:56:15.000000000 -0700 @@ -25,6 +25,7 @@ #include "salibelf.h" #include @@ -1941,8 +1919,8 @@ extern void print_debug(const char*,...); ---- hotspot/agent/src/os/bsd/symtab.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/symtab.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/symtab.c 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/symtab.c 2010-06-20 21:56:15.000000000 -0700 @@ -23,13 +23,14 @@ */ @@ -2037,8 +2015,8 @@ goto quit; } // the symbol table ---- hotspot/agent/src/os/bsd/test.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/agent/src/os/bsd/test.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/os/bsd/test.c 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/os/bsd/test.c 2010-06-20 21:56:15.000000000 -0700 @@ -44,7 +44,7 @@ } @@ -2048,8 +2026,8 @@ return 1; } } ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-06-20 21:56:15.000000000 -0700 @@ -30,10 +30,8 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -2075,8 +2053,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-06-27 11:37:43.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-06-20 21:56:15.000000000 -0700 @@ -26,9 +26,7 @@ import sun.jvm.hotspot.debugger.*; @@ -2098,8 +2076,190 @@ } else { throw new RuntimeException("cpu " + cpu + " is not yet supported"); } ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-04-15 11:31:18.000000000 +0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 1969-12-31 16:00:00.000000000 -0800 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-06-20 21:56:06.000000000 -0700 +@@ -0,0 +1,46 @@ ++/* ++ * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++package sun.jvm.hotspot.debugger.bsd.ia64; ++ ++import sun.jvm.hotspot.debugger.*; ++import sun.jvm.hotspot.debugger.ia64.*; ++import sun.jvm.hotspot.debugger.bsd.*; ++ ++public class BsdIA64ThreadContext extends IA64ThreadContext { ++ private BsdDebugger debugger; ++ ++ public BsdIA64ThreadContext(BsdDebugger debugger) { ++ super(); ++ this.debugger = debugger; ++ } ++ ++ public void setRegisterAsAddress(int index, Address value) { ++ setRegister(index, debugger.getAddressValue(value)); ++ } ++ ++ public Address getRegisterAsAddress(int index) { ++ return debugger.newAddress(getRegister(index)); ++ } ++} +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 1969-12-31 16:00:00.000000000 -0800 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-06-20 21:56:06.000000000 -0700 +@@ -0,0 +1,81 @@ ++/* ++ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++package sun.jvm.hotspot.debugger.bsd.sparc; ++ ++import sun.jvm.hotspot.debugger.*; ++import sun.jvm.hotspot.debugger.sparc.*; ++import sun.jvm.hotspot.debugger.bsd.*; ++import sun.jvm.hotspot.debugger.cdbg.*; ++import sun.jvm.hotspot.debugger.cdbg.basic.*; ++ ++final public class BsdSPARCCFrame extends BasicCFrame { ++ // package/class internals only ++ ++ public BsdSPARCCFrame(BsdDebugger dbg, Address sp, Address pc, int address_size) { ++ super(dbg.getCDebugger()); ++ this.sp = sp; ++ this.pc = pc; ++ this.dbg = dbg; ++ this.address_size=address_size; ++ if (address_size==8) SPARC_STACK_BIAS = 0x7ff; ++ else SPARC_STACK_BIAS = 0x0; ++ } ++ ++ // override base class impl to avoid ELF parsing ++ public ClosestSymbol closestSymbolToPC() { ++ // try native lookup in debugger. ++ return dbg.lookup(dbg.getAddressValue(pc())); ++ } ++ ++ public Address pc() { ++ return pc; ++ } ++ ++ public Address localVariableBase() { ++ return sp; ++ } ++ ++ public CFrame sender() { ++ if (sp == null) { ++ return null; ++ } ++ ++ Address nextSP = sp.getAddressAt( SPARCThreadContext.R_SP * address_size + SPARC_STACK_BIAS); ++ if (nextSP == null) { ++ return null; ++ } ++ Address nextPC = sp.getAddressAt(SPARCThreadContext.R_O7 * address_size + SPARC_STACK_BIAS); ++ if (nextPC == null) { ++ return null; ++ } ++ return new BsdSPARCCFrame(dbg, nextSP, nextPC,address_size); ++ } ++ ++ public static int SPARC_STACK_BIAS; ++ private static int address_size; ++ private Address pc; ++ private Address sp; ++ private BsdDebugger dbg; ++} +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 1969-12-31 16:00:00.000000000 -0800 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-06-20 21:56:06.000000000 -0700 +@@ -0,0 +1,46 @@ ++/* ++ * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++package sun.jvm.hotspot.debugger.bsd.sparc; ++ ++import sun.jvm.hotspot.debugger.*; ++import sun.jvm.hotspot.debugger.sparc.*; ++import sun.jvm.hotspot.debugger.bsd.*; ++ ++public class BsdSPARCThreadContext extends SPARCThreadContext { ++ private BsdDebugger debugger; ++ ++ public BsdSPARCThreadContext(BsdDebugger debugger) { ++ super(); ++ this.debugger = debugger; ++ } ++ ++ public void setRegisterAsAddress(int index, Address value) { ++ setRegister(index, debugger.getAddressValue(value)); ++ } ++ ++ public Address getRegisterAsAddress(int index) { ++ return debugger.newAddress(getRegister(index)); ++ } ++} +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-06-21 14:12:12.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-06-20 21:56:15.000000000 -0700 @@ -37,6 +37,8 @@ import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess; import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess; @@ -2123,8 +2283,8 @@ } if (access == null) { ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-06-27 11:37:43.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-06-20 21:56:15.000000000 -0700 @@ -28,37 +28,36 @@ private static String[] signalNames = { "", /* No signal 0 */ @@ -2185,8 +2345,8 @@ }; public static String getSignalName(int sigNum) { ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-06-27 11:37:43.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-06-20 21:56:15.000000000 -0700 @@ -32,33 +32,32 @@ "SIGQUIT", /* quit (ASCII FS) */ "SIGILL", /* illegal instruction (not reset when caught) */ @@ -2240,8 +2400,8 @@ }; public static String getSignalName(int sigNum) { ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-04-15 11:31:19.000000000 +0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-06-21 14:12:13.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-06-20 21:56:15.000000000 -0700 @@ -37,6 +37,14 @@ return "solaris"; } else if (os.equals("Linux")) { @@ -2257,8 +2417,8 @@ } else if (os.startsWith("Windows")) { return "win32"; } else { ---- hotspot/make/Makefile 2010-04-15 11:31:19.000000000 +0400 -+++ hotspot/make/Makefile 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/Makefile 2010-06-21 14:12:13.000000000 -0700 ++++ hotspot/make/Makefile 2010-06-26 22:18:02.000000000 -0700 @@ -290,11 +290,32 @@ # Shared Library ifneq ($(OSNAME),windows) @@ -2300,8 +2460,8 @@ endif endif ---- hotspot/make/bsd/Makefile 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/Makefile 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/bsd/Makefile 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/Makefile 2010-06-20 21:56:15.000000000 -0700 @@ -220,7 +220,10 @@ # Solaris 2.5.1, 2.6). # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. @@ -2314,8 +2474,8 @@ OS_VERSION := $(shell uname -r) EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) ---- hotspot/make/bsd/makefiles/buildtree.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/buildtree.make 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/bsd/makefiles/buildtree.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/buildtree.make 2010-06-20 21:56:15.000000000 -0700 @@ -287,10 +287,11 @@ [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \ { \ @@ -2329,8 +2489,8 @@ ) > $@ env.csh: env.sh ---- hotspot/make/bsd/makefiles/cscope.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/cscope.make 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/bsd/makefiles/cscope.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/cscope.make 2010-06-20 21:56:15.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. @@ -2340,24 +2500,9 @@ CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS})) endif ---- hotspot/make/bsd/makefiles/defs.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/defs.make 2010-04-17 21:48:07.000000000 +0400 -@@ -28,6 +28,14 @@ - - SLASH_JAVA ?= /java - -+# Library suffix -+OS_VENDOR:=$(shell uname -s) -+ifeq ($(OS_VENDOR),Darwin) -+ LIBRARY_SUFFIX=dylib -+else -+ LIBRARY_SUFFIX=so -+endif -+ - # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name - ARCH:=$(shell uname -m) - PATH_SEP = : -@@ -90,6 +98,31 @@ +--- hotspot/make/bsd/makefiles/defs.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/defs.make 2010-06-22 07:49:14.000000000 -0700 +@@ -90,6 +90,31 @@ endif endif @@ -2389,37 +2534,36 @@ # i686 ifeq ($(ARCH), i686) ARCH_DATA_MODEL = 32 -@@ -106,21 +139,17 @@ +@@ -106,22 +131,22 @@ EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html + + # client and server subdirectories have symbolic links to ../libjsig.so +-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so ++EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) + EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt --EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so -+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.$(LIBRARY_SUFFIX) +EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) ifneq ($(ZERO_BUILD), true) ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt -- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so -+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.$(LIBRARY_SUFFIX) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar -- else -- ifeq ($(ARCH),ia64) -- else + else + ifeq ($(ARCH),ia64) + else - EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so -- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar -- endif ++ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) + EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar + endif endif -+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) -+ EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar - endif ---- hotspot/make/bsd/makefiles/gcc.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/gcc.make 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/bsd/makefiles/gcc.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/gcc.make 2010-06-20 21:56:15.000000000 -0700 @@ -22,12 +22,15 @@ # # @@ -2530,34 +2674,33 @@ #------------------------------------------------------------------------ # Debug flags ---- hotspot/make/bsd/makefiles/jsig.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/jsig.make 2010-04-17 21:48:07.000000000 +0400 -@@ -26,7 +26,12 @@ +--- hotspot/make/bsd/makefiles/jsig.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/jsig.make 2010-06-22 05:33:30.000000000 -0700 +@@ -26,10 +26,10 @@ # libjsig[_g].so: signal interposition library - JSIG = jsig$(G_SUFFIX) + JSIG = jsig -LIBJSIG = lib$(JSIG).so -+ -+ifeq ($(OS_VENDOR), Darwin) -+ LIBJSIG = lib$(JSIG).dylib -+else -+ LIBJSIG = lib$(JSIG).so -+endif ++LIBJSIG = lib$(JSIG).$(LIBRARY_SUFFIX) + + JSIG_G = $(JSIG)$(G_SUFFIX) +-LIBJSIG_G = lib$(JSIG_G).so ++LIBJSIG_G = lib$(JSIG_G).$(LIBRARY_SUFFIX) JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm -@@ -54,7 +59,7 @@ +@@ -57,7 +57,7 @@ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) @echo Making signal interposition lib... $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ - $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl + $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< + $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } install_jsig: $(LIBJSIG) - @echo "Copying $(LIBJSIG) to $(DEST_JSIG)" ---- hotspot/make/bsd/makefiles/launcher.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/launcher.make 2010-04-17 21:48:07.000000000 +0400 -@@ -44,7 +44,7 @@ +--- hotspot/make/bsd/makefiles/launcher.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/launcher.make 2010-06-20 21:56:15.000000000 -0700 +@@ -46,7 +46,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else LAUNCHER.o = launcher.o @@ -2566,8 +2709,8 @@ LIBS_LAUNCHER += -l$(JVM) $(LIBS) endif ---- hotspot/make/bsd/makefiles/sa.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/sa.make 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/bsd/makefiles/sa.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/sa.make 2010-06-20 21:56:15.000000000 -0700 @@ -42,8 +42,8 @@ # gnumake 3.78.1 does not accept the *s that @@ -2579,23 +2722,22 @@ SA_CLASSDIR = $(GENERATED)/saclasses ---- hotspot/make/bsd/makefiles/saproc.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/saproc.make 2010-04-17 21:48:07.000000000 +0400 -@@ -26,7 +26,12 @@ - +--- hotspot/make/bsd/makefiles/saproc.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/saproc.make 2010-06-20 22:47:34.000000000 -0700 +@@ -27,10 +27,10 @@ # libsaproc[_g].so: serviceability agent - SAPROC = saproc$(G_SUFFIX) + + SAPROC = saproc -LIBSAPROC = lib$(SAPROC).so -+ -+ifeq ($(OS_VENDOR), Darwin) -+ LIBSAPROC = lib$(SAPROC).dylib -+else -+ LIBSAPROC = lib$(SAPROC).so -+endif ++LIBSAPROC = lib$(SAPROC).$(LIBRARY_SUFFIX) + + SAPROC_G = $(SAPROC)$(G_SUFFIX) +-LIBSAPROC_G = lib$(SAPROC_G).so ++LIBSAPROC_G = lib$(SAPROC_G).$(LIBRARY_SUFFIX) AGENT_DIR = $(GAMMADIR)/agent -@@ -37,6 +42,7 @@ +@@ -41,6 +41,7 @@ $(SASRCDIR)/libproc_impl.c \ $(SASRCDIR)/ps_proc.c \ $(SASRCDIR)/ps_core.c \ @@ -2603,7 +2745,7 @@ $(SASRCDIR)/BsdDebuggerLocal.c SAMAPFILE = $(SASRCDIR)/mapfile -@@ -58,6 +64,25 @@ +@@ -62,6 +63,25 @@ SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) @@ -2629,7 +2771,7 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ -@@ -66,14 +91,15 @@ +@@ -70,14 +90,15 @@ @echo Making SA debugger back-end... $(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \ $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ @@ -2643,12 +2785,12 @@ $(SA_LFLAGS) \ $(SA_DEBUG_CFLAGS) \ -o $@ \ -+ $(LIBUTIL) ++ $(LIBUTIL) \ -lthread_db + $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } - install_saproc: checkAndBuildSA ---- hotspot/make/bsd/makefiles/vm.make 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/makefiles/vm.make 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/bsd/makefiles/vm.make 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/makefiles/vm.make 2010-06-20 22:51:02.000000000 -0700 @@ -99,7 +99,7 @@ # Extra flags from gnumake's invocation or environment CFLAGS += $(EXTRA_CFLAGS) @@ -2658,20 +2800,18 @@ # By default, link the *.o into the library, not the executable. LINK_INTO$(LINK_INTO) = LIBJVM -@@ -114,7 +114,11 @@ +@@ -114,8 +114,8 @@ # JVM - JVM = jvm$(G_SUFFIX) --LIBJVM = lib$(JVM).so -+ifeq ($(OS_VENDOR), Darwin) -+ LIBJVM = lib$(JVM).dylib -+else -+ LIBJVM = lib$(JVM).so -+endif + JVM = jvm +-LIBJVM = lib$(JVM).so +-LIBJVM_G = lib$(JVM)$(G_SUFFIX).so ++LIBJVM = lib$(JVM).$(LIBRARY_SUFFIX) ++LIBJVM_G = lib$(JVM)$(G_SUFFIX).$(LIBRARY_SUFFIX) JVM_OBJ_FILES = $(Obj_Files) -@@ -128,11 +132,8 @@ +@@ -129,11 +129,8 @@ rm -f $@ cat $^ > $@ @@ -2685,7 +2825,7 @@ ifeq ($(LINK_INTO),AOUT) LIBJVM.o = -@@ -188,11 +189,6 @@ +@@ -189,11 +186,6 @@ LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT) endif @@ -2697,8 +2837,8 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) $(QUIETLY) { \ echo Linking vm...; \ ---- hotspot/make/bsd/platform_amd64 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/platform_amd64 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/bsd/platform_amd64 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/platform_amd64 2010-06-20 21:56:15.000000000 -0700 @@ -12,4 +12,6 @@ compiler = gcc @@ -2707,8 +2847,8 @@ +gnu_dis_arch = amd64 + +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64 ---- hotspot/make/bsd/platform_i486 2010-04-17 21:43:54.000000000 +0400 -+++ hotspot/make/bsd/platform_i486 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/make/bsd/platform_i486 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/make/bsd/platform_i486 2010-06-20 21:56:15.000000000 -0700 @@ -12,4 +12,6 @@ compiler = gcc @@ -2717,17 +2857,19 @@ +gnu_dis_arch = i386 + +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32 ---- hotspot/make/defs.make 2010-04-15 11:31:19.000000000 +0400 -+++ hotspot/make/defs.make 2010-04-17 21:48:07.000000000 +0400 -@@ -119,13 +119,23 @@ +--- hotspot/make/defs.make 2010-06-21 14:12:13.000000000 -0700 ++++ hotspot/make/defs.make 2010-06-26 22:22:26.000000000 -0700 +@@ -119,18 +119,33 @@ # Windows should have OS predefined ifeq ($(OS),) OS := $(shell uname -s) + ifneq ($(findstring BSD,$(OS)),) + OS=bsd ++ LIBRARY_SUFFIX=so + endif + ifeq ($(OS), Darwin) + OS=bsd ++ LIBRARY_SUFFIX=dylib + endif HOST := $(shell uname -n) endif @@ -2739,14 +2881,30 @@ - OSNAME=windows + ifneq ($(OS), bsd) + OSNAME=windows ++ LIBRARY_SUFFIX=dll + else + OSNAME=bsd + endif else OSNAME=solaris ++ LIBRARY_SUFFIX=so endif ---- hotspot/make/sa.files 2010-04-15 11:31:19.000000000 +0400 -+++ hotspot/make/sa.files 2010-04-17 21:48:07.000000000 +0400 + else + OSNAME=linux ++ LIBRARY_SUFFIX=so + endif + + # Determinations of default make arguments and platform specific settings +@@ -235,6 +250,7 @@ + MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) + MAKE_ARGS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) + MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) ++MAKE_ARGS += LIBRARY_SUFFIX=$(LIBRARY_SUFFIX) + + # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile + # to overwrite the default definition since OS specific Makefile also +--- hotspot/make/sa.files 2010-06-21 14:12:13.000000000 -0700 ++++ hotspot/make/sa.files 2010-06-20 21:56:15.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 \ @@ -2767,8 +2925,8 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \ ---- hotspot/src/cpu/x86/vm/jni_x86.h 2010-04-15 11:31:20.000000000 +0400 -+++ hotspot/src/cpu/x86/vm/jni_x86.h 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/cpu/x86/vm/jni_x86.h 2010-06-21 14:12:14.000000000 -0700 ++++ hotspot/src/cpu/x86/vm/jni_x86.h 2010-06-20 21:56:15.000000000 -0700 @@ -26,7 +26,7 @@ #ifndef _JAVASOFT_JNI_MD_H_ #define _JAVASOFT_JNI_MD_H_ @@ -2778,8 +2936,8 @@ #define JNIEXPORT #define JNIIMPORT #define JNICALL ---- hotspot/src/os/bsd/launcher/java_md.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/launcher/java_md.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/launcher/java_md.c 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/launcher/java_md.c 2010-06-20 21:56:15.000000000 -0700 @@ -45,8 +45,15 @@ #include "version_comp.h" #endif @@ -2890,8 +3048,8 @@ result = bsd_i586_ServerClassMachine(); #else if (_launcher_debug) { ---- hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-06-20 21:56:15.000000000 -0700 @@ -179,32 +179,20 @@ struct sockaddr_un addr; addr.sun_family = AF_UNIX; @@ -2985,8 +3143,8 @@ if (ret == 0) { // simple check to avoid starting the attach mechanism when // a bogus user creates the file ---- hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-06-20 21:56:15.000000000 -0700 @@ -28,6 +28,14 @@ # include # include @@ -3016,8 +3174,8 @@ #endif *(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */ ---- hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-06-20 21:56:15.000000000 -0700 @@ -36,7 +36,7 @@ // HPI_FileInterface @@ -3068,8 +3226,8 @@ } ---- hotspot/src/os/bsd/vm/jsig.c 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/jsig.c 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/jsig.c 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/jsig.c 2010-06-20 21:56:15.000000000 -0700 @@ -143,7 +143,8 @@ } @@ -3080,8 +3238,8 @@ } static int call_os_sigaction(int sig, const struct sigaction *act, ---- hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-06-20 21:56:15.000000000 -0700 @@ -138,44 +138,37 @@ struct siglabel siglabels[] = { @@ -3138,8 +3296,8 @@ }; JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name)) ---- hotspot/src/os/bsd/vm/jvm_bsd.h 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/jvm_bsd.h 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/jvm_bsd.h 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/jvm_bsd.h 2010-06-20 21:56:15.000000000 -0700 @@ -51,7 +51,11 @@ #define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"} @@ -3173,8 +3331,8 @@ #endif /* JVM_MD_H */ // Reconciliation History ---- hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-06-20 21:56:15.000000000 -0700 @@ -28,8 +28,8 @@ void OSThread::pd_initialize() { @@ -3186,8 +3344,8 @@ _siginfo = NULL; _ucontext = NULL; _expanding_stack = 0; ---- hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-06-20 21:56:15.000000000 -0700 @@ -36,6 +36,12 @@ private: @@ -3267,8 +3425,8 @@ // *************************************************************** // Platform dependent initialization and cleanup // *************************************************************** ---- hotspot/src/os/bsd/vm/os_bsd.cpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/os_bsd.cpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.cpp 2010-06-20 22:51:50.000000000 -0700 @@ -42,17 +42,39 @@ # include # include @@ -3431,27 +3589,29 @@ +} +#else void os::Bsd::initialize_system_info() { - _processor_count = sysconf(_SC_NPROCESSORS_CONF); - if (_processor_count == 1) { + set_processor_count(sysconf(_SC_NPROCESSORS_CONF)); + if (processor_count() == 1) { @@ -238,6 +312,7 @@ _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE); - assert(_processor_count > 0, "bsd error"); + assert(processor_count() > 0, "bsd error"); } +#endif void os::init_system_properties_values() { // char arch[12]; -@@ -281,9 +356,7 @@ +@@ -281,10 +356,8 @@ * ... * 7: The default directories, normally /lib and /usr/lib. */ -#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390)) -#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" -#else +-#define DEFAULT_LIBPATH "/lib:/usr/lib" +#ifndef DEFAULT_LIBPATH - #define DEFAULT_LIBPATH "/lib:/usr/lib" ++#define DEFAULT_LIBPATH "/lib:/usr/lib" #endif + #define EXTENSIONS_DIR "/lib/ext" @@ -362,7 +435,11 @@ * should always exist (until the legacy problem cited above is * addressed). @@ -4565,7 +4725,7 @@ status, "cond_timedwait"); #ifdef ASSERT -@@ -4794,14 +5199,12 @@ +@@ -4795,14 +5200,12 @@ } @@ -4585,7 +4745,7 @@ #endif // Run the specified command in a separate process. Return its exit value, -@@ -4816,8 +5219,7 @@ +@@ -4817,8 +5220,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... @@ -4595,7 +4755,7 @@ if (pid < 0) { // fork failed -@@ -4833,8 +5235,7 @@ +@@ -4834,8 +5236,7 @@ // in the new process, so make a system call directly. // IA64 should use normal execve() from glibc to match the glibc fork() // above. @@ -4605,8 +4765,8 @@ // execve failed _exit(-1); ---- hotspot/src/os/bsd/vm/os_bsd.hpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/os_bsd.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/os_bsd.hpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.hpp 2010-06-20 21:56:15.000000000 -0700 @@ -27,6 +27,12 @@ /* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */ typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *); @@ -4743,8 +4903,8 @@ // Stack repair handling ---- hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-06-27 11:37:41.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-06-20 21:56:15.000000000 -0700 @@ -61,7 +61,15 @@ inline bool os::allocate_stack_guard_pages() { @@ -4869,10 +5029,10 @@ // macros for restartable system calls #define RESTARTABLE(_cmd, _result) do { \ ---- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-06-20 21:56:15.000000000 -0700 @@ -21,6 +21,22 @@ - # have any questions. + # questions. # + @@ -5077,8 +5237,8 @@ # 8(%esp) : return PC pushl %ebx # 4(%esp) : old %ebx pushl %edi # 0(%esp) : old %edi ---- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-06-20 21:56:15.000000000 -0700 @@ -22,48 +22,70 @@ # @@ -5227,8 +5387,8 @@ cmpq %rdi,%rsi leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8 jbe acl_CopyRight ---- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-06-20 21:56:15.000000000 -0700 @@ -22,7 +22,29 @@ * */ @@ -5259,8 +5419,8 @@ // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. ---- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-06-20 21:56:15.000000000 -0700 @@ -44,23 +44,158 @@ # include # include @@ -5751,8 +5911,8 @@ #endif // AMD64 st->cr(); st->cr(); ---- hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-06-20 21:56:15.000000000 -0700 @@ -27,8 +27,10 @@ #ifndef AMD64 // map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp @@ -5764,8 +5924,8 @@ static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)]; #endif // !AMD64 ---- hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-04-17 21:43:53.000000000 +0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-06-27 11:37:42.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-06-20 21:56:15.000000000 -0700 @@ -31,7 +31,7 @@ /******************************/ \ /* Threads (NOTE: incomplete) */ \ @@ -5775,8 +5935,8 @@ nonstatic_field(OSThread, _pthread_id, pthread_t) \ /* This must be the last entry, and must be present */ \ last_entry() ---- hotspot/src/share/vm/adlc/adlc.hpp 2010-04-15 11:31:23.000000000 +0400 -+++ hotspot/src/share/vm/adlc/adlc.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/adlc/adlc.hpp 2010-06-21 14:12:17.000000000 -0700 ++++ hotspot/src/share/vm/adlc/adlc.hpp 2010-06-20 21:56:15.000000000 -0700 @@ -69,9 +69,9 @@ #endif #endif // _WIN32 @@ -5789,8 +5949,8 @@ // Macros #define uint32 unsigned int ---- hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2010-04-15 11:31:24.000000000 +0400 -+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2010-06-21 14:12:18.000000000 -0700 ++++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew 2010-06-20 21:56:16.000000000 -0700 @@ -32,6 +32,8 @@ asParNewGeneration.cpp markOop.inline.hpp asParNewGeneration.cpp markSweep.inline.hpp @@ -5800,9 +5960,9 @@ asParNewGeneration.cpp parNewGeneration.hpp asParNewGeneration.cpp referencePolicy.hpp asParNewGeneration.cpp spaceDecorator.hpp ---- hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2010-04-15 11:31:25.000000000 +0400 -+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2010-04-17 21:48:07.000000000 +0400 -@@ -308,6 +308,8 @@ +--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2010-06-21 14:12:18.000000000 -0700 ++++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge 2010-06-20 21:56:16.000000000 -0700 +@@ -314,6 +314,8 @@ psPermGen.cpp psMarkSweepDecorator.hpp psPermGen.cpp psParallelCompact.hpp psPermGen.cpp psPermGen.hpp @@ -5811,8 +5971,8 @@ psPermGen.hpp psOldGen.hpp ---- hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-04-15 11:31:25.000000000 +0400 -+++ hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-06-21 14:12:19.000000000 -0700 ++++ hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-06-20 21:56:16.000000000 -0700 @@ -77,7 +77,7 @@ // the incoming method. We could lose a line of trace output. // This is acceptable in a debug-only feature. @@ -5831,8 +5991,8 @@ if (Verbose) { st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s", BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code)); ---- hotspot/src/share/vm/prims/forte.cpp 2010-04-15 11:31:26.000000000 +0400 -+++ hotspot/src/share/vm/prims/forte.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/prims/forte.cpp 2010-06-21 14:12:20.000000000 -0700 ++++ hotspot/src/share/vm/prims/forte.cpp 2010-06-20 21:56:16.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 @@ -5853,9 +6013,9 @@ #endif // !_WINDOWS } // end extern "C" ---- hotspot/src/share/vm/runtime/globals.hpp 2010-04-15 11:31:27.000000000 +0400 -+++ hotspot/src/share/vm/runtime/globals.hpp 2010-04-17 21:48:07.000000000 +0400 -@@ -323,7 +323,7 @@ +--- hotspot/src/share/vm/runtime/globals.hpp 2010-06-21 14:12:20.000000000 -0700 ++++ hotspot/src/share/vm/runtime/globals.hpp 2010-06-20 21:56:16.000000000 -0700 +@@ -324,7 +324,7 @@ /* UseMembar is theoretically a temp flag used for memory barrier \ * removal testing. It was supposed to be removed before FCS but has \ * been re-added (see 6401008) */ \ @@ -5864,8 +6024,8 @@ "(Unstable) Issues membars on thread state transitions") \ \ diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug, \ ---- hotspot/src/share/vm/runtime/os.cpp 2010-04-15 11:31:27.000000000 +0400 -+++ hotspot/src/share/vm/runtime/os.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/runtime/os.cpp 2010-06-21 14:12:21.000000000 -0700 ++++ hotspot/src/share/vm/runtime/os.cpp 2010-06-20 21:56:16.000000000 -0700 @@ -79,7 +79,12 @@ assert(false, "Failed localtime_pd"); return NULL; @@ -5879,8 +6039,8 @@ // If daylight savings time is in effect, // we are 1 hour East of our time zone ---- hotspot/src/share/vm/runtime/vm_version.cpp 2010-04-15 11:31:27.000000000 +0400 -+++ hotspot/src/share/vm/runtime/vm_version.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/runtime/vm_version.cpp 2010-06-21 14:12:21.000000000 -0700 ++++ hotspot/src/share/vm/runtime/vm_version.cpp 2010-06-20 21:56:16.000000000 -0700 @@ -144,7 +144,8 @@ #define OS LINUX_ONLY("linux") \ @@ -5891,8 +6051,8 @@ #ifdef ZERO #define CPU ZERO_LIBARCH ---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-04-15 11:31:28.000000000 +0400 -+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-21 14:12:21.000000000 -0700 ++++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-20 21:56:16.000000000 -0700 @@ -71,12 +71,25 @@ # include # endif @@ -5959,8 +6119,8 @@ inline int g_isnan(float f) { return isnanf(f); } inline int g_isnan(double f) { return isnan(f); } #else ---- hotspot/src/share/vm/utilities/macros.hpp 2010-04-15 11:31:28.000000000 +0400 -+++ hotspot/src/share/vm/utilities/macros.hpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/utilities/macros.hpp 2010-06-21 14:12:21.000000000 -0700 ++++ hotspot/src/share/vm/utilities/macros.hpp 2010-06-20 21:56:16.000000000 -0700 @@ -156,6 +156,16 @@ #define X86_ONLY(code) #endif @@ -5978,8 +6138,8 @@ #ifdef IA32 #define IA32_ONLY(code) code #define NOT_IA32(code) ---- hotspot/src/share/vm/utilities/ostream.cpp 2010-04-15 11:31:28.000000000 +0400 -+++ hotspot/src/share/vm/utilities/ostream.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/utilities/ostream.cpp 2010-06-21 14:12:21.000000000 -0700 ++++ hotspot/src/share/vm/utilities/ostream.cpp 2010-06-20 21:56:16.000000000 -0700 @@ -827,7 +827,7 @@ #ifndef PRODUCT @@ -5989,8 +6149,8 @@ #include #include #include ---- hotspot/src/share/vm/utilities/vmError.cpp 2010-04-15 11:31:28.000000000 +0400 -+++ hotspot/src/share/vm/utilities/vmError.cpp 2010-04-17 21:48:07.000000000 +0400 +--- hotspot/src/share/vm/utilities/vmError.cpp 2010-06-21 14:12:21.000000000 -0700 ++++ hotspot/src/share/vm/utilities/vmError.cpp 2010-06-20 21:56:16.000000000 -0700 @@ -31,13 +31,18 @@ "JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH", "JAVA_COMPILER", "PATH", "USERNAME", @@ -6011,7 +6171,7 @@ // defined on Windows "OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR", -@@ -834,7 +840,7 @@ +@@ -848,7 +853,7 @@ const char* ptr = OnError; while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){ out.print_raw ("# Executing "); @@ -6020,8 +6180,8 @@ out.print_raw ("/bin/sh -c "); #elif defined(SOLARIS) out.print_raw ("/usr/bin/sh -c "); ---- jdk/make/com/sun/java/pack/Makefile 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/com/sun/java/pack/Makefile 2010-04-17 21:48:07.000000000 +0400 +--- jdk/make/com/sun/java/pack/Makefile 2010-06-21 14:15:07.000000000 -0700 ++++ jdk/make/com/sun/java/pack/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -61,6 +61,7 @@ @@ -6053,8 +6213,8 @@ OTHER_LDLIBS += $(LIBCXX) # setup the list of libraries to link in... ifeq ($(PLATFORM), linux) ---- jdk/make/com/sun/security/auth/module/Makefile 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/com/sun/security/auth/module/Makefile 2010-04-17 21:48:07.000000000 +0400 +--- jdk/make/com/sun/security/auth/module/Makefile 2010-06-21 14:15:07.000000000 -0700 ++++ jdk/make/com/sun/security/auth/module/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -70,7 +70,7 @@ include FILES_c_solaris.gmk endif # solaris @@ -6064,8 +6224,8 @@ LIBRARY = jaas_unix include FILES_export_unix.gmk include FILES_c_unix.gmk ---- jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-04-17 21:48:07.000000000 +0400 +--- jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -43,5 +43,7 @@ sun/tools/attach/LinuxVirtualMachine.java endif @@ -6076,8 +6236,8 @@ +FILES_export = \ + sun/tools/attach/BsdVirtualMachine.java +endif ---- jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -39,4 +39,7 @@ LinuxVirtualMachine.c endif @@ -6087,8 +6247,8 @@ +FILES_c = \ + BsdVirtualMachine.c +endif ---- jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -43,6 +43,11 @@ sun/tools/attach/LinuxAttachProvider.java endif @@ -6101,8 +6261,8 @@ # # Files that need to be copied # ---- jdk/make/com/sun/tools/attach/Makefile 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/com/sun/tools/attach/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/com/sun/tools/attach/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/com/sun/tools/attach/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -36,6 +36,9 @@ ifeq ($(PLATFORM), linux) FILES_m = mapfile-linux @@ -6113,8 +6273,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk # ---- jdk/make/com/sun/tools/attach/mapfile-bsd 2010-04-17 21:43:54.000000000 +0400 -+++ jdk/make/com/sun/tools/attach/mapfile-bsd 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/com/sun/tools/attach/mapfile-bsd 2010-06-27 11:37:43.000000000 -0700 ++++ jdk/make/com/sun/tools/attach/mapfile-bsd 2010-06-20 21:56:16.000000000 -0700 @@ -30,14 +30,12 @@ Java_sun_tools_attach_BsdVirtualMachine_checkPermissions; Java_sun_tools_attach_BsdVirtualMachine_close; @@ -6131,8 +6291,8 @@ local: *; }; ---- jdk/make/common/Defs-bsd.gmk 2010-04-17 21:43:54.000000000 +0400 -+++ jdk/make/common/Defs-bsd.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/Defs-bsd.gmk 2010-06-27 11:37:43.000000000 -0700 ++++ jdk/make/common/Defs-bsd.gmk 2010-06-20 22:48:15.000000000 -0700 @@ -43,12 +43,6 @@ # Get shared JDK settings include $(JDK_MAKE_SHARED_DIR)/Defs.gmk @@ -6166,16 +6326,16 @@ CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 -@@ -192,7 +190,7 @@ - CXXFLAGS_DBG += $(CC_LOWER_OPT) +@@ -201,7 +199,7 @@ + CPP_ARCH_FLAGS += -D_$(ARCH)_ endif --CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \ -+CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -D_ALLBSD_SOURCE $(VERSION_DEFINES) \ +-CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -DLINUX $(VERSION_DEFINES) \ ++CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D_ALLBSD_SOURCE $(VERSION_DEFINES) \ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT ifeq ($(ARCH_DATA_MODEL), 64) -@@ -202,33 +200,15 @@ +@@ -211,33 +209,15 @@ CPPFLAGS_OPT = CPPFLAGS_DBG = -DDEBUG @@ -6213,7 +6373,7 @@ # # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always -@@ -250,9 +230,9 @@ +@@ -259,9 +239,9 @@ ifeq ($(VARIANT), OPT) ifneq ($(NO_STRIP), true) ifneq ($(DEBUG_BINARIES), true) @@ -6225,7 +6385,7 @@ endif endif endif -@@ -262,13 +242,9 @@ +@@ -271,13 +251,9 @@ # LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker @@ -6242,7 +6402,7 @@ endif # -@@ -297,7 +273,9 @@ +@@ -306,7 +282,9 @@ override HAVE_FILIOH = false override HAVE_GETHRTIME = false override HAVE_GETHRVTIME = false @@ -6252,7 +6412,7 @@ override LEX_LIBRARY = -lfl ifeq ($(STATIC_CXX),true) override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic -@@ -308,13 +286,9 @@ +@@ -317,13 +295,9 @@ override LIBSOCKET = override LIBTHREAD = override MOOT_PRIORITIES = true @@ -6268,7 +6428,7 @@ override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = override THREADS_FLAG = native -@@ -335,6 +309,14 @@ +@@ -344,6 +318,14 @@ # DPS (Displayable PostScript) is available on Solaris machines HAVE_DPS = no @@ -6283,9 +6443,9 @@ # # Japanese manpages # ---- jdk/make/common/Defs-linux.gmk 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/common/Defs-linux.gmk 2010-04-17 21:48:08.000000000 +0400 -@@ -309,7 +309,7 @@ +--- jdk/make/common/Defs-linux.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/Defs-linux.gmk 2010-06-20 21:56:16.000000000 -0700 +@@ -318,7 +318,7 @@ override LIBTHREAD = override MOOT_PRIORITIES = true override NO_INTERRUPTIBLE_IO = true @@ -6294,8 +6454,8 @@ ifeq ($(ARCH), amd64) override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 else ---- jdk/make/common/Defs.gmk 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/common/Defs.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/Defs.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/Defs.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -188,6 +188,24 @@ _OUTPUTDIR=$(JDK_TOPDIR)/build/$(PLATFORM)-$(ARCH) endif @@ -6340,8 +6500,8 @@ endif # PROGRAM LDLIBS_COMMON += $(EXTRA_LIBS) ---- jdk/make/common/Program.gmk 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/common/Program.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/Program.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/Program.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -67,11 +67,27 @@ # Create a dependency on libjli (Java Launcher Infrastructure) # @@ -6402,8 +6562,8 @@ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' ---- jdk/make/common/Release.gmk 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/common/Release.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/Release.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/Release.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -145,14 +145,13 @@ tnameserv.1 \ unpack200.1 @@ -6454,7 +6614,7 @@ @$(java-vm-cleanup) # Create the manifest file. -@@ -980,7 +992,7 @@ +@@ -982,7 +994,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. @@ -6463,7 +6623,7 @@ for d in $(SOURCE_DIRS); do \ $(RM) $(ABS_TEMPDIR)/src-files.list; \ ($(CD) $$d && \ -@@ -993,7 +1005,7 @@ +@@ -995,7 +1007,7 @@ done ; \ ) ; \ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ @@ -6472,8 +6632,8 @@ | ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \ fi; \ done ---- jdk/make/common/internal/BinaryPlugs.gmk 2010-04-15 11:35:10.000000000 +0400 -+++ jdk/make/common/internal/BinaryPlugs.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/internal/BinaryPlugs.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/internal/BinaryPlugs.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -49,8 +49,6 @@ com/sun/jmx/snmp/SnmpDataTypeEnums.class \ com/sun/jmx/snmp/SnmpDefinitions.class \ @@ -6563,8 +6723,8 @@ import-binary-plug-jar \ import-binary-plugs-completed ---- jdk/make/common/shared/Compiler-gcc.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/common/shared/Compiler-gcc.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/shared/Compiler-gcc.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/shared/Compiler-gcc.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -99,6 +99,24 @@ endif @@ -6590,8 +6750,8 @@ ifeq ($(PLATFORM), solaris) # Settings specific to Solaris ---- jdk/make/common/shared/Compiler.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/common/shared/Compiler.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/shared/Compiler.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/shared/Compiler.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -37,8 +37,8 @@ override CC_VERSION = sun endif @@ -6603,8 +6763,8 @@ override CC_VERSION = gcc endif ---- jdk/make/common/shared/Defs-bsd.gmk 2010-04-17 21:43:54.000000000 +0400 -+++ jdk/make/common/shared/Defs-bsd.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/shared/Defs-bsd.gmk 2010-06-27 11:37:43.000000000 -0700 ++++ jdk/make/common/shared/Defs-bsd.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -70,7 +70,7 @@ endef @@ -6643,8 +6803,8 @@ # Import JDK images allow for partial builds, components not built are # imported (or copied from) these import areas when needed. ---- jdk/make/common/shared/Defs-java.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/common/shared/Defs-java.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/shared/Defs-java.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/shared/Defs-java.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -42,7 +42,7 @@ # Suspect this may not be needed anymore. JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline @@ -6654,8 +6814,8 @@ endif # ---- jdk/make/common/shared/Defs-utils.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/common/shared/Defs-utils.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/shared/Defs-utils.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/shared/Defs-utils.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -80,6 +80,13 @@ endif endif @@ -6703,8 +6863,8 @@ + TAR = $(UTILS_USR_BIN_PATH)tar + endif +endif ---- jdk/make/common/shared/Defs.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/common/shared/Defs.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/shared/Defs.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/shared/Defs.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -143,7 +143,7 @@ echo older; \ else \ @@ -6714,9 +6874,9 @@ echo older; \ else \ echo newer; \ ---- jdk/make/common/shared/Platform.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/common/shared/Platform.gmk 2010-04-17 21:48:08.000000000 +0400 -@@ -279,6 +279,76 @@ +--- jdk/make/common/shared/Platform.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/shared/Platform.gmk 2010-06-20 21:56:16.000000000 -0700 +@@ -275,6 +275,76 @@ MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) endif @@ -6793,7 +6953,7 @@ # Windows with and without CYGWIN will be slightly different ifeq ($(SYSTEM_UNAME), Windows_NT) PLATFORM = windows -@@ -395,6 +465,13 @@ +@@ -394,6 +464,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. @@ -6807,7 +6967,7 @@ ifneq ($(MB_OF_MEMORY),) LOW_MEMORY_MACHINE := $(shell \ if [ $(MB_OF_MEMORY) -le 512 ] ; then \ -@@ -406,7 +483,7 @@ +@@ -405,7 +482,7 @@ if [ $(MB_OF_MEMORY) -le 1024 ] ; then \ expr $(MB_OF_MEMORY) '-' 128 ; \ else \ @@ -6816,7 +6976,7 @@ fi) MIN_VM_MEMORY := $(shell \ if [ $(MAX_VM_MEMORY) -le 128 ] ; then \ -@@ -458,6 +535,15 @@ +@@ -457,6 +534,15 @@ ARCH_VM_SUBDIR=jre/lib/$(LIBARCH) endif @@ -6832,9 +6992,9 @@ # If blanks in the username, use the first 4 words and pack them together _USER1:=$(subst ', ,$(_USER)) _USER2:=$(subst ", ,$(_USER1)) ---- jdk/make/common/shared/Sanity-Settings.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/common/shared/Sanity-Settings.gmk 2010-04-17 21:48:08.000000000 +0400 -@@ -255,6 +255,7 @@ +--- jdk/make/common/shared/Sanity-Settings.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/shared/Sanity-Settings.gmk 2010-06-20 21:56:16.000000000 -0700 +@@ -243,6 +243,7 @@ ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings) ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH) ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH) @@ -6842,8 +7002,8 @@ ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings) ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE) ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_PATH) ---- jdk/make/common/shared/Sanity.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/common/shared/Sanity.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/common/shared/Sanity.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/common/shared/Sanity.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -96,6 +96,11 @@ $(EGREP) "\#define" | $(NAWK) '{print $$3}') endif @@ -6856,19 +7016,8 @@ # 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') ---- jdk/make/docs/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/docs/Makefile 2010-04-17 21:48:08.000000000 +0400 -@@ -233,7 +233,7 @@ - # you get "No packages or classes specified." due to $(CLASSPATH_SEPARATOR) - # being interpreted as an end of command (newline) - --JAAS_SOURCEPATH = "$(TOPDIR)/src/share/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/solaris/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/windows/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/linux/classes" -+JAAS_SOURCEPATH = "$(TOPDIR)/src/share/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/solaris/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/windows/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/linux/classes$(CLASSPATH_SEPARATOR)$(TOPDIR)/src/bsd/classes" - JAAS_DOCDIR = $(DOCSDIR)/jre/api/security/jaas/spec - JAAS_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \ - -encoding ascii \ ---- jdk/make/java/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -49,7 +49,7 @@ endif endif # PLATFORM @@ -6878,8 +7027,8 @@ SUBDIRS += jexec endif # PLATFORM ---- jdk/make/java/hpi/hpi_common.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/hpi/hpi_common.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/hpi/hpi_common.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/hpi/hpi_common.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -86,5 +86,9 @@ # Things that must be linked in. # @@ -6890,8 +7039,8 @@ OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl endif +endif ---- jdk/make/java/hpi/native/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/hpi/native/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/hpi/native/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/hpi/native/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -72,11 +72,18 @@ ifeq ($(MOOT_PRIORITIES),true) OTHER_CPPFLAGS += -DMOOT_PRIORITIES @@ -6911,8 +7060,8 @@ ifeq ($(HAVE_GETHRVTIME),true) OTHER_CPPFLAGS += -DHAVE_GETHRVTIME endif ---- jdk/make/java/instrument/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/instrument/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/instrument/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/instrument/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -102,6 +102,21 @@ # equivalent of strcasecmp is stricmp on Windows CPPFLAGS_COMMON += -Dstrcasecmp=stricmp @@ -6943,8 +7092,8 @@ # # Library to compile. ---- jdk/make/java/java/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/java/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/java/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/java/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -167,8 +167,10 @@ # Is the altzone extern documented in ctime(3C) available? # @@ -6971,15 +7120,8 @@ # # Rules. ---- jdk/make/java/java/genlocales.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/java/genlocales.gmk 2010-04-17 21:48:08.000000000 +0400 -@@ -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 +--- jdk/make/java/java/genlocales.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/java/genlocales.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -76,11 +76,16 @@ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) @$(RM) $@.tmp.euro $@.tmp.noneuro; @@ -7002,17 +7144,8 @@ $@.tmp.noneuro $< $@ @$(RM) $@.tmp.euro $@.tmp.noneuro; ---- jdk/make/java/java/localegen.sh 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/java/localegen.sh 2010-04-17 21:48:08.000000000 +0400 -@@ -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 +--- jdk/make/java/java/localegen.sh 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/java/localegen.sh 2010-06-20 21:56:16.000000000 -0700 @@ -29,7 +29,7 @@ # This script is to generate the supported locale list string and replace the # LocaleDataMetaInfo-XLocales.java in /src/share/classes/sun/util @@ -7043,8 +7176,8 @@ done sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE" ---- jdk/make/java/java_hprof_demo/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/java_hprof_demo/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/java_hprof_demo/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/java_hprof_demo/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -83,8 +83,10 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS += wsock32.lib winmm.lib @@ -7056,8 +7189,8 @@ # # Tell library.gmk to copy the txt file first ---- jdk/make/java/jli/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/jli/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/jli/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/jli/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -44,8 +44,10 @@ include $(BUILDDIR)/common/Defs.gmk @@ -7133,8 +7266,8 @@ +endif + ---- jdk/make/java/management/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/management/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/management/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/management/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -85,6 +85,11 @@ OTHER_INCLUDES += \ -I$(SHARE_SRC)/native/sun/management @@ -7147,8 +7280,8 @@ ifeq ($(PLATFORM),windows) OTHER_LDLIBS += $(JVMLIB) endif ---- jdk/make/java/net/FILES_c.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/net/FILES_c.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/net/FILES_c.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/net/FILES_c.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -43,6 +43,10 @@ FILES_c += linux_close.c endif @@ -7160,8 +7293,8 @@ ifeq ($(PLATFORM), windows) FILES_c += TwoStacksPlainSocketImpl.c FILES_c += DualStackPlainSocketImpl.c ---- jdk/make/java/net/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/net/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/net/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/net/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -92,6 +92,12 @@ include $(BUILDDIR)/common/Library.gmk @@ -7183,8 +7316,8 @@ CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl ---- jdk/make/java/nio/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/nio/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/nio/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/nio/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -82,7 +82,7 @@ sun/nio/ch/WindowsSelectorImpl.java endif # PLATFORM = windows @@ -7226,8 +7359,8 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk ---- jdk/make/java/npt/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/npt/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/npt/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/npt/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -70,6 +70,18 @@ OTHER_LCF += -export:nptInitialize -export:nptTerminate endif @@ -7247,8 +7380,8 @@ # # Add to ambient vpath so we pick up the library files # ---- jdk/make/java/redist/FILES.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/redist/FILES.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/redist/FILES.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/redist/FILES.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -38,6 +38,14 @@ $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \ @@ -7264,8 +7397,8 @@ # The oblique versions of the font are derived from the base versions # and since 2D can do this derivation on the fly at run time there is no ---- jdk/make/java/redist/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/redist/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/redist/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/redist/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -317,7 +317,7 @@ $(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir $(install-file) @@ -7284,8 +7417,8 @@ endif # !OPENJDK # Import internal files (ones that are stashed in this source tree) ---- jdk/make/java/security/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/security/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/security/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/security/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -51,7 +51,15 @@ ifneq ($(ARCH_DATA_MODEL), 64) PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows @@ -7302,8 +7435,8 @@ endif # PLATFORM ---- jdk/make/java/zip/FILES_c.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/zip/FILES_c.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/zip/FILES_c.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/zip/FILES_c.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -30,6 +30,10 @@ Inflater.c \ ZipFile.c \ @@ -7323,8 +7456,8 @@ - zip_util.c + inffast.c +endif ---- jdk/make/java/zip/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/java/zip/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/java/zip/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/java/zip/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -72,16 +72,24 @@ CPPFLAGS += -UDEBUG endif @@ -7351,8 +7484,8 @@ OTHER_LDLIBS = $(JVMLIB) +endif + ---- jdk/make/javax/crypto/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/javax/crypto/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/javax/crypto/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/javax/crypto/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -155,7 +155,7 @@ # @@ -7362,8 +7495,8 @@ else # OPENJDK ifeq ($(strip $(FILES_java)),) all: ---- jdk/make/javax/sound/FILES_c.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/javax/sound/FILES_c.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/javax/sound/FILES_c.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/javax/sound/FILES_c.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -34,6 +34,8 @@ FILES_linux = @@ -7373,8 +7506,8 @@ FILES_windows = \ PLATFORM_API_WinOS_MidiIn.c \ PLATFORM_API_WinOS_MidiOut.c \ ---- jdk/make/javax/sound/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/javax/sound/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/javax/sound/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/javax/sound/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -107,6 +107,19 @@ #MXSPP_ADD = $(PLATFORM)-$(ARCH)/ endif # PLATFORM linux @@ -7395,8 +7528,8 @@ ifeq ($(PLATFORM), solaris) ifneq ($(ARCH), amd64) # build with ports and direct audio ---- jdk/make/javax/sound/SoundDefs.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/javax/sound/SoundDefs.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/javax/sound/SoundDefs.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/javax/sound/SoundDefs.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -40,6 +40,10 @@ CPPFLAGS += -DX_PLATFORM=X_LINUX endif # PLATFORM linux @@ -7408,8 +7541,8 @@ ifeq ($(PLATFORM), solaris) CPPFLAGS += -DX_PLATFORM=X_SOLARIS ---- jdk/make/jpda/back/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/jpda/back/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/jpda/back/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/jpda/back/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -49,8 +49,10 @@ -I$(GENNATIVESRCDIR)/jdwp @@ -7421,8 +7554,8 @@ # # This turns off all assert() checking in the optimized library ---- jdk/make/sun/awt/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/sun/awt/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/awt/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/sun/awt/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -129,6 +129,14 @@ OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl endif @@ -7492,8 +7625,8 @@ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) endif ---- jdk/make/sun/awt/mawt.gmk 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/sun/awt/mawt.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/awt/mawt.gmk 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/sun/awt/mawt.gmk 2010-06-20 21:56:16.000000000 -0700 @@ -174,7 +174,7 @@ OTHER_LDLIBS = $(LIBXM) -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi endif @@ -7550,8 +7683,8 @@ LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ $(AWT_RUNPATH) ---- jdk/make/sun/font/Makefile 2010-04-15 11:35:11.000000000 +0400 -+++ jdk/make/sun/font/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/font/Makefile 2010-06-21 14:15:08.000000000 -0700 ++++ jdk/make/sun/font/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -177,6 +177,15 @@ # Libraries to link, and other C flags. # @@ -7576,8 +7709,8 @@ endif # PLATFORM ---- jdk/make/sun/image/generic/Makefile 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/sun/image/generic/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/image/generic/Makefile 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/sun/image/generic/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -69,5 +69,9 @@ -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib @@ -7589,8 +7722,8 @@ +endif + ---- jdk/make/sun/jawt/Makefile 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/sun/jawt/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/jawt/Makefile 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/sun/jawt/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -98,9 +98,7 @@ # # Other extra flags needed for compiling. @@ -7620,8 +7753,8 @@ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt endif # PLATFORM ---- jdk/make/sun/security/jgss/wrapper/Makefile 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/sun/security/jgss/wrapper/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/security/jgss/wrapper/Makefile 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/sun/security/jgss/wrapper/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -71,6 +71,10 @@ # # Libraries to link @@ -7634,8 +7767,8 @@ +ifeq ($(PLATFORM), bsd) + OTHER_LDLIBS = $(JVMLIB) +endif ---- jdk/make/sun/security/pkcs11/Makefile 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/sun/security/pkcs11/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/security/pkcs11/Makefile 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/sun/security/pkcs11/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -155,7 +155,7 @@ # # Libraries to link @@ -7645,8 +7778,8 @@ OTHER_LDLIBS = $(JVMLIB) else OTHER_LDLIBS = -ldl $(JVMLIB) ---- jdk/make/sun/security/smartcardio/Makefile 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/sun/security/smartcardio/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/security/smartcardio/Makefile 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/sun/security/smartcardio/Makefile 2010-06-20 21:56:16.000000000 -0700 @@ -75,6 +75,10 @@ ifeq ($(PLATFORM), windows) OTHER_LDLIBS = $(JVMLIB) winscard.lib @@ -7659,8 +7792,8 @@ + endif OTHER_CFLAGS = -D__sun_jdk endif ---- jdk/make/sun/splashscreen/FILES_c.gmk 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/sun/splashscreen/FILES_c.gmk 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/splashscreen/FILES_c.gmk 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/sun/splashscreen/FILES_c.gmk 2010-06-20 21:56:17.000000000 -0700 @@ -49,20 +49,6 @@ dgif_lib.c \ gif_err.c \ @@ -7703,8 +7836,8 @@ + zcrc32.c \ + zutil.c +endif ---- jdk/make/sun/splashscreen/Makefile 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/sun/splashscreen/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/splashscreen/Makefile 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/sun/splashscreen/Makefile 2010-06-20 21:56:17.000000000 -0700 @@ -61,10 +61,26 @@ CFLAGS += -DSPLASHSCREEN @@ -7752,8 +7885,8 @@ ifeq ($(PLATFORM), linux) ifeq ($(ARCH_DATA_MODEL), 64) # 64-bit gcc has problems compiling MMX instructions. ---- jdk/make/sun/xawt/Makefile 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/sun/xawt/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/sun/xawt/Makefile 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/sun/xawt/Makefile 2010-06-20 21:56:17.000000000 -0700 @@ -53,6 +53,11 @@ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) endif @@ -7817,8 +7950,8 @@ ifeq ($(MILESTONE), internal) CPPFLAGS += -DINTERNAL_BUILD endif ---- jdk/make/tools/freetypecheck/Makefile 2010-04-15 11:35:12.000000000 +0400 -+++ jdk/make/tools/freetypecheck/Makefile 2010-04-17 21:48:08.000000000 +0400 +--- jdk/make/tools/freetypecheck/Makefile 2010-06-21 14:15:09.000000000 -0700 ++++ jdk/make/tools/freetypecheck/Makefile 2010-06-20 21:56:17.000000000 -0700 @@ -60,8 +60,12 @@ #add runtime lib search path to ensure test will be runnable ifeq ($(PLATFORM), solaris) @@ -7834,10 +7967,10 @@ endif endif ---- jdk/src/share/back/commonRef.c 2010-04-15 11:35:13.000000000 +0400 -+++ jdk/src/share/back/commonRef.c 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/back/commonRef.c 2010-06-21 14:15:10.000000000 -0700 ++++ jdk/src/share/back/commonRef.c 2010-06-20 21:56:17.000000000 -0700 @@ -23,6 +23,10 @@ - * have any questions. + * questions. */ +#if defined(_ALLBSD_SOURCE) @@ -7847,8 +7980,8 @@ #include "util.h" #include "commonRef.h" ---- jdk/src/share/bin/java.c 2010-04-15 11:35:13.000000000 +0400 -+++ jdk/src/share/bin/java.c 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/bin/java.c 2010-06-21 14:15:10.000000000 -0700 ++++ jdk/src/share/bin/java.c 2010-06-20 21:56:17.000000000 -0700 @@ -104,6 +104,11 @@ static char *launchername; jboolean _launcher_debug = JNI_FALSE; @@ -8043,8 +8176,8 @@ static void FreeKnownVMs() { ---- jdk/src/share/bin/java.h 2010-04-15 11:35:13.000000000 +0400 -+++ jdk/src/share/bin/java.h 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/bin/java.h 2010-06-21 14:15:10.000000000 -0700 ++++ jdk/src/share/bin/java.h 2010-06-20 21:56:17.000000000 -0700 @@ -91,11 +91,17 @@ void PrintMachineDependentOptions(); @@ -8065,8 +8198,8 @@ /* sun.java.launcher.* platform properties. */ void SetJavaLauncherPlatformProps(void); ---- jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-04-15 11:35:14.000000000 +0400 -+++ jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-06-21 14:15:11.000000000 -0700 ++++ jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-06-20 21:56:17.000000000 -0700 @@ -477,6 +477,10 @@ String[] dirs = new String[] { userHome + sep + ".themes", @@ -8078,8 +8211,8 @@ "/usr/share/themes", "/usr/gnome/share/themes", // Debian/Redhat/Solaris "/opt/gnome2/share/themes" // SuSE ---- jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-04-15 11:35:16.000000000 +0400 -+++ jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-06-21 14:15:13.000000000 -0700 ++++ jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-06-20 21:56:17.000000000 -0700 @@ -78,6 +78,9 @@ */ public long timeStamp ; @@ -8090,8 +8223,8 @@ /** ---- jdk/src/share/classes/java/awt/Font.java 2010-04-15 11:35:20.000000000 +0400 -+++ jdk/src/share/classes/java/awt/Font.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/java/awt/Font.java 2010-06-21 14:15:16.000000000 -0700 ++++ jdk/src/share/classes/java/awt/Font.java 2010-06-20 21:56:17.000000000 -0700 @@ -445,18 +445,19 @@ */ private AttributeValues getAttributeValues() { @@ -8118,8 +8251,8 @@ } return values; ---- jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-04-15 11:35:20.000000000 +0400 -+++ jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-06-21 14:15:16.000000000 -0700 ++++ jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-06-20 21:56:17.000000000 -0700 @@ -148,7 +148,12 @@ } else { String osName = System.getProperty("os.name"); @@ -8134,8 +8267,8 @@ (System.getenv("DISPLAY") == null)); } } else if (nm.equals("true")) { ---- jdk/src/share/classes/java/util/TimeZone.java 2010-04-15 11:35:24.000000000 +0400 -+++ jdk/src/share/classes/java/util/TimeZone.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/java/util/TimeZone.java 2010-06-21 14:15:21.000000000 -0700 ++++ jdk/src/share/classes/java/util/TimeZone.java 2010-06-20 21:56:17.000000000 -0700 @@ -776,15 +776,13 @@ } int gmtOffset = (hours * 60 + num) * 60 * 1000; @@ -8153,8 +8286,8 @@ } return zi; } ---- jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-04-15 11:35:31.000000000 +0400 -+++ jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-06-21 14:15:27.000000000 -0700 ++++ jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-06-20 21:56:17.000000000 -0700 @@ -1073,7 +1073,7 @@ */ HashMap existsMap; @@ -8173,8 +8306,8 @@ errors++; } } ---- jdk/src/share/classes/sun/font/TrueTypeFont.java 2010-04-15 11:35:32.000000000 +0400 -+++ jdk/src/share/classes/sun/font/TrueTypeFont.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/font/TrueTypeFont.java 2010-06-21 14:15:28.000000000 -0700 ++++ jdk/src/share/classes/sun/font/TrueTypeFont.java 2010-06-20 21:56:17.000000000 -0700 @@ -159,6 +159,13 @@ private boolean supportsJA; private boolean supportsCJK; @@ -8285,8 +8418,8 @@ } else { return name; } ---- jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2010-04-15 11:35:33.000000000 +0400 -+++ jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2010-06-21 14:15:29.000000000 -0700 ++++ jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2010-06-20 21:56:17.000000000 -0700 @@ -76,7 +76,7 @@ public abstract class SunGraphicsEnvironment extends GraphicsEnvironment implements FontSupport, DisplayChangedListener { @@ -8324,19 +8457,8 @@ registerFontDir(jreFontDirName); } registerFontsInDir(jreFontDirName, true, Font2D.JRE_RANK, ---- jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java 2010-04-15 11:35:33.000000000 +0400 -+++ jdk/src/share/classes/sun/java2d/pisces/PiscesCache.java 2010-04-17 21:48:08.000000000 +0400 -@@ -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; ---- jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-04-15 11:35:37.000000000 +0400 -+++ jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-06-21 14:15:33.000000000 -0700 ++++ jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-06-20 21:56:27.000000000 -0700 @@ -1531,7 +1531,9 @@ pFlags |= NOSHEET; ncomps+=1; @@ -8348,8 +8470,8 @@ execCmd = new String[ncomps]; execCmd[n++] = "/usr/bin/lpr"; if ((pFlags & PRINTER) != 0) { ---- jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2010-04-15 11:35:38.000000000 +0400 -+++ jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2010-06-21 14:15:34.000000000 -0700 ++++ jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java 2010-06-20 21:56:27.000000000 -0700 @@ -49,8 +49,12 @@ AccessController.doPrivileged(new PrivilegedAction() { public Boolean run() { @@ -8365,8 +8487,8 @@ return new Boolean(System.getProperty (USE_NATIVE_PROP)); } ---- jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-04-15 11:35:38.000000000 +0400 -+++ jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-06-21 14:15:34.000000000 -0700 ++++ jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-06-20 21:56:27.000000000 -0700 @@ -82,7 +82,11 @@ String osname = System.getProperty("os.name"); if (osname.startsWith("SunOS")) { @@ -8380,8 +8502,8 @@ gssLib = "libgssapi.so"; } } ---- jdk/src/share/classes/sun/security/krb5/Config.java 2010-04-15 11:35:38.000000000 +0400 -+++ jdk/src/share/classes/sun/security/krb5/Config.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/security/krb5/Config.java 2010-06-21 14:15:34.000000000 -0700 ++++ jdk/src/share/classes/sun/security/krb5/Config.java 2010-06-20 21:56:27.000000000 -0700 @@ -711,7 +711,11 @@ } } else if (osname.startsWith("SunOS")) { @@ -8395,8 +8517,8 @@ name = "/etc/krb5.conf"; } } ---- jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2010-04-15 11:35:39.000000000 +0400 -+++ jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2010-06-21 14:15:34.000000000 -0700 ++++ jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2010-06-20 21:56:27.000000000 -0700 @@ -383,8 +383,12 @@ String uidStr = null; long uid = 0; @@ -8412,15 +8534,15 @@ try { Class c = Class.forName ("com.sun.security.auth.module.UnixSystem"); ---- jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-04-15 11:35:41.000000000 +0400 -+++ jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-06-21 14:15:36.000000000 -0700 ++++ jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-06-20 21:56:27.000000000 -0700 @@ -30,3 +30,4 @@ #[solaris]sun.tools.attach.SolarisAttachProvider #[windows]sun.tools.attach.WindowsAttachProvider #[linux]sun.tools.attach.LinuxAttachProvider +#[bsd]sun.tools.attach.BsdAttachProvider ---- jdk/src/share/classes/sun/tools/jar/Main.java 2010-04-15 11:35:41.000000000 +0400 -+++ jdk/src/share/classes/sun/tools/jar/Main.java 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/tools/jar/Main.java 2010-06-21 14:15:37.000000000 -0700 ++++ jdk/src/share/classes/sun/tools/jar/Main.java 2010-06-20 21:56:27.000000000 -0700 @@ -48,6 +48,7 @@ String zname = ""; String[] files; @@ -8468,8 +8590,8 @@ if (!d.exists() && !d.mkdirs() || !d.isDirectory()) { throw new IOException(formatMsg( "error.create.dir", d.getPath())); ---- jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-04-15 11:35:41.000000000 +0400 -+++ jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-06-21 14:15:37.000000000 -0700 ++++ jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-06-20 21:56:27.000000000 -0700 @@ -44,6 +44,8 @@ {0} : could not create directory error.incorrect.length=\ @@ -8479,8 +8601,8 @@ out.added.manifest=\ added manifest out.update.manifest=\ ---- jdk/src/share/hpi/include/hpi_impl.h 2010-04-15 11:35:44.000000000 +0400 -+++ jdk/src/share/hpi/include/hpi_impl.h 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/hpi/include/hpi_impl.h 2010-06-21 14:15:39.000000000 -0700 ++++ jdk/src/share/hpi/include/hpi_impl.h 2010-06-20 21:56:27.000000000 -0700 @@ -138,7 +138,11 @@ int sysBind(int fd, struct sockaddr *him, int len); int sysAccept(int fd, struct sockaddr *him, int *len); @@ -8494,8 +8616,8 @@ 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, ---- jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-06-20 21:56:27.000000000 -0700 @@ -32,6 +32,10 @@ #include #endif @@ -8521,8 +8643,8 @@ #ifdef _MSC_VER typedef LONGLONG jlong; typedef DWORDLONG julong; ---- jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-06-20 21:56:27.000000000 -0700 @@ -33,9 +33,14 @@ #include #include @@ -8560,8 +8682,8 @@ true)); } ---- jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-06-20 21:56:27.000000000 -0700 @@ -33,7 +33,11 @@ #include @@ -8574,8 +8696,8 @@ #include "SoundDefs.h" #include "DirectAudio.h" #include "Utilities.h" ---- jdk/src/share/native/com/sun/media/sound/Platform.c 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/com/sun/media/sound/Platform.c 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/com/sun/media/sound/Platform.c 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/com/sun/media/sound/Platform.c 2010-06-20 21:56:27.000000000 -0700 @@ -99,5 +99,17 @@ return com_sun_media_sound_Platform_LIB_ALSA; } @@ -8594,8 +8716,8 @@ +#endif return 0; } ---- jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-20 21:56:27.000000000 -0700 @@ -31,6 +31,7 @@ #define X_WINDOWS 1 #define X_SOLARIS 2 @@ -8623,8 +8745,8 @@ + + #endif // __SOUNDDEFS_INCLUDED__ ---- jdk/src/share/native/common/check_code.c 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/common/check_code.c 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/common/check_code.c 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/common/check_code.c 2010-06-20 21:56:27.000000000 -0700 @@ -1069,7 +1069,7 @@ * Make sure that branches don't go into the middle of nowhere. */ @@ -8686,8 +8808,8 @@ /* There can't be more than 64K labels because of the limit * on per-method byte code length. */ ---- jdk/src/share/native/java/io/io_util.h 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/java/io/io_util.h 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/java/io/io_util.h 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/java/io/io_util.h 2010-06-20 21:56:27.000000000 -0700 @@ -29,7 +29,15 @@ extern jfieldID IO_fd_fdID; extern jfieldID IO_handle_fdID; @@ -8705,10 +8827,10 @@ #define O_SYNC (0x0800) #define O_DSYNC (0x2000) #endif ---- jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-06-20 21:56:27.000000000 -0700 @@ -25,6 +25,10 @@ - * have any questions. + * questions. */ +#ifdef __OpenBSD__ @@ -8732,8 +8854,8 @@ /* * ANSI/POSIX ---- jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-06-20 21:56:27.000000000 -0700 @@ -61,7 +61,7 @@ #define log1p jlog1p #define expm1 jexpm1 @@ -8743,8 +8865,8 @@ #define __ieee754_sqrt __j__ieee754_sqrt #define __ieee754_acos __j__ieee754_acos #define __ieee754_acosh __j__ieee754_acosh ---- jdk/src/share/native/java/util/zip/Inflater.c 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/java/util/zip/Inflater.c 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/java/util/zip/Inflater.c 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/java/util/zip/Inflater.c 2010-06-20 21:56:27.000000000 -0700 @@ -65,6 +65,10 @@ return jlong_zero; } else { @@ -8767,8 +8889,8 @@ } JNIEXPORT void JNICALL ---- jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h 2010-04-17 21:48:08.000000000 +0400 +--- jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h 2010-06-20 21:56:27.000000000 -0700 @@ -42,44 +42,49 @@ /* for _LP64 */ #include @@ -8852,8 +8974,8 @@ #endif #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) ---- jdk/src/share/native/sun/awt/debug/debug_util.h 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/sun/awt/debug/debug_util.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/debug/debug_util.h 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/sun/awt/debug/debug_util.h 2010-06-20 21:56:27.000000000 -0700 @@ -50,7 +50,9 @@ #include #include @@ -8864,8 +8986,8 @@ #include /* keep these after the other headers */ ---- jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-06-20 21:56:27.000000000 -0700 @@ -24,7 +24,11 @@ */ @@ -8878,10 +9000,10 @@ #include "sun_awt_image_BufImgSurfaceData.h" ---- jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-04-15 11:35:45.000000000 +0400 -+++ jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-06-21 14:15:40.000000000 -0700 ++++ jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-06-20 21:56:27.000000000 -0700 @@ -23,7 +23,11 @@ - * have any questions. + * questions. */ +#ifdef _ALLBSD_SOURCE @@ -8892,8 +9014,8 @@ #include "SurfaceData.h" #include "sun_awt_image_DataBufferNative.h" ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-06-20 21:56:27.000000000 -0700 @@ -86,7 +86,7 @@ #endif /* MLIB_USE_FTOI_CLAMPING */ @@ -8933,8 +9055,8 @@ #endif /* _NO_LONGLONG */ ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-06-20 21:56:27.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -8974,8 +9096,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-06-20 21:56:27.000000000 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -9015,8 +9137,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-06-20 21:56:27.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -9056,8 +9178,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-06-20 21:56:27.000000000 -0700 @@ -95,7 +95,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -9097,8 +9219,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-06-20 21:56:27.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -9138,8 +9260,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-06-20 21:56:27.000000000 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -9179,8 +9301,8 @@ #endif /* _NO_LONGLONG */ /***************************************************************/ ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-06-20 21:56:27.000000000 -0700 @@ -95,7 +95,7 @@ dst = dp[0]; if (ld_offset + size < 32) { @@ -9400,8 +9522,8 @@ } #else /* _LONGLONG */ ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-06-20 21:56:27.000000000 -0700 @@ -168,7 +168,7 @@ } @@ -9682,8 +9804,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-06-20 21:56:27.000000000 -0700 @@ -88,7 +88,7 @@ } d64_2_f32; @@ -9835,8 +9957,8 @@ ((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l; ((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h; ---- jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-06-20 21:56:27.000000000 -0700 @@ -30,7 +30,7 @@ typedef union { mlib_d64 db; @@ -9846,8 +9968,8 @@ mlib_s32 int1, int0; #else mlib_s32 int0, int1; ---- jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-06-20 21:56:27.000000000 -0700 @@ -275,11 +275,11 @@ for (i = 0; j <= (b_size - 4); j += 4, i++) { src0 = src1; @@ -9946,8 +10068,8 @@ s0 = s1; dp += SIZE; sp += SIZE; ---- jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-06-20 21:56:27.000000000 -0700 @@ -120,7 +120,7 @@ } \ } @@ -11180,8 +11302,8 @@ dp[12] = t0; dp[13] = t1; dp[14] = t2; ---- jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-06-20 21:56:27.000000000 -0700 @@ -27,6 +27,11 @@ #ifndef MLIB_IMAGE_H #define MLIB_IMAGE_H @@ -11194,8 +11316,8 @@ #include #include #include ---- jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-06-20 21:56:27.000000000 -0700 @@ -26,9 +26,15 @@ #include @@ -11226,8 +11348,8 @@ return (void *) memalign(8, size); #endif /* _MSC_VER */ } ---- jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-06-20 21:56:27.000000000 -0700 @@ -59,7 +59,10 @@ #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__) @@ -11240,10 +11362,10 @@ #include /* for uintptr_t */ #include /* for ptrdiff_t */ #else ---- jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-06-20 21:56:27.000000000 -0700 @@ -23,7 +23,11 @@ - * have any questions. + * questions. */ +#ifdef _ALLBSD_SOURCE @@ -11254,8 +11376,8 @@ #include "jni.h" #include "AccelGlyphCache.h" #include "Trace.h" ---- jdk/src/share/native/sun/font/DrawGlyphList.c 2010-04-15 11:35:46.000000000 +0400 -+++ jdk/src/share/native/sun/font/DrawGlyphList.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/font/DrawGlyphList.c 2010-06-21 14:15:41.000000000 -0700 ++++ jdk/src/share/native/sun/font/DrawGlyphList.c 2010-06-20 21:56:27.000000000 -0700 @@ -26,7 +26,11 @@ #include "jlong.h" #include "math.h" @@ -11268,8 +11390,8 @@ #include "sunfontids.h" #include "fontscalerdefs.h" #include "glyphblitting.h" ---- jdk/src/share/native/sun/font/sunFont.c 2010-04-15 11:35:47.000000000 +0400 -+++ jdk/src/share/native/sun/font/sunFont.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/font/sunFont.c 2010-06-21 14:15:42.000000000 -0700 ++++ jdk/src/share/native/sun/font/sunFont.c 2010-06-20 21:56:27.000000000 -0700 @@ -24,7 +24,9 @@ */ @@ -11280,8 +11402,8 @@ #include "string.h" #include "gdefs.h" #include "jlong.h" ---- jdk/src/share/native/sun/java2d/SurfaceData.c 2010-04-15 11:35:47.000000000 +0400 -+++ jdk/src/share/native/sun/java2d/SurfaceData.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/java2d/SurfaceData.c 2010-06-21 14:15:42.000000000 -0700 ++++ jdk/src/share/native/sun/java2d/SurfaceData.c 2010-06-20 21:56:27.000000000 -0700 @@ -28,7 +28,11 @@ #include "jni_util.h" #include "Disposer.h" @@ -11294,8 +11416,8 @@ #include "string.h" /** ---- jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-04-15 11:35:47.000000000 +0400 -+++ jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-06-21 14:15:42.000000000 -0700 ++++ jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-06-20 21:56:27.000000000 -0700 @@ -26,6 +26,9 @@ #ifndef OGLFuncs_h_Included #define OGLFuncs_h_Included @@ -11306,8 +11428,8 @@ #include "jni.h" #include "J2D_GL/gl.h" #include "J2D_GL/glext.h" ---- jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-04-15 11:35:47.000000000 +0400 -+++ jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-06-21 14:15:42.000000000 -0700 ++++ jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-06-20 21:56:27.000000000 -0700 @@ -25,7 +25,11 @@ #ifndef HEADLESS @@ -11320,8 +11442,8 @@ #include "sun_java2d_pipe_BufferedOpCodes.h" ---- jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-04-15 11:35:47.000000000 +0400 -+++ jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-06-21 14:15:42.000000000 -0700 ++++ jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-06-20 21:56:27.000000000 -0700 @@ -25,7 +25,11 @@ #ifndef HEADLESS @@ -11334,8 +11456,8 @@ #include #include ---- jdk/src/share/transport/socket/socketTransport.c 2010-04-15 11:35:48.000000000 +0400 -+++ jdk/src/share/transport/socket/socketTransport.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/share/transport/socket/socketTransport.c 2010-06-21 14:15:43.000000000 -0700 ++++ jdk/src/share/transport/socket/socketTransport.c 2010-06-20 21:56:27.000000000 -0700 @@ -65,6 +65,9 @@ #define HEADER_SIZE 11 #define MAX_DATA_SIZE 1000 @@ -11423,8 +11545,8 @@ return res; } else if (res == 0) { break; /* eof, return nbytes which is less than len */ ---- jdk/src/solaris/back/exec_md.c 2010-04-15 11:35:48.000000000 +0400 -+++ jdk/src/solaris/back/exec_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/back/exec_md.c 2010-06-21 14:15:43.000000000 -0700 ++++ jdk/src/solaris/back/exec_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -30,7 +30,7 @@ #include "sys.h" #include "util.h" @@ -11434,8 +11556,8 @@ /* Linux */ #define FORK() fork() #else ---- jdk/src/solaris/back/linker_md.c 2010-04-15 11:35:48.000000000 +0400 -+++ jdk/src/solaris/back/linker_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/back/linker_md.c 2010-06-21 14:15:43.000000000 -0700 ++++ jdk/src/solaris/back/linker_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -48,6 +48,12 @@ #include "threads_md.h" #endif @@ -11461,8 +11583,8 @@ } } ---- jdk/src/solaris/back/util_md.h 2010-04-15 11:35:48.000000000 +0400 -+++ jdk/src/solaris/back/util_md.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/back/util_md.h 2010-06-21 14:15:43.000000000 -0700 ++++ jdk/src/solaris/back/util_md.h 2010-06-20 21:56:27.000000000 -0700 @@ -29,7 +29,7 @@ #include @@ -11489,8 +11611,8 @@ #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) ---- jdk/src/solaris/bin/java_md.c 2010-04-15 11:35:48.000000000 +0400 -+++ jdk/src/solaris/bin/java_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/bin/java_md.c 2010-06-21 14:15:43.000000000 -0700 ++++ jdk/src/solaris/bin/java_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -24,6 +24,7 @@ */ @@ -11705,8 +11827,8 @@ /* Coarse estimation of number of digits assuming the worst case is a 64-bit pid. */ #define MAX_PID_STR_SZ 20 ---- jdk/src/solaris/bin/java_md.h 2010-04-15 11:35:48.000000000 +0400 -+++ jdk/src/solaris/bin/java_md.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/bin/java_md.h 2010-06-21 14:15:43.000000000 -0700 ++++ jdk/src/solaris/bin/java_md.h 2010-06-20 21:56:27.000000000 -0700 @@ -58,10 +58,14 @@ #include #define CounterGet() (gethrtime()/1000) @@ -11723,8 +11845,8 @@ /* * Function prototypes. ---- jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-04-15 11:35:48.000000000 +0400 -+++ jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-06-21 14:15:43.000000000 -0700 ++++ jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2010-06-20 21:56:27.000000000 -0700 @@ -403,7 +403,7 @@ if (fontID != null) { fileName = (String)fontNameMap.get(fontID); @@ -11743,8 +11865,8 @@ fontConfigDirs.add(jreLibDirName+File.separator+"oblique-fonts"); } fontdirs = (String[])fontConfigDirs.toArray(new String[0]); ---- jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-06-20 21:56:27.000000000 -0700 @@ -119,7 +119,11 @@ } @@ -11758,8 +11880,8 @@ } static final int UNINITIALIZED = -1; ---- jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-04-17 21:43:55.000000000 +0400 -+++ jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-06-27 11:37:43.000000000 -0700 ++++ jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-06-20 21:56:27.000000000 -0700 @@ -38,9 +38,6 @@ */ public class BsdVirtualMachine extends HotSpotVirtualMachine { @@ -11863,8 +11985,8 @@ - isBsdThreads = isBsdThreads(); } } ---- jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -33,7 +33,7 @@ #include #include @@ -11910,8 +12032,8 @@ addr = (void*)&Agent_OnLoad; #else /* Just using &Agent_OnLoad will get the first external symbol with ---- jdk/src/solaris/hpi/include/interrupt.h 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/include/interrupt.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/include/interrupt.h 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/include/interrupt.h 2010-06-20 21:56:27.000000000 -0700 @@ -75,7 +75,7 @@ * N_INTERRUPTS - The number of interrupt channels. These * are numbered from 0 to (N_INTERRUPTS - 1). @@ -11932,8 +12054,8 @@ #ifdef SA_SIGINFO /* Thread implementation dependent interrupt dispatcher. */ void intrDispatchMD(int sig, siginfo_t *info, void *uc); ---- jdk/src/solaris/hpi/include/largefile.h 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/include/largefile.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/include/largefile.h 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/include/largefile.h 2010-06-20 21:56:27.000000000 -0700 @@ -34,6 +34,10 @@ #include "largefile_linux.h" #endif @@ -11945,10 +12067,10 @@ /* * Prototypes for wrappers that we define. These wrapper functions * are low-level I/O routines that will use 64 bit versions if ---- jdk/src/solaris/hpi/include/largefile_bsd.h 2010-04-17 21:43:55.000000000 +0400 -+++ jdk/src/solaris/hpi/include/largefile_bsd.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/include/largefile_bsd.h 2010-06-27 11:37:43.000000000 -0700 ++++ jdk/src/solaris/hpi/include/largefile_bsd.h 2010-06-20 21:56:27.000000000 -0700 @@ -23,14 +23,28 @@ - * have any questions. + * questions. */ -#ifndef _JAVASOFT_LINUX_LARGEFILE_SUPPORT_H_ @@ -11983,8 +12105,8 @@ +#define pwrite64 pwrite + +#endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */ ---- jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-06-20 21:56:27.000000000 -0700 @@ -36,6 +36,8 @@ #define N_TRACED_REGS 12 #elif i386 @@ -12031,8 +12153,8 @@ #ifdef __linux__ extern thread_key_t intrJmpbufkey; ---- jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -58,7 +58,7 @@ { int err; @@ -12042,8 +12164,8 @@ err = pthread_cond_destroy((cond_t *) &condvar->cond); #else err = cond_destroy((cond_t *) condvar); ---- jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -147,7 +147,7 @@ mid->monitor_owner = self; mid->entry_count = 1; @@ -12053,8 +12175,8 @@ if (mid->monitor_owner == self) { mid->entry_count++; return SYS_OK; ---- jdk/src/solaris/hpi/native_threads/src/sys_api_td.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/native_threads/src/sys_api_td.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/native_threads/src/sys_api_td.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/native_threads/src/sys_api_td.c 2010-06-20 21:56:27.000000000 -0700 @@ -39,6 +39,10 @@ #include #endif @@ -12077,10 +12199,10 @@ #ifdef NO_INTERRUPTIBLE_IO #undef CLOSEIO #else ---- jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-04-17 21:43:55.000000000 +0400 -+++ jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-06-27 11:37:43.000000000 -0700 ++++ jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-06-20 21:56:27.000000000 -0700 @@ -23,79 +23,44 @@ - * have any questions. + * questions. */ -/* @@ -12954,8 +13076,8 @@ - - print_lwps(); } ---- jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -54,6 +54,10 @@ #error That can NOT possibly be right. #endif @@ -13037,8 +13159,8 @@ info.isMP = (cpus < 0) ? 1 : (cpus > 1); info.name = "native threads"; ---- jdk/src/solaris/hpi/src/linker_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/src/linker_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/src/linker_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/src/linker_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -44,11 +44,19 @@ #include "threads_md.h" #endif @@ -13105,8 +13227,8 @@ #endif /* * This is a bit of bulletproofing to catch the commonly occurring ---- jdk/src/solaris/hpi/src/memory_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/src/memory_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/src/memory_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/src/memory_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -50,12 +50,24 @@ #include #include /* For perror() */ @@ -13196,8 +13318,8 @@ ret = committedAddr; #else ret = requestedAddr; ---- jdk/src/solaris/hpi/src/system_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/hpi/src/system_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/hpi/src/system_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/hpi/src/system_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -41,6 +41,7 @@ #include @@ -13251,8 +13373,8 @@ fd = open64_w(path, oflag, mode); if (delete != 0) { unlink(path); ---- jdk/src/solaris/instrument/EncodingSupport_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/instrument/EncodingSupport_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/instrument/EncodingSupport_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/instrument/EncodingSupport_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -28,7 +28,10 @@ #include #include @@ -13282,8 +13404,8 @@ /* Open conversion descriptors */ iconvToPlatform = iconv_open(codeset, "UTF-8"); ---- jdk/src/solaris/javavm/export/jvm_md.h 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/javavm/export/jvm_md.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/javavm/export/jvm_md.h 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/javavm/export/jvm_md.h 2010-06-20 21:56:27.000000000 -0700 @@ -39,7 +39,14 @@ #define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"} @@ -13308,8 +13430,8 @@ /* Signals */ ---- jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-04-15 11:35:49.000000000 +0400 -+++ jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -32,10 +32,16 @@ #include @@ -13472,8 +13594,8 @@ } JNIEXPORT jlong JNICALL ---- jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -41,6 +41,11 @@ #include "java_io_FileSystem.h" #include "java_io_UnixFileSystem.h" @@ -13529,8 +13651,8 @@ struct stat sb; if (stat(path, &sb) == 0) { ---- jdk/src/solaris/native/java/io/canonicalize_md.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/io/canonicalize_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/io/canonicalize_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/io/canonicalize_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -33,7 +33,9 @@ #include #include @@ -13541,8 +13663,8 @@ /* Note: The comments in this file use the terminology ---- jdk/src/solaris/native/java/io/io_util_md.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/io/io_util_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/io/io_util_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/io/io_util_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -36,7 +36,7 @@ WITH_PLATFORM_STRING(env, path, ps) { FD fd; @@ -13552,8 +13674,8 @@ /* Remove trailing slashes, since the kernel won't */ char *p = (char *)ps + strlen(ps) - 1; while ((p > ps) && (*p == '/')) ---- jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -28,6 +28,11 @@ #include "jni.h" #include "jni_util.h" @@ -13594,8 +13716,8 @@ jbyteArray var, val; const char * valBeg = varEnd + 1; jsize varLength = varEnd - environ[i]; ---- jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -40,7 +40,11 @@ #include #include @@ -13798,10 +13920,10 @@ /* 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() ---- jdk/src/solaris/native/java/lang/java_props_md.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/lang/java_props_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/lang/java_props_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/lang/java_props_md.c 2010-06-20 21:56:27.000000000 -0700 @@ -23,7 +23,7 @@ - * have any questions. + * questions. */ -#ifdef __linux__ @@ -13933,8 +14055,8 @@ return &sprops; } ---- jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-06-20 21:56:27.000000000 -0700 @@ -35,17 +35,293 @@ #include #include @@ -14291,8 +14413,8 @@ #define SET_NONBLOCKING(fd) { \ int flags = fcntl(fd, F_GETFL); \ flags |= O_NONBLOCK; \ ---- jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-06-20 21:56:28.000000000 -0700 @@ -32,6 +32,9 @@ #include #include @@ -14342,10 +14464,10 @@ } return (*env)->NewStringUTF(env, hostname); } ---- jdk/src/solaris/native/java/net/NetworkInterface.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/net/NetworkInterface.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/net/NetworkInterface.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/net/NetworkInterface.c 2010-06-20 21:56:28.000000000 -0700 @@ -23,13 +23,13 @@ - * have any questions. + * questions. */ +#include @@ -14620,10 +14742,10 @@ memset((char *) &if2, 0, sizeof(if2)); strcpy(if2.ifr_name, name_utf); ---- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-06-20 21:56:28.000000000 -0700 @@ -23,12 +23,12 @@ - * have any questions. + * questions. */ +#include @@ -14728,8 +14850,8 @@ } } } ---- jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-06-20 21:56:28.000000000 -0700 @@ -528,9 +528,11 @@ if (connect_rv == JVM_IO_INTR) { JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException", @@ -14742,8 +14864,8 @@ } else if (errno == ECONNREFUSED) { NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ConnectException", "Connection refused"); ---- jdk/src/solaris/native/java/net/bsd_close.c 2010-04-17 21:43:55.000000000 +0400 -+++ jdk/src/solaris/native/java/net/bsd_close.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/net/bsd_close.c 2010-06-27 11:37:43.000000000 -0700 ++++ jdk/src/solaris/native/java/net/bsd_close.c 2010-06-20 21:56:28.000000000 -0700 @@ -57,7 +57,7 @@ /* * Signal to unblock thread @@ -14753,8 +14875,8 @@ /* * The fd table and the number of file descriptors ---- jdk/src/solaris/native/java/net/net_util_md.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/net/net_util_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/net/net_util_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/net/net_util_md.c 2010-06-20 21:56:28.000000000 -0700 @@ -34,6 +34,15 @@ #include #include @@ -14925,8 +15047,8 @@ return setsockopt(fd, level, opt, arg, len); } ---- jdk/src/solaris/native/java/net/net_util_md.h 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/net/net_util_md.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/net/net_util_md.h 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/net/net_util_md.h 2010-06-20 21:56:28.000000000 -0700 @@ -37,7 +37,7 @@ #endif @@ -14936,8 +15058,8 @@ extern int NET_Timeout(int s, long timeout); extern int NET_Read(int s, void* buf, size_t len); extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, ---- jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/nio/MappedByteBuffer.c 2010-06-20 21:56:28.000000000 -0700 @@ -38,7 +38,11 @@ jlong address, jlong len) { @@ -14962,8 +15084,8 @@ unsigned long lAddress = address; jlong offset = lAddress % pageSize; ---- jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-06-20 21:56:28.000000000 -0700 @@ -47,8 +47,11 @@ return (jint) result; } @@ -15001,8 +15123,8 @@ if (rc < 0) { close(fd); ---- jdk/src/solaris/native/java/util/TimeZone_md.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/java/util/TimeZone_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/java/util/TimeZone_md.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/java/util/TimeZone_md.c 2010-06-20 21:56:28.000000000 -0700 @@ -31,7 +31,7 @@ #include #include @@ -15135,8 +15257,8 @@ sprintf(buf, (const char *)"GMT%c%02d:%02d", sign, (int)(offset/3600), (int)((offset%3600)/60)); return strdup(buf); ---- jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-06-20 21:56:28.000000000 -0700 @@ -25,6 +25,7 @@ #include @@ -15159,8 +15281,8 @@ if (handle == NULL) { return JNI_FALSE; } ---- jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-06-20 21:56:28.000000000 -0700 @@ -31,7 +31,11 @@ #endif /* !HEADLESS */ @@ -15173,8 +15295,8 @@ #ifdef __linux__ /* XXX: Shouldn't be necessary. */ ---- jdk/src/solaris/native/sun/awt/X11Color.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/X11Color.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/X11Color.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/X11Color.c 2010-06-20 21:56:28.000000000 -0700 @@ -33,7 +33,9 @@ #include #include @@ -15185,8 +15307,8 @@ #ifndef HEADLESS #include #include ---- jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-06-21 14:15:44.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-06-20 21:56:28.000000000 -0700 @@ -30,7 +30,11 @@ #include @@ -15199,8 +15321,8 @@ #ifdef DEBUG #include /* To get jio_fprintf() */ ---- jdk/src/solaris/native/sun/awt/awt_Font.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_Font.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_Font.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_Font.c 2010-06-20 21:56:28.000000000 -0700 @@ -334,7 +334,7 @@ if (strcmp(style, "regular") == 0) { altstyle = "roman"; @@ -15210,8 +15332,8 @@ if (!strcmp(family, "lucidasans")) { family = "lucida"; } ---- jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-06-20 21:56:28.000000000 -0700 @@ -40,6 +40,7 @@ #include #include @@ -15336,8 +15458,8 @@ if (pLibRandR == NULL) { J2dRlsTraceLn(J2D_TRACE_ERROR, "X11GD_InitXrandrFuncs: Could not open libXrandr.so.2"); ---- jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-06-20 21:56:28.000000000 -0700 @@ -69,7 +69,7 @@ XIMPreeditDrawCallbackStruct *); static void PreeditCaretCallback(XIC, XPointer, @@ -15577,8 +15699,8 @@ AWT_LOCK(); adjustStatusWindow(window); AWT_UNLOCK(); ---- jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-06-20 21:56:28.000000000 -0700 @@ -260,7 +260,11 @@ } } @@ -15591,8 +15713,8 @@ JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load", "(Ljava/lang/String;)V", ---- jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-06-20 21:56:28.000000000 -0700 @@ -63,8 +63,9 @@ extern JavaVM *jvm; @@ -15613,8 +15735,8 @@ statusWindowEventHandler(xev); #endif xembed_eventHandler(&xev); ---- jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-06-20 21:56:28.000000000 -0700 @@ -32,6 +32,7 @@ #include #include "jni.h" @@ -15637,8 +15759,8 @@ } if (handle == NULL) { ---- jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-06-20 21:56:28.000000000 -0700 @@ -45,7 +45,7 @@ #include "wsutils.h" #include "list.h" @@ -15648,8 +15770,8 @@ #include #endif ---- jdk/src/solaris/native/sun/awt/awt_util.h 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_util.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_util.h 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_util.h 2010-06-20 21:56:28.000000000 -0700 @@ -187,15 +187,20 @@ #ifdef __solaris__ extern Widget awt_util_getXICStatusAreaWindow(Widget w); @@ -15672,8 +15794,8 @@ typedef struct _XmImRefRec { Cardinal num_refs; /* Number of referencing widgets. */ Cardinal max_refs; /* Maximum length of refs array. */ ---- jdk/src/solaris/native/sun/awt/awt_wm.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_wm.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_wm.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_wm.c 2010-06-20 21:56:28.000000000 -0700 @@ -121,12 +121,19 @@ static Atom XA_KWM_WIN_MAXIMIZED; @@ -15771,8 +15893,8 @@ awt_wmgr = OPENLOOK_WM; } else { ---- jdk/src/solaris/native/sun/awt/awt_wm.h 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/awt_wm.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/awt_wm.h 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/awt_wm.h 2010-06-20 21:56:28.000000000 -0700 @@ -45,7 +45,10 @@ KDE2_WM, SAWFISH_WM, @@ -15785,8 +15907,8 @@ }; extern void awt_wm_init(void); ---- jdk/src/solaris/native/sun/awt/extutil.h 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/extutil.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/extutil.h 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/extutil.h 2010-06-20 21:56:28.000000000 -0700 @@ -58,7 +58,7 @@ */ /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ @@ -15802,10 +15924,10 @@ -#endif /* __linux__ */ +#endif /* __linux__ || _ALLBSD_SOURCE */ ---- jdk/src/solaris/native/sun/awt/fontpath.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/fontpath.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/fontpath.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/fontpath.c 2010-06-20 21:56:28.000000000 -0700 @@ -23,7 +23,7 @@ - * have any questions. + * questions. */ -#ifdef __linux__ @@ -15961,8 +16083,8 @@ if (libfontconfig == NULL) { return NULL; } ---- jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-06-20 21:56:28.000000000 -0700 @@ -30,8 +30,9 @@ #include #include "gtk2_interface.h" @@ -15974,8 +16096,8 @@ #define G_TYPE_INVALID G_TYPE_MAKE_FUNDAMENTAL (0) #define G_TYPE_NONE G_TYPE_MAKE_FUNDAMENTAL (1) ---- jdk/src/solaris/native/sun/awt/list.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/list.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/list.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/list.c 2010-06-20 21:56:28.000000000 -0700 @@ -66,7 +66,11 @@ ----------------------------------------------------------------------- **/ @@ -15988,8 +16110,8 @@ #include "list.h" ---- jdk/src/solaris/native/sun/awt/robot_common.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/awt/robot_common.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/awt/robot_common.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/awt/robot_common.c 2010-06-20 21:56:28.000000000 -0700 @@ -27,6 +27,9 @@ #error This file should not be included in headless library #endif @@ -16000,8 +16122,8 @@ #include "robot_common.h" /* ---- jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-06-20 21:56:28.000000000 -0700 @@ -32,7 +32,11 @@ * into X11FontScaler_md.c, which is compiled into another library. */ @@ -16014,8 +16136,8 @@ #include #include ---- jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-06-20 21:56:28.000000000 -0700 @@ -39,7 +39,11 @@ #include "GraphicsPrimitiveMgr.h" #include "glyphblitting.h" @@ -16028,8 +16150,8 @@ JNIEXPORT void JNICALL AWTDrawGlyphList ---- jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-06-20 21:56:28.000000000 -0700 @@ -28,11 +28,11 @@ #include @@ -16045,8 +16167,8 @@ typedef unsigned char jubyte; typedef unsigned short jushort; ---- jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-04-15 11:35:50.000000000 +0400 -+++ jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-06-20 21:56:28.000000000 -0700 @@ -66,6 +66,10 @@ * MLIB_EDGE_SRC_PADDED */ @@ -16152,8 +16274,8 @@ LOGIC(da[0], dtmp, dtmp1, |); } else { /* aligned */ ---- jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-06-20 21:56:28.000000000 -0700 @@ -794,7 +794,7 @@ static int initialized; static int usevis = JNI_TRUE; @@ -16163,8 +16285,8 @@ # define ULTRA_CHIP "sparc64" #else # define ULTRA_CHIP "sun4u" ---- jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-06-20 21:56:28.000000000 -0700 @@ -27,7 +27,10 @@ #define OGLFuncs_md_h_Included @@ -16185,8 +16307,8 @@ } \ OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \ } \ ---- jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-06-20 21:56:28.000000000 -0700 @@ -32,6 +32,7 @@ #include "gdefs.h" @@ -16204,8 +16326,8 @@ } dgaAvailable = JNI_FALSE; if (lib != NULL) { ---- jdk/src/solaris/native/sun/jdga/dgalock.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/jdga/dgalock.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/jdga/dgalock.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/jdga/dgalock.c 2010-06-20 21:56:28.000000000 -0700 @@ -44,6 +44,7 @@ #include @@ -16228,8 +16350,8 @@ void *sym = dlsym(handle, "IsXineramaOn"); IsXineramaOn = (IsXineramaOnFunc *)sym; if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) { ---- jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-06-20 21:56:28.000000000 -0700 @@ -26,6 +26,10 @@ #include #include @@ -16241,8 +16363,8 @@ #include "jni.h" #include "jni_util.h" #include "sun_management_FileSystemImpl.h" ---- jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-06-20 21:56:28.000000000 -0700 @@ -33,7 +33,7 @@ #include #endif @@ -16252,8 +16374,8 @@ #include #endif ---- jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-06-20 21:56:28.000000000 -0700 @@ -26,11 +26,12 @@ #include "jni.h" #include "jni_util.h" @@ -16280,8 +16402,8 @@ gconf_ver = 2; } if (gconf_ver > 0) { ---- jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-06-20 21:56:28.000000000 -0700 @@ -35,7 +35,7 @@ #include #include @@ -16331,8 +16453,8 @@ } #endif ---- jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-04-15 03:35:51.000000000 -0400 -+++ jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-05-13 14:13:21.000000000 -0400 +--- jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-06-20 21:56:28.000000000 -0700 @@ -72,7 +72,7 @@ m.msg_accrightslen = 0; #endif @@ -16351,8 +16473,8 @@ m.msg_control = NULL; m.msg_controllen = 0; #endif ---- jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-05-13 14:13:26.000000000 -0400 +--- jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-06-20 21:56:28.000000000 -0700 @@ -26,15 +26,21 @@ #include "jni.h" #include "jni_util.h" @@ -16494,8 +16616,8 @@ if (lockResult < 0) { JNU_ThrowIOExceptionWithLastError(env, "Release failed"); } ---- jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/nio/ch/FileDispatcher.c 2010-06-20 21:56:28.000000000 -0700 @@ -32,8 +32,12 @@ #include #include @@ -16509,8 +16631,8 @@ static int preCloseFD = -1; /* File descriptor to which we dup other fd's before closing them for real */ ---- jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-06-20 21:56:28.000000000 -0700 @@ -30,6 +30,10 @@ #include "nio_util.h" #include "sun_nio_ch_FileKey.h" @@ -16522,8 +16644,8 @@ static jfieldID key_st_dev; /* id for FileKey.st_dev */ static jfieldID key_st_ino; /* id for FileKey.st_ino */ ---- jdk/src/solaris/native/sun/nio/ch/Net.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/nio/ch/Net.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/nio/ch/Net.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/nio/ch/Net.c 2010-06-20 21:56:28.000000000 -0700 @@ -140,8 +140,31 @@ SOCKADDR sa; int sa_len = SOCKADDR_LEN; @@ -16665,8 +16787,8 @@ case ECONNREFUSED: xn = JNU_JAVANETPKG "ConnectException"; break; ---- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-06-20 21:56:28.000000000 -0700 @@ -26,7 +26,9 @@ #include #include @@ -16677,8 +16799,8 @@ #include "NativeFunc.h" /* standard GSS method names (ordering is from mapfile) */ ---- jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-20 21:56:28.000000000 -0700 @@ -28,12 +28,19 @@ #include @@ -16721,8 +16843,8 @@ (*env)->ReleaseStringUTFChars(env, jLibName, libName); dprintf2("-handle: %u (0X%X)\n", hModule, hModule); ---- jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-06-20 21:56:28.000000000 -0700 @@ -64,7 +64,9 @@ #include @@ -16733,8 +16855,8 @@ #include ---- jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-06-21 14:15:45.000000000 -0700 ++++ jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-06-20 21:56:28.000000000 -0700 @@ -29,7 +29,9 @@ #include @@ -16745,8 +16867,8 @@ #include ---- jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-04-17 21:43:55.000000000 +0400 -+++ jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-06-27 11:37:43.000000000 -0700 ++++ jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-06-20 21:56:28.000000000 -0700 @@ -35,10 +35,10 @@ #include #include @@ -17051,8 +17173,8 @@ + JNU_ReleaseStringPlatformChars(env, path, _path); + } +} ---- jdk/src/solaris/native/sun/xawt/XWindow.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/xawt/XWindow.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/xawt/XWindow.c 2010-06-21 14:15:46.000000000 -0700 ++++ jdk/src/solaris/native/sun/xawt/XWindow.c 2010-06-20 21:56:28.000000000 -0700 @@ -228,10 +228,10 @@ {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD}, @@ -17077,8 +17199,8 @@ /* The following code on Linux will cause the keypad keys * not to echo on JTextField when the NumLock is on. The * keysyms will be 0, because the last parameter 2 is not defined. ---- jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-06-21 14:15:46.000000000 -0700 ++++ jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-06-20 21:56:28.000000000 -0700 @@ -24,6 +24,7 @@ */ @@ -17105,8 +17227,8 @@ if (gnome_handle == NULL) { #ifdef INTERNAL_BUILD fprintf(stderr, "can not load libgnome-2.so\n"); ---- jdk/src/solaris/npt/npt_md.h 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/npt/npt_md.h 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/npt/npt_md.h 2010-06-21 14:15:46.000000000 -0700 ++++ jdk/src/solaris/npt/npt_md.h 2010-06-20 21:56:28.000000000 -0700 @@ -32,9 +32,10 @@ #include #include @@ -17129,8 +17251,8 @@ if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \ _sym = dlsym(_handle, "nptInitialize"); \ if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \ ---- jdk/src/solaris/transport/socket/socket_md.c 2010-04-15 11:35:51.000000000 +0400 -+++ jdk/src/solaris/transport/socket/socket_md.c 2010-04-17 21:48:09.000000000 +0400 +--- jdk/src/solaris/transport/socket/socket_md.c 2010-06-21 14:15:46.000000000 -0700 ++++ jdk/src/solaris/transport/socket/socket_md.c 2010-06-20 21:56:28.000000000 -0700 @@ -36,7 +36,7 @@ #ifdef __solaris__ #include @@ -17149,8 +17271,8 @@ int dbgsysTlsAlloc() { pthread_key_t key; ---- langtools/src/share/classes/com/sun/tools/javah/Util.java 2010-04-15 11:36:33.000000000 +0400 -+++ langtools/src/share/classes/com/sun/tools/javah/Util.java 2010-04-17 21:48:09.000000000 +0400 +--- langtools/src/share/classes/com/sun/tools/javah/Util.java 2010-06-21 14:16:21.000000000 -0700 ++++ langtools/src/share/classes/com/sun/tools/javah/Util.java 2010-06-20 21:56:28.000000000 -0700 @@ -180,6 +180,14 @@ os = "win32"; } else if (os.indexOf("Linux") >= 0) { --- openjdk6-b20.patch ends here --- From owner-freebsd-java@FreeBSD.ORG Mon Jun 28 05:53:23 2010 Return-Path: Delivered-To: java@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7720D1065676; Mon, 28 Jun 2010 05:53:23 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 502888FC18; Mon, 28 Jun 2010 05:53:23 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o5S5rMWE089600; Mon, 28 Jun 2010 05:53:22 GMT (envelope-from glewis@freefall.freebsd.org) Received: (from glewis@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o5S5rMHb089596; Mon, 28 Jun 2010 05:53:22 GMT (envelope-from glewis) Date: Mon, 28 Jun 2010 05:53:22 GMT Message-Id: <201006280553.o5S5rMHb089596@freefall.freebsd.org> To: glewis@FreeBSD.org, java@FreeBSD.org, glewis@FreeBSD.org From: glewis@FreeBSD.org Cc: Subject: Re: ports/148202: [PATCH] java/openjdk6: update to b20 X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 05:53:23 -0000 Synopsis: [PATCH] java/openjdk6: update to b20 Responsible-Changed-From-To: java->glewis Responsible-Changed-By: glewis Responsible-Changed-When: Mon Jun 28 05:53:13 UTC 2010 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=148202 From owner-freebsd-java@FreeBSD.ORG Mon Jun 28 11:06:56 2010 Return-Path: Delivered-To: freebsd-java@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 672041065673 for ; Mon, 28 Jun 2010 11:06:56 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5593A8FC1D for ; Mon, 28 Jun 2010 11:06:56 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o5SB6u3o086567 for ; Mon, 28 Jun 2010 11:06:56 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o5SB6tRZ086565 for freebsd-java@FreeBSD.org; Mon, 28 Jun 2010 11:06:55 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 28 Jun 2010 11:06:55 GMT Message-Id: <201006281106.o5SB6tRZ086565@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: freebsd-java@FreeBSD.org Cc: Subject: Current problem reports assigned to freebsd-java@FreeBSD.org X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 11:06:56 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o java/147512 java Crash of RXTX-2.1-7 on AMD64 system f ports/142704 java [PATCH] java/jai-imageio: use $SUB_FILES to dynamicall o java/141919 java Serious remote vulnerability in the JRE o java/138729 java java/jdk16: setting 'export AWT_TOOLKIT=MToolkit' caus o java/138728 java java/jdk16: SIGSEGV in java runtime o java/128948 java java/jdk16 built from source can't bind a socket, but o java/128809 java JVM aborted when GNU RXTX write to serial port. o java/123555 java linux-sun-jdk15, linux-sun-jdk16 produce a coredump o java/122513 java native JDKs unbuildable with Linux ones o java/121692 java java/jdk16: Java 1.5 1.5.0.14p8 crashes in RMI TCP Con o ports/121420 java java/jdk16: Java applet fails to find class under fire o ports/121416 java java/jdk15 can't build if BIN environment variable is o ports/120372 java java/linux-sun-jdk16: linux-sun-jre1.6.0 plugin doesn' o java/120146 java java/jdk15: netbeans 6.0 causes java core dump on amd6 o ports/119732 java java/linux-sun-jre16: linux-sun-jre16 plugin doesn't w o java/119063 java An unexpected error has been detected by Java Runtime o java/118956 java eclipse and netbeans break on diablo-jdk15 o java/118496 java Eclipse packages do not work with 6.3-RC1/amd64 o ports/116841 java cannot build java/jdk16 by using java/linux-sun-jdk16 o java/116667 java linux-sun-javac1.4 hangs on SMP o ports/116082 java java/linux-sun-jdk16 jconsole is unable to connect to o java/115773 java [request] java.nio channel selectors should use kqueue o java/114644 java tomcat goes out of PermSpace, jvm crashes o ports/113751 java java/linux-sun-jdk15: linux-sun-jdk-1.5.0.12,2 - java o ports/113467 java Multiple "missing return value" errors building JDK on f java/112595 java Java appletviewer frequently hangs (kse_release loop) o java/110912 java Java krb5 client leaks UDP connections f java/105482 java diablo-jdk1.5.0/jdk-1.5.0 java.nio.Selector bug o java/97461 java Diablo JDK does not report Update level in a format su o ports/84742 java make ports/java/jdk14 use dynamic Motif librarires s java/62837 java linux-sun-jdk14 executables hang with COMPAT_LINUX in 31 problems total. From owner-freebsd-java@FreeBSD.ORG Mon Jun 28 15:55:23 2010 Return-Path: Delivered-To: freebsd-java@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 982BB106564A for ; Mon, 28 Jun 2010 15:55:23 +0000 (UTC) (envelope-from mike.jakubik@intertainservices.com) Received: from mail.intertainservices.com (mail.intertainservices.com [38.99.187.35]) by mx1.freebsd.org (Postfix) with ESMTP id 6CB2A8FC20 for ; Mon, 28 Jun 2010 15:55:23 +0000 (UTC) Received: from [172.16.10.199] (unknown [172.16.10.199]) by mail.intertainservices.com (Postfix) with ESMTPA id 15DF9564A9 for ; Mon, 28 Jun 2010 11:55:22 -0400 (EDT) Message-ID: <4C28C5D5.8040406@intertainservices.com> Date: Mon, 28 Jun 2010 11:55:01 -0400 From: Mike Jakubik User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.10) Gecko/20100512 Thunderbird/3.0.5 MIME-Version: 1.0 To: freebsd-java@freebsd.org References: <201006280553.o5S5rMHb089596@freefall.freebsd.org> In-Reply-To: <201006280553.o5S5rMHb089596@freefall.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-intertainservices-MailScanner-Information: Please contact the ISP for more information X-intertainservices-MailScanner-ID: 15DF9564A9.A1AB6 X-intertainservices-MailScanner: Found to be clean X-intertainservices-MailScanner-From: mike.jakubik@intertainservices.com X-Spam-Status: No Subject: Re: ports/148202: [PATCH] java/openjdk6: update to b20 X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 15:55:23 -0000 Thank you for maintaning this port. The software that sustains the company i work for is written in Java. Since Diablo is dead, if it wasn't for this port i would be forced to use Linux. On 6/28/2010 1:53 AM, glewis@FreeBSD.org wrote: > Synopsis: [PATCH] java/openjdk6: update to b20 > > Responsible-Changed-From-To: java->glewis > Responsible-Changed-By: glewis > Responsible-Changed-When: Mon Jun 28 05:53:13 UTC 2010 > Responsible-Changed-Why: > I'll take it. > > http://www.freebsd.org/cgi/query-pr.cgi?pr=148202 > _______________________________________________ > freebsd-java@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-java > To unsubscribe, send any mail to "freebsd-java-unsubscribe@freebsd.org" > From owner-freebsd-java@FreeBSD.ORG Mon Jun 28 23:17:45 2010 Return-Path: Delivered-To: freebsd-java@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F9151065678 for ; Mon, 28 Jun 2010 23:17:45 +0000 (UTC) (envelope-from lists@mawer.org) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id E26608FC16 for ; Mon, 28 Jun 2010 23:17:44 +0000 (UTC) Received: by vws13 with SMTP id 13so8415962vws.13 for ; Mon, 28 Jun 2010 16:17:38 -0700 (PDT) MIME-Version: 1.0 Received: by 10.220.127.18 with SMTP id e18mr3339412vcs.135.1277767058574; Mon, 28 Jun 2010 16:17:38 -0700 (PDT) Received: by 10.220.194.5 with HTTP; Mon, 28 Jun 2010 16:17:38 -0700 (PDT) In-Reply-To: <4C28C5D5.8040406@intertainservices.com> References: <201006280553.o5S5rMHb089596@freefall.freebsd.org> <4C28C5D5.8040406@intertainservices.com> Date: Tue, 29 Jun 2010 09:17:38 +1000 Message-ID: From: Antony Mawer To: Mike Jakubik Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-java@freebsd.org Subject: Re: ports/148202: [PATCH] java/openjdk6: update to b20 X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jun 2010 23:17:45 -0000 On Tue, Jun 29, 2010 at 1:55 AM, Mike Jakubik wrote: > Thank you for maintaning this port. The software that sustains the company i > work for is written in Java. Since Diablo is dead, if it wasn't for this > port i would be forced to use Linux. Agreed... a current Java port in this day and age is a must have for any OS to be considered seriously in most enterprises... -- Antony From owner-freebsd-java@FreeBSD.ORG Fri Jul 2 07:26:30 2010 Return-Path: Delivered-To: freebsd-java@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0897D1065674 for ; Fri, 2 Jul 2010 07:26:30 +0000 (UTC) (envelope-from pookme@hotmail.com) Received: from snt0-omc1-s3.snt0.hotmail.com (snt0-omc1-s3.snt0.hotmail.com [65.55.90.14]) by mx1.freebsd.org (Postfix) with ESMTP id 98C7C8FC08 for ; Fri, 2 Jul 2010 07:26:29 +0000 (UTC) Received: from SNT128-W35 ([65.55.90.9]) by snt0-omc1-s3.snt0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 2 Jul 2010 00:14:29 -0700 Message-ID: X-Originating-IP: [70.81.170.111] From: Shant Kassardjian Sender: To: Date: Fri, 2 Jul 2010 07:14:28 +0000 Importance: Normal MIME-Version: 1.0 X-OriginalArrivalTime: 02 Jul 2010 07:14:29.0237 (UTC) FILETIME=[36166250:01CB19B6] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: diablo-JRE-16 BUG report X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2010 07:26:30 -0000 Hello=2C I would like to report the following bug. Please let me know if you require= additional information. Thank you. # # An unexpected error has been detected by Java Runtime Environment: # # SIGSEGV (0xb) at pc=3D0x0000000801082e07=2C pid=3D7058=2C tid=3D0xa57cc0 # # Java VM: Diablo Java HotSpot(TM) 64-Bit Server VM (10.0-b23 mixed mode bs= d-amd64) # Problematic frame: # V [libjvm.so+0x482e07] # # Please submit bug reports to freebsd-java@FreeBSD.org # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # --------------- T H R E A D --------------- Current thread (0x0000000800a71400): JavaThread "CompilerThread1" daemon [= _thread_in_native=2C id=3D10845376=2C stack(0x00007fffff2f7000=2C0x00007fff= ff3f7000)] siginfo:si_signo=3DSIGSEGV: si_errno=3D0=2C si_code=3D1 (SEGV_MAPERR)=2C si= _addr=3D0x0000000000000008 Registers: RAX=3D0x0000000000000000=2C RBX=3D0x00007fffff3f4af0=2C RCX=3D0x00000000000= 00000=2C RDX=3D0x0000000844e777e0 RSP=3D0x00007fffff3f3360=2C RBP=3D0x00007fffff3f3390=2C RSI=3D0x00000000000= 00000=2C RDI=3D0x0000000844e7d4f0 R8 =3D0x0000000000000000=2C R9 =3D0x0000000000000001=2C R10=3D0x0000000844e= 97518=2C R11=3D0x0000000844e80b70 R12=3D0x0000000844e97518=2C R13=3D0x0000000844291d58=2C R14=3D0x0000000844e= 9aa18=2C R15=3D0x00007fffff3f4b10 RIP=3D0x0000000801082e07=2C EFL=3D0x003b003b00000001=2C ERR=3D0x00000000000= 00004 TRAPNO=3D0x001b00130000000c Top of Stack: (sp=3D0x00007fffff3f3360) 0x00007fffff3f3360: 00007fffff3f3390 0000000000000008 0x00007fffff3f3370: 0000000844e99bf8 0000000844e9aa18 0x00007fffff3f3380: 0000000000000001 00007fffff3f3620 0x00007fffff3f3390: 00007fffff3f3400 0000000801083460 0x00007fffff3f33a0: 00007fffff3f3600 00007fffff3f5478 0x00007fffff3f33b0: 0000000000000000 00007fffff3f3600 0x00007fffff3f33c0: 00007fffff3f3640 00007fffff3f4af0 0x00007fffff3f33d0: 00000001ff3f4af0 0000000000000001 0x00007fffff3f33e0: 00007fffff3f4af0 0000000843b2b880 0x00007fffff3f33f0: 00007fffff3f3600 00007fffff3f3620 0x00007fffff3f3400: 00007fffff3f36a0 000000080108a4c0 0x00007fffff3f3410: 00007fffff3f3640 01007fffff3f4ac8 0x00007fffff3f3420: 0000000000000000 00007fffff3f40f0 0x00007fffff3f3430: 00007fffff3f4b10 000000084427cde0 0x00007fffff3f3440: 000000084427e910 000000084427e128 0x00007fffff3f3450: 00007fffff3f40f0 000000084427e180 0x00007fffff3f3460: 00007fffff3f34a0 00000008010d2c66 0x00007fffff3f3470: 00007fffff3f34a0 00000008011df162 0x00007fffff3f3480: 00007fffff3f34a0 00000008011df348 0x00007fffff3f3490: 00007fffff3f34c0 00000008011df162 0x00007fffff3f34a0: 00007fffff3f34c0 00000008011df348 0x00007fffff3f34b0: 00007fffff3f3500 0000000800f0aabb 0x00007fffff3f34c0: 00007fffff3f3610 0000000800e092c3 0x00007fffff3f34d0: 000000084427cab0 0000000844293378 0x00007fffff3f34e0: 00000008442937b0 00007fffff3f4a58 0x00007fffff3f34f0: 00007fffff3f40f0 0100000000000003 0x00007fffff3f3500: 00007fffff3f40f0 000000020001d411 0x00007fffff3f3510: 00007fffff3f3520 00000008011de83a 0x00007fffff3f3520: 00007fffff3f3580 0000000800eb6151 0x00007fffff3f3530: 00007fffff3f40f0 0000000043b2b810 0x00007fffff3f3540: 0000000000000000 00000008011de83a 0x00007fffff3f3550: 00007fffff3f35b0 0000006000eb6151=20 Instructions: (pc=3D0x0000000801082e07) 0x0000000801082df7: 3c c5 00 00 00 00 48 03 bb c8 09 00 00 48 8b 0f 0x0000000801082e07: 48 8b 41 08 48 83 38 00 75 24 8b 73 28 8b 41 28=20 Stack: [0x00007fffff2f7000=2C0x00007fffff3f7000]=2C sp=3D0x00007fffff3f336= 0=2C free space=3D1008k Native frames: (J=3Dcompiled Java code=2C j=3Dinterpreted=2C Vv=3DVM code= =2C C=3Dnative code) V [libjvm.so+0x482e07] V [libjvm.so+0x483460] V [libjvm.so+0x48a4c0] V [libjvm.so+0x25df97] V [libjvm.so+0x25f8fd] V [libjvm.so+0x1fac98] V [libjvm.so+0x26377d] V [libjvm.so+0x264505] V [libjvm.so+0x5d6bad] V [libjvm.so+0x4e53f6] Current CompileTask: C2: 54 com.inmethod.air.video.common.mkv.ebml.VariableLengthInteger.fr= omEncoded(J)Lcom/inmethod/air/video/common/mkv/ebml/VariableLengthInteger= =3B (79 bytes) --------------- P R O C E S S --------------- Java Threads: ( =3D> current thread ) 0x00000008447bcc00 JavaThread "btpool0-1" [_thread_in_Java=2C id=3D114462= 9952=2C stack(0x00007ffffe9ee000=2C0x00007ffffeaee000)] 0x0000000800a74000 JavaThread "DestroyJavaVM" [_thread_blocked=2C id=3D10= 530368=2C stack(0x00007fffffaff000=2C0x00007fffffbff000)] 0x0000000800a6f000 JavaThread "SleepDetectorThread" daemon [_thread_block= ed=2C id=3D10842688=2C stack(0x00007ffffebf0000=2C0x00007ffffecf0000)] 0x0000000800a6fc00 JavaThread "btpool0-0 - Acceptor0 SocketConnector@0.0.= 0.0:45631" [_thread_in_native=2C id=3D10844032=2C stack(0x00007ffffedf2000= =2C0x00007ffffeef2000)] 0x0000000800a70400 JavaThread "Subtitle Server Listener" daemon [_thread_= in_native=2C id=3D10843584=2C stack(0x00007ffffeef3000=2C0x00007ffffeff3000= )] 0x0000000800a70c00 JavaThread "actionManagerTimer" daemon [_thread_blocke= d=2C id=3D10844480=2C stack(0x00007ffffeff4000=2C0x00007fffff0f4000)] 0x0000000800a73800 JavaThread "Low Memory Detector" daemon [_thread_block= ed=2C id=3D10844928=2C stack(0x00007fffff1f6000=2C0x00007fffff2f6000)] =3D>0x0000000800a71400 JavaThread "CompilerThread1" daemon [_thread_in_nati= ve=2C id=3D10845376=2C stack(0x00007fffff2f7000=2C0x00007fffff3f7000)] 0x0000000800a71c00 JavaThread "CompilerThread0" daemon [_thread_blocked= =2C id=3D10845824=2C stack(0x00007fffff3f8000=2C0x00007fffff4f8000)] 0x0000000800a72400 JavaThread "Signal Dispatcher" daemon [_thread_blocked= =2C id=3D10846272=2C stack(0x00007fffff4f9000=2C0x00007fffff5f9000)] 0x0000000800a72800 JavaThread "Finalizer" daemon [_thread_blocked=2C id= =3D10846720=2C stack(0x00007fffff5fa000=2C0x00007fffff6fa000)] 0x0000000800a73000 JavaThread "Reference Handler" daemon [_thread_blocked= =2C id=3D10847168=2C stack(0x00007fffff6fb000=2C0x00007fffff7fb000)] Other Threads: 0x0000000800af2000 VMThread [stack: 0x00007fffff7fc000=2C0x00007fffff8fc0= 00] [id=3D10847616] 0x0000000800af1800 WatcherThread [stack: 0x00007fffff0f5000=2C0x00007ffff= f1f5000] [id=3D10848960] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap PSYoungGen total 17088K=2C used 7651K [0x0000000830500000=2C 0x000000= 0831810000=2C 0x0000000843650000) eden space 14656K=2C 42% used [0x0000000830500000=2C0x0000000830b08c18=2C= 0x0000000831350000) from space 2432K=2C 60% used [0x0000000831350000=2C0x00000008314c0030=2C0= x00000008315b0000) to space 2432K=2C 0% used [0x00000008315b0000=2C0x00000008315b0000=2C0x= 0000000831810000) PSOldGen total 39040K=2C used 0K [0x000000080a250000=2C 0x000000080= c870000=2C 0x0000000830500000) object space 39040K=2C 0% used [0x000000080a250000=2C0x000000080a250000= =2C0x000000080c870000) PSPermGen total 21248K=2C used 9005K [0x0000000804e50000=2C 0x000000= 0806310000=2C 0x000000080a250000) object space 21248K=2C 42% used [0x0000000804e50000=2C0x000000080571b650= =2C0x0000000806310000) Dynamic libraries: 0x0000000000400000 /usr/local/diablo-jre1.6.0/bin/java 0x0000000800657000 /lib/libthr.so.3 0x000000080076f000 /lib/libc.so.7 0x0000000800c00000 /usr/local/diablo-jre1.6.0/lib/amd64/server/libjvm.s= o 0x00000008014a4000 /usr/lib/libstdc++.so.6 0x00000008016af000 /lib/libm.so.5 0x00000008017ce000 /lib/libgcc_s.so.1 0x00000008018db000 /usr/local/diablo-jre1.6.0/lib/amd64/native_threads/= libhpi.so 0x00000008019e8000 /usr/local/diablo-jre1.6.0/lib/amd64/libverify.so 0x0000000801af9000 /usr/local/diablo-jre1.6.0/lib/amd64/libjava.so 0x0000000801c2d000 /usr/local/diablo-jre1.6.0/lib/amd64/libzip.so 0x0000000801d36000 /usr/local/lib/compat/libz.so.4 0x0000000844400000 /usr/local/diablo-jre1.6.0/lib/amd64/libnet.so 0x0000000845000000 /usr/local/diablo-jre1.6.0/lib/amd64/libnio.so 0x0000000800511000 /libexec/ld-elf.so.1 VM Arguments: java_command: /home/AirVideo/AirVideoServerLinux.jar /home/AirVideo/test.pr= operties Launcher Type: SUN_STANDARD Environment Variables: JAVA_HOME=3D/usr/local/diablo-jre1.6.0 PATH=3D/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/= bin:/root/bin LD_LIBRARY_PATH=3D/usr/local/diablo-jre1.6.0/lib/amd64/server:/usr/local/di= ablo-jre1.6.0/lib/amd64:/usr/local/diablo-jre1.6.0/../lib/amd64 SHELL=3D/bin/csh HOSTTYPE=3DFreeBSD OSTYPE=3DFreeBSD MACHTYPE=3Dunknown Signal Handlers: SIGSEGV: [libjvm.so+0x617aa0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x00= 000042 SIGBUS: [libjvm.so+0x617aa0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x000= 00042 SIGFPE: [libjvm.so+0x4e17a0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x000= 00042 SIGPIPE: [libjvm.so+0x4e17a0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x00= 000042 SIGXFSZ: [libjvm.so+0x4e17a0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x00= 000042 SIGILL: [libjvm.so+0x4e17a0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x000= 00042 SIGUSR1: SIG_DFL=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x00000000 SIGUSR2: [libjvm.so+0x4e3fa0]=2C sa_mask[0]=3D0x00000000=2C sa_flags=3D0x00= 000042 SIGHUP: [libjvm.so+0x4e2ca0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x000= 00042 SIGINT: [libjvm.so+0x4e2ca0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x000= 00042 SIGTERM: [libjvm.so+0x4e2ca0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x00= 000042 SIGQUIT: [libjvm.so+0x4e2ca0]=2C sa_mask[0]=3D0xfffefeff=2C sa_flags=3D0x00= 000042 --------------- S Y S T E M --------------- OS:Bsd uname:FreeBSD 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Tue Jun 22 21:38:07= EDT 2010 root@core.skylab.ca:/usr/obj/usr/src/sys/SKYLAB amd64 rlimit: STACK 524288k=2C CORE infinity=2C NPROC 5547=2C NOFILE 32768 CPU:total 2 (2 cores per cpu=2C 1 threads per core) family 6 model 7 steppi= ng 6=2C cmov=2C cx8=2C fxsr=2C mmx=2C sse=2C sse2=2C sse3=2C ssse3 Memory: 4k page=2C physical 3745932k(936483k free) vm_info: Diablo Java HotSpot(TM) 64-Bit Server VM (10.0-b23) for bsd-amd64 = JRE (1.6.0_07-b02)=2C built on May 12 2008 20:56:50 by "truk" with gcc 4.2.= 1 20070719 [FreeBSD] time: Fri Jul 2 03:01:44 2010 elapsed time: 57 seconds =20 _________________________________________________________________ MSN Dating: Find someone special. Start now. http://go.microsoft.com/?linkid=3D9734384=