From owner-svn-ports-head@freebsd.org Sun Jan 15 22:50:39 2017 Return-Path: Delivered-To: svn-ports-head@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 581DDCB1869; Sun, 15 Jan 2017 22:50:39 +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 0F26B1D45; Sun, 15 Jan 2017 22:50:38 +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 v0FMocD5001695; Sun, 15 Jan 2017 22:50:38 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0FMocDB001446; Sun, 15 Jan 2017 22:50:38 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201701152250.v0FMocDB001446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Sun, 15 Jan 2017 22:50:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431605 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Jan 2017 22:50:39 -0000 Author: glewis Date: Sun Jan 15 22:50:37 2017 New Revision: 431605 URL: https://svnweb.freebsd.org/changeset/ports/431605 Log: . Fix compilation with Clang 4.0 PR: 216016 Submitted by: jbeich@ Added: head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp (contents, props changed) Modified: head/java/openjdk7/Makefile Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Sun Jan 15 22:40:06 2017 (r431604) +++ head/java/openjdk7/Makefile Sun Jan 15 22:50:37 2017 (r431605) @@ -3,7 +3,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} -PORTREVISION= 2 +PORTREVISION= 3 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_share_vm_runtime_virtualspace.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Sun Jan 15 22:50:37 2017 (r431605) @@ -0,0 +1,20 @@ +--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig ++++ hotspot/src/share/vm/runtime/virtualspace.cpp +@@ -524,7 +524,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), alignment) : 0) { +- if (base() > 0) { ++ if (base() != NULL) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } + +@@ -543,7 +543,7 @@ ReservedHeapSpace::ReservedHeapSpace(con + (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && + Universe::narrow_oop_use_implicit_null_checks()) ? + lcm(os::vm_page_size(), prefix_align) : 0) { +- if (base() > 0) { ++ if (base() != NULL) { + MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); + } +