summaryrefslogtreecommitdiff
path: root/java/openjdk7/files
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2017-01-15 22:50:37 +0000
committerGreg Lewis <glewis@FreeBSD.org>2017-01-15 22:50:37 +0000
commit8c48e60aee26ceb278ee94955798759107291cdb (patch)
treefd3597305595123f91f51042b5651c58ede3293e /java/openjdk7/files
parentUpdate calibre to 2.77.0 (diff)
. Fix compilation with Clang 4.0
PR: 216016 Submitted by: jbeich@
Notes
Notes: svn path=/head/; revision=431605
Diffstat (limited to 'java/openjdk7/files')
-rw-r--r--java/openjdk7/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp20
1 files changed, 20 insertions, 0 deletions
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);
+ }
+