diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2017-01-15 22:51:52 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2017-01-15 22:51:52 +0000 |
| commit | 1baf25b00209c02a301d4aedae6c28fa9d248f4b (patch) | |
| tree | 30a5aae90a81058e8e0e9ea12cf9ab664470b527 /java/openjdk8 | |
| parent | 7839017c8313b3006360f607216bba43f954e841 (diff) | |
| download | ports-1baf25b00209c02a301d4aedae6c28fa9d248f4b.tar.gz ports-1baf25b00209c02a301d4aedae6c28fa9d248f4b.zip | |
. Fix compilation with Clang 4.0
PR: 216016
Submitted by: jbeich@
Notes
Notes:
svn path=/head/; revision=431607
Diffstat (limited to 'java/openjdk8')
| -rw-r--r-- | java/openjdk8/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp | 11 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp | 11 |
3 files changed, 23 insertions, 1 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 49c2d28531ee..d4fae8dfa93a 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp new file mode 100644 index 000000000000..f0db95303152 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_share_vm_opto_lcm.cpp @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/opto/lcm.cpp.orig ++++ hotspot/src/share/vm/opto/lcm.cpp +@@ -49,7 +49,7 @@ + // Check whether val is not-null-decoded compressed oop, + // i.e. will grab into the base of the heap if it represents NULL. + static bool accesses_heap_base_zone(Node *val) { +- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops. ++ if (Universe::narrow_oop_base() != NULL) { // Implies UseCompressedOops. + if (val && val->is_Mach()) { + if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) { + // This assumes all Decodes with TypePtr::NotNull are matched to nodes that diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp b/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp new file mode 100644 index 000000000000..3f527642d742 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_share_vm_runtime_virtualspace.cpp @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/runtime/virtualspace.cpp.orig ++++ hotspot/src/share/vm/runtime/virtualspace.cpp +@@ -342,7 +342,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); + } + |