svn commit: r516907 - in head/java/openjdk12: . files

[Greg Lewis]

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; }