svn commit: r508812 - in head/java/openjdk11: . files

[Greg Lewis]

Author: glewis
Date: Tue Aug 13 04:41:40 2019
New Revision: 508812
URL: https://svnweb.freebsd.org/changeset/ports/508812

Log:
  Update to 11.0.4+11.2

Added:
  head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp   (contents, props changed)
Deleted:
  head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp
Modified:
  head/java/openjdk11/Makefile
  head/java/openjdk11/distinfo
  head/java/openjdk11/files/patch-make_autoconf_libraries.m4

Modified: head/java/openjdk11/Makefile
==============================================================================
--- head/java/openjdk11/Makefile	Tue Aug 13 03:22:44 2019	(r508811)
+++ head/java/openjdk11/Makefile	Tue Aug 13 04:41:40 2019	(r508812)
@@ -3,7 +3,6 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	2
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -57,7 +56,7 @@ JDK_MAJOR_VERSION=	11
 JDK_MINOR_VERSION=	0
 JDK_PATCH_VERSION=	4
 JDK_BUILD_NUMBER=	11
-BSD_JDK_VERSION=	1
+BSD_JDK_VERSION=	2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC=${CC} \

Modified: head/java/openjdk11/distinfo
==============================================================================
--- head/java/openjdk11/distinfo	Tue Aug 13 03:22:44 2019	(r508811)
+++ head/java/openjdk11/distinfo	Tue Aug 13 04:41:40 2019	(r508812)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563553365
-SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-1_GH0.tar.gz) = eed0b1dc30d16e14ef470186c9fe21c36e02da95f2657754b8402e84b803965c
-SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-1_GH0.tar.gz) = 116997649
+TIMESTAMP = 1565662004
+SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 15fdeeea8d716620ab78a44e66edf88eeb7707a9b7b389304f2ba6fd39d5fa36
+SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 117004198

Modified: head/java/openjdk11/files/patch-make_autoconf_libraries.m4
==============================================================================
--- head/java/openjdk11/files/patch-make_autoconf_libraries.m4	Tue Aug 13 03:22:44 2019	(r508811)
+++ head/java/openjdk11/files/patch-make_autoconf_libraries.m4	Tue Aug 13 04:41:40 2019	(r508812)
@@ -1,15 +1,15 @@
---- make/autoconf/libraries.m4.orig	2019-03-28 16:54:58.823145000 -0700
-+++ make/autoconf/libraries.m4	2019-03-28 16:55:45.533206000 -0700
-@@ -186,9 +186,9 @@
+--- make/autoconf/libraries.m4~	2019-08-12 19:10:36.292217000 -0700
++++ make/autoconf/libraries.m4	2019-08-12 19:18:15.523606000 -0700
+@@ -188,9 +188,9 @@
        ICONV_LDFLAGS="-L/usr/local/lib"
        ICONV_LIBS=-liconv
-     else
--      ICONV_CFLAGS=
+     elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
+-      ICONV_CFLAGS=-DLIBICONV_PLUG
 -      ICONV_LDFLAGS=
 -      ICONV_LIBS=
 +      ICONV_CFLAGS=%%ICONV_CFLAGS%%
 +      ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
 +      ICONV_LIBS=%%ICONV_LIBS%%
-     fi
-   else
-     ICONV_CFLAGS=
+     else
+       ICONV_CFLAGS=
+       ICONV_LDFLAGS=

Added: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp	Tue Aug 13 04:41:40 2019	(r508812)
@@ -0,0 +1,12 @@
+--- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
++++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+@@ -510,6 +510,9 @@ JVM_handle_bsd_signal(int sig,
+     // Handle ALL stack overflow variations here
+     if (sig == SIGSEGV || sig == SIGBUS) {
+       address addr = (address) info->si_addr;
++#ifdef __FreeBSD__
++      addr = align_down(addr, os::vm_page_size());
++#endif
+ 
+       // check if fault address is within thread stack
+       if (thread->on_local_stack(addr)) {