svn commit: r416828 - in head/java/openjdk7: . files
Greg Lewis
glewis at FreeBSD.org
Mon Jun 13 04:57:29 UTC 2016
Author: glewis
Date: Mon Jun 13 04:57:28 2016
New Revision: 416828
URL: https://svnweb.freebsd.org/changeset/ports/416828
Log:
. Handle unsafe operations that access invalid memory more gracefully.
. Bump PORTREVISION for this fix.
PR: 209599
Submitted by: Andrew Smith <iamasmith.home at gmail.com>
Added:
head/java/openjdk7/files/patch-hotspot-src-os_cpu-bsd_x86-vm-os_bsd_x86.cpp (contents, props changed)
Modified:
head/java/openjdk7/Makefile
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Sun Jun 12 22:41:04 2016 (r416827)
+++ head/java/openjdk7/Makefile Mon Jun 13 04:57:28 2016 (r416828)
@@ -3,6 +3,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
Added: head/java/openjdk7/files/patch-hotspot-src-os_cpu-bsd_x86-vm-os_bsd_x86.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk7/files/patch-hotspot-src-os_cpu-bsd_x86-vm-os_bsd_x86.cpp Mon Jun 13 04:57:28 2016 (r416828)
@@ -0,0 +1,14 @@
+--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.prev 2016-05-20 14:03:24.511067000 +0000
++++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2016-05-20 14:12:29.670620000 +0000
+@@ -609,7 +609,11 @@
+ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
+ }
+ } else if (thread->thread_state() == _thread_in_vm &&
++#ifdef __FreeBSD__
++ (sig == SIGBUS || sig == SIGSEGV) &&
++#else
+ sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
++#endif
+ thread->doing_unsafe_access()) {
+ stub = StubRoutines::handler_for_unsafe_access();
+ }
More information about the svn-ports-head
mailing list