From owner-svn-ports-head@freebsd.org Wed Nov 6 17:31:34 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4F9711BB286; Wed, 6 Nov 2019 17:31:34 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 477YVZ1Ps6z4P0d; Wed, 6 Nov 2019 17:31:34 +0000 (UTC) (envelope-from glewis@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1387C758; Wed, 6 Nov 2019 17:31:34 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA6HVXjR071600; Wed, 6 Nov 2019 17:31:33 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA6HVXLJ071598; Wed, 6 Nov 2019 17:31:33 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201911061731.xA6HVXLJ071598@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Wed, 6 Nov 2019 17:31:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516907 - in head/java/openjdk12: . files X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java/openjdk12: . files X-SVN-Commit-Revision: 516907 X-SVN-Commit-Repository: ports 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.29 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: Wed, 06 Nov 2019 17:31:34 -0000 Author: glewis Date: Wed Nov 6 17:31:33 2019 New Revision: 516907 URL: https://svnweb.freebsd.org/changeset/ports/516907 Log: Fix build on FreeBSD 12.x/powerpc64 on POWER8+ machines * Make sure has_mfdscr() returns false on these machines as using it on FreeBSD 12.x will cause problems (e.g. SIGILL). PR: 239368 Sponsored by: The FreeBSD Foundation Added: head/java/openjdk12/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp (contents, props changed) Modified: head/java/openjdk12/Makefile Modified: head/java/openjdk12/Makefile ============================================================================== --- head/java/openjdk12/Makefile Wed Nov 6 17:21:58 2019 (r516906) +++ head/java/openjdk12/Makefile Wed Nov 6 17:31:33 2019 (r516907) @@ -137,6 +137,9 @@ CONFIGURE_ARGS+= --disable-warnings-as-errors \ .if ${ARCH} != amd64 CONFIGURE_ARGS+= --enable-aot=no .endif +.if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp +.endif .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG Added: head/java/openjdk12/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk12/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp Wed Nov 6 17:31:33 2019 (r516907) @@ -0,0 +1,11 @@ +--- src/hotspot/cpu/ppc/vm_version_ppc.hpp.orig 2019-10-16 11:31:09.000000000 -0700 ++++ src/hotspot/cpu/ppc/vm_version_ppc.hpp 2019-10-23 12:54:06.972903000 -0700 +@@ -108,7 +108,7 @@ + static bool has_lqarx() { return (_features & lqarx_m) != 0; } + static bool has_vcipher() { return (_features & vcipher_m) != 0; } + static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; } +- static bool has_mfdscr() { return (_features & mfdscr_m) != 0; } ++ static bool has_mfdscr() { return false; } + static bool has_vsx() { return (_features & vsx_m) != 0; } + static bool has_ldbrx() { return (_features & ldbrx_m) != 0; } + static bool has_stdbrx() { return (_features & stdbrx_m) != 0; }