Date: Thu, 19 Jan 2017 05:30:36 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431848 - in branches/2017Q1/java/openjdk7: . files Message-ID: <201701190530.v0J5Ua0D044919@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jan 19 05:30:36 2017 New Revision: 431848 URL: https://svnweb.freebsd.org/changeset/ports/431848 Log: MFH: r431605 by glewis . Fix compilation with Clang 4.0 PR: 216016 Submitted by: jbeich@ Approved by: ports-secteam blanket Added: branches/2017Q1/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp - copied unchanged from r431605, head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Modified: branches/2017Q1/java/openjdk7/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/java/openjdk7/Makefile ============================================================================== --- branches/2017Q1/java/openjdk7/Makefile Thu Jan 19 05:25:15 2017 (r431847) +++ branches/2017Q1/java/openjdk7/Makefile Thu Jan 19 05:30:36 2017 (r431848) @@ -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}/ \ Copied: branches/2017Q1/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp (from r431605, head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp Thu Jan 19 05:30:36 2017 (r431848, copy of r431605, head/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp) @@ -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); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701190530.v0J5Ua0D044919>