* [PR PATCH] openjdk7-bootstrap: fix build for gcc12
@ 2022-08-22 4:33 oreo639
2022-09-08 0:43 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 1 reply; 2+ messages in thread
From: oreo639 @ 2022-08-22 4:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]
There is a new pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages openjdk7-bootstrap
https://github.com/void-linux/void-packages/pull/38822
openjdk7-bootstrap: fix build for gcc12
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38822.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk7-bootstrap-38822.patch --]
[-- Type: text/x-diff, Size: 3328 bytes --]
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);
+ }
+
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: openjdk7-bootstrap: fix build for gcc12
2022-08-22 4:33 [PR PATCH] openjdk7-bootstrap: fix build for gcc12 oreo639
@ 2022-09-08 0:43 ` classabbyamp
0 siblings, 0 replies; 2+ messages in thread
From: classabbyamp @ 2022-09-08 0:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]
There's a merged pull request on the void-packages repository
openjdk7-bootstrap: fix build for gcc12
https://github.com/void-linux/void-packages/pull/38822
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-08 0:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-22 4:33 [PR PATCH] openjdk7-bootstrap: fix build for gcc12 oreo639
2022-09-08 0:43 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).