From owner-freebsd-java@FreeBSD.ORG Wed Jun 6 20:53:10 2007 Return-Path: X-Original-To: freebsd-java@FreeBSD.org Delivered-To: freebsd-java@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC07516A41F for ; Wed, 6 Jun 2007 20:53:10 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.freebsd.org (Postfix) with ESMTP id 97BD013C489 for ; Wed, 6 Jun 2007 20:53:08 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from niksun.com (anuket [10.70.0.5]) by anuket.mj.niksun.com (8.13.6/8.13.6) with ESMTP id l56Kr1we090525; Wed, 6 Jun 2007 16:53:01 -0400 (EDT) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: freebsd-java@FreeBSD.org Date: Wed, 6 Jun 2007 16:52:55 -0400 User-Agent: KMail/1.6.2 References: <20070605062508.GA46961@misty.eyesbeyond.com> In-Reply-To: <20070605062508.GA46961@misty.eyesbeyond.com> MIME-Version: 1.0 Content-Disposition: inline Content-Type: Multipart/Mixed; boundary="Boundary-00=_q6xZGbyZdf4gRr1" Message-Id: <200706061652.58614.jkim@FreeBSD.org> X-Virus-Scanned: ClamAV 0.90.2/3369/Wed Jun 6 15:12:37 2007 on anuket.mj.niksun.com X-Virus-Status: Clean Cc: Subject: Re: Please test the 'current' jdk 1.5 patchset 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: Wed, 06 Jun 2007 20:53:11 -0000 --Boundary-00=_q6xZGbyZdf4gRr1 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Tuesday 05 June 2007 02:25 am, Greg Lewis wrote: > I realise that Update 12 was just released, but I think its worth > getting the newer patchset out now and switch to Update 12 > afterwards rather than stopping the release cycle at this point. I have built Update 12 with the same patchset + patches from ports + the attached additional patches: %java -version java version "1.5.0_12-p5" Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_12-p5-jkim_06_jun_2007_12_43) Java HotSpot(TM) 64-Bit Server VM (build 1.5.0_12-p5-jkim_06_jun_2007_12_43, mixed mode) %sysctl kern.osreldate kern.osreldate: 700043 Can we just skip Update 11? Thanks, Jung-uk Kim --Boundary-00=_q6xZGbyZdf4gRr1 Content-Type: text/plain; charset="iso-8859-1"; name="patch-version" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-version" --- control/make/common/Defs-bsd.gmk.orig Wed Jun 6 02:29:37 2007 +++ control/make/common/Defs-bsd.gmk Wed Jun 6 11:27:46 2007 @@ -43,7 +43,7 @@ endif # Versioning -JDK_UPDATE_VERSION=11 +JDK_UPDATE_VERSION=12 MILESTONE=p5 # define these to avoid picking up ones from aliases or from --- j2se/make/common/Defs-bsd.gmk.orig Wed Jun 6 12:32:09 2007 +++ j2se/make/common/Defs-bsd.gmk Wed Jun 6 12:40:26 2007 @@ -22,7 +22,7 @@ # LDLIBS_COMMON (set $(EXTRA_LIBS) instead) # Versioning -JDK_UPDATE_VERSION=11 +JDK_UPDATE_VERSION=12 # statically link libstdc++ before C++ ABI is stablized on Linux STATIC_CXX = false --Boundary-00=_q6xZGbyZdf4gRr1 Content-Type: text/plain; charset="iso-8859-1"; name="patch-setup_fpu" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-setup_fpu" --- hotspot/src/os_cpu/bsd_amd64/vm/os_bsd_amd64.hpp.orig Tue Jun 5 19:48:40 2007 +++ hotspot/src/os_cpu/bsd_amd64/vm/os_bsd_amd64.hpp Tue Jun 5 20:34:20 2007 @@ -6,6 +6,7 @@ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. */ + static void setup_fpu() {} // Used to register dynamic code cache area with the OS // Note: Currently only used in 64 bit Windows implementations --- hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig Tue Jun 5 19:48:40 2007 +++ hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp Tue Jun 5 20:41:10 2007 @@ -951,3 +951,9 @@ cmpxchg_long_func_t* os::atomic_cmpxchg_long_func = os::atomic_cmpxchg_long_bootstrap; add_func_t* os::atomic_add_func = os::atomic_add_bootstrap; fence_func_t* os::fence_func = os::fence_bootstrap; + +void os::setup_fpu() { + address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std(); + __asm__ volatile ( "fldcw (%0)" : + : "r" (fpu_cntrl) : "memory"); +} --- hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.hpp.orig Tue Jun 5 19:48:40 2007 +++ hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.hpp Tue Jun 5 20:40:37 2007 @@ -21,6 +21,8 @@ static jint atomic_add_bootstrap (jint, volatile jint*); static void fence_bootstrap (); + static void setup_fpu(); + static bool supports_sse(); static bool is_allocatable(size_t bytes); --Boundary-00=_q6xZGbyZdf4gRr1--