Date: Wed, 6 Nov 2019 17:21:58 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516906 - in head/java/openjdk11: . files Message-ID: <201911061721.xA6HLwhw063653@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Wed Nov 6 17:21:58 2019 New Revision: 516906 URL: https://svnweb.freebsd.org/changeset/ports/516906 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 Added: head/java/openjdk11/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp (contents, props changed) Modified: head/java/openjdk11/Makefile Modified: head/java/openjdk11/Makefile ============================================================================== --- head/java/openjdk11/Makefile Wed Nov 6 17:19:30 2019 (r516905) +++ head/java/openjdk11/Makefile Wed Nov 6 17:21:58 2019 (r516906) @@ -135,6 +135,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/openjdk11/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/openjdk11/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp Wed Nov 6 17:21:58 2019 (r516906) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911061721.xA6HLwhw063653>