From a3aa8b894b7d89a258b32ac75d0703875648d0e6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 21 Aug 2022 21:31:40 -0700
Subject: [PATCH] openjdk7-bootstrap: fix build for gcc12

---
 .../files/dist_patches_glibc.txt              |  1 +
 .../files/dist_patches_musl.txt               |  1 +
 .../icedtea-pointer-comparison-gcc12.patch    | 31 +++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 srcpkgs/openjdk7-bootstrap/files/icedtea-pointer-comparison-gcc12.patch

diff --git a/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt b/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt
index c76c56855441..8061756dfc0c 100644
--- a/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt
+++ b/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt
@@ -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
diff --git a/srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt b/srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt
index 21812517c7c2..8b35d9c46989 100644
--- a/srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt
+++ b/srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt
@@ -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
diff --git a/srcpkgs/openjdk7-bootstrap/files/icedtea-pointer-comparison-gcc12.patch b/srcpkgs/openjdk7-bootstrap/files/icedtea-pointer-comparison-gcc12.patch
new file mode 100644
index 000000000000..c809553443e7
--- /dev/null
+++ b/srcpkgs/openjdk7-bootstrap/files/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);
+   }
+