From owner-svn-ports-all@freebsd.org Mon Jun 13 04:57:29 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6F60AF1A1F; Mon, 13 Jun 2016 04:57:29 +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 mx1.freebsd.org (Postfix) with ESMTPS id 7C5222425; Mon, 13 Jun 2016 04:57:29 +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 u5D4vSSl029047; Mon, 13 Jun 2016 04:57:28 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5D4vSxs029045; Mon, 13 Jun 2016 04:57:28 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201606130457.u5D4vSxs029045@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Mon, 13 Jun 2016 04:57:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416828 - in head/java/openjdk7: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jun 2016 04:57:29 -0000 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 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(); + }