wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-02 02:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

openjdk7-bootstrap: fix build for gcc12

Browse source
This commit is contained in:
oreo639 2022-08-21 21:31:40 -07:00 • committed by classabbyamp
parent 72071c4da4
commit b64478502d
3 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt
View file

@ -6,3 +6,4 @@ icedtea-jdk-no-soname.patch
icedtea-jdk-xattr.patch icedtea-jdk-xattr.patch
icedtea-jdk-sysctl_h.patch icedtea-jdk-sysctl_h.patch
icedtea-cpio.patch icedtea-cpio.patch
icedtea-pointer-comparison-gcc12.patch

1
srcpkgs/openjdk7-bootstrap/files/dist_patches_musl.txt
View file

@ -11,3 +11,4 @@ icedtea-jdk-musl.patch
icedtea-jdk-no-soname.patch icedtea-jdk-no-soname.patch
icedtea-jdk-xattr.patch icedtea-jdk-xattr.patch
icedtea-cpio.patch icedtea-cpio.patch
icedtea-pointer-comparison-gcc12.patch

31
srcpkgs/openjdk7-bootstrap/files/icedtea-pointer-comparison-gcc12.patch Normal file
View file

@ -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);
}