From owner-svn-ports-head@freebsd.org Fri Aug 26 18:29:47 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE03AA9458D; Fri, 26 Aug 2016 18:29:47 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7BD56298D; Fri, 26 Aug 2016 18:29:47 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7QITki3036505; Fri, 26 Aug 2016 18:29:46 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7QITkD3036503; Fri, 26 Aug 2016 18:29:46 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201608261829.u7QITkD3036503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 26 Aug 2016 18:29:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420940 - in head/java/openjdk8: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Aug 2016 18:29:47 -0000 Author: jkim Date: Fri Aug 26 18:29:46 2016 New Revision: 420940 URL: https://svnweb.freebsd.org/changeset/ports/420940 Log: Make the FPU hack for ARM optional. Note this hack is not necessary for VFPv3 or later, i.e., only VFPv1 and VFPv2 require this hack. https://svnweb.freebsd.org/changeset/base/288983 Added: head/java/openjdk8/files/fpuhack.patch - copied, changed from r420939, head/java/openjdk8/files/armv6.patch Deleted: head/java/openjdk8/files/armv6.patch Modified: head/java/openjdk8/Makefile Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Fri Aug 26 18:14:36 2016 (r420939) +++ head/java/openjdk8/Makefile Fri Aug 26 18:29:46 2016 (r420940) @@ -234,10 +234,14 @@ CONFIGURE_SCRIPT= ../../configure CONFIGURE_WRKSRC= ${WRKSRC}/common/autoconf OPTIONS_DEFINE= POLICY TZUPDATE +OPTIONS_DEFINE_armv6= FPUHACK OPTIONS_DEFAULT= POLICY TZUPDATE +OPTIONS_DEFAULT_armv6= FPUHACK +FPUHACK_DESC= Hack denormalized numbers in flush-to-zero mode POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data +FPUHACK_EXTRA_PATCHES= ${PATCHDIR}/fpuhack.patch POLICY_CONFIGURE_ENABLE= unlimited-crypto TZUPDATE_RUN_DEPENDS= java-zoneinfo>0:java/java-zoneinfo @@ -293,16 +297,6 @@ CONFIGURE_ARGS+= --with-boot-jdk-jvmargs MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m" .endif -.if ${ARCH} == "armv6" -# From NetBSD http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/lang/openjdk7/hacks.mk -# Workaround incorrect constant folding of subnormals in javac when the FPU -# does not handle subnormal arithmetic, like on ARM in Flush-to-zero mode. -# These workarounds avoid underflow conditions during the bootstrap so the -# JDK can correctly build itself. Compiling or running programs other than -# openjdk itself on such hardware may still cause unexpected behaviour. -EXTRA_PATCHES= ${PATCHDIR}/armv6.patch -.endif - .if ${ARCH} == "amd64" || ${ARCH} == "i386" JDK_BUILD_JVM= server .else Copied and modified: head/java/openjdk8/files/fpuhack.patch (from r420939, head/java/openjdk8/files/armv6.patch) ============================================================================== --- head/java/openjdk8/files/armv6.patch Fri Aug 26 18:14:36 2016 (r420939, copy source) +++ head/java/openjdk8/files/fpuhack.patch Fri Aug 26 18:29:46 2016 (r420940) @@ -1,3 +1,10 @@ +From NetBSD http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/lang/openjdk7/hacks.mk +Work around incorrect constant folding of subnormals in javac when the FPU +does not handle subnormal arithmetic, like on ARM in flush-to-zero mode. +These workarounds avoid underflow conditions during the bootstrap so the JDK +can correctly build itself. Compiling or running programs other than OpenJDK +itself on such hardware may still cause unexpected behaviour. + --- jdk/src/share/classes/java/lang/Double.java.orig 2014-03-04 02:57:59 UTC +++ jdk/src/share/classes/java/lang/Double.java @@ -86,7 +86,7 @@ public final class Double extends Number