Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openjdk7-bootstrap: fix build for gcc12 #38822

Merged
merged 1 commit into from Sep 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt
Expand Up @@ -6,3 +6,4 @@ icedtea-jdk-no-soname.patch
icedtea-jdk-xattr.patch
icedtea-jdk-sysctl_h.patch
icedtea-cpio.patch
icedtea-pointer-comparison-gcc12.patch
1 change: 1 addition & 0 deletions srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt
Expand Up @@ -11,3 +11,4 @@ icedtea-jdk-musl.patch
icedtea-jdk-no-soname.patch
icedtea-jdk-xattr.patch
icedtea-cpio.patch
icedtea-pointer-comparison-gcc12.patch
@@ -0,0 +1,31 @@
--- openjdk.orig/hotspot/src/share/vm/opto/lcm.cpp
+++ openjdk/hotspot/src/share/vm/opto/lcm.cpp
@@ -60,7 +60,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() > (address)0) { // 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
--- openjdk.orig/hotspot/src/share/vm/runtime/virtualspace.cpp
+++ openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp
@@ -527,7 +527,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() > (char*)0) {
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
}

@@ -546,7 +546,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() > (char*)0) {
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
}