diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2017-01-15 22:50:37 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2017-01-15 22:50:37 +0000 |
| commit | 8c48e60aee26ceb278ee94955798759107291cdb (patch) | |
| tree | fd3597305595123f91f51042b5651c58ede3293e /java/openjdk7 | |
| parent | b6ae194325e52bbf20dd1dc3e517458e45616a51 (diff) | |
| download | ports-8c48e60aee26ceb278ee94955798759107291cdb.tar.gz ports-8c48e60aee26ceb278ee94955798759107291cdb.zip | |
. Fix compilation with Clang 4.0
PR: 216016
Submitted by: jbeich@
Notes
Notes:
svn path=/head/; revision=431605
Diffstat (limited to 'java/openjdk7')
| -rw-r--r-- | java/openjdk7/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index c835fe57969b..ae872be3cd98 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -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}/ \ diff --git a/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp b/java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp new file mode 100644 index 000000000000..625d40b819d8 --- /dev/null +++ b/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); + } + |