From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] openjdk9-bootstrap: fix build with gcc12
Date: Mon, 17 Oct 2022 05:09:08 +0200 [thread overview]
Message-ID: <20221017030908.Q8bRydPXXMSSQDv6EekvytRXJ4t9CFiyZNtKwXuWX_o@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39963@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages openjdk9
https://github.com/void-linux/void-packages/pull/39963
openjdk9-bootstrap: fix build with gcc12
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
https://github.com/void-linux/void-packages/issues/39809
<!--
#### 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/39963.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk9-39963.patch --]
[-- Type: text/x-diff, Size: 3368 bytes --]
From 2b1e204274e511a6546f2ef0935325105825948a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 15 Oct 2022 02:16:25 -0700
Subject: [PATCH] openjdk9-bootstrap: fix build with gcc12
---
.../fix-pointer-comparison-gcc12.patch | 51 +++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 srcpkgs/openjdk9-bootstrap/patches/fix-pointer-comparison-gcc12.patch
diff --git a/srcpkgs/openjdk9-bootstrap/patches/fix-pointer-comparison-gcc12.patch b/srcpkgs/openjdk9-bootstrap/patches/fix-pointer-comparison-gcc12.patch
new file mode 100644
index 000000000000..9cfd4a9044ad
--- /dev/null
+++ b/srcpkgs/openjdk9-bootstrap/patches/fix-pointer-comparison-gcc12.patch
@@ -0,0 +1,51 @@
+From 19af6364825a401c281e9831f892a033a6f597e8 Mon Sep 17 00:00:00 2001
+From: Martin Buchholz <martin@openjdk.org>
+Date: Thu, 24 Aug 2017 10:26:32 -0700
+Subject: [PATCH] 8174050: Compilation errors with clang-4.0
+
+Reviewed-by: kvn
+---
+ hotspot/src/share/vm/memory/virtualspace.cpp | 2 +-
+ hotspot/src/share/vm/opto/lcm.cpp | 2 +-
+ hotspot/src/share/vm/opto/loopPredicate.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hotspot/src/share/vm/memory/virtualspace.cpp b/hotspot/src/share/vm/memory/virtualspace.cpp
+index 82787f8a024..a3289d9b043 100644
+--- a/hotspot/src/share/vm/memory/virtualspace.cpp
++++ b/hotspot/src/share/vm/memory/virtualspace.cpp
+@@ -582,7 +582,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, bool large)
+ assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size],
+ "area must be distinguishable from marks for mark-sweep");
+
+- if (base() > 0) {
++ if (base() != NULL) {
+ MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
+ }
+ }
+diff --git a/hotspot/src/share/vm/opto/lcm.cpp b/hotspot/src/share/vm/opto/lcm.cpp
+index 049376cc709..3ed99872641 100644
+--- a/hotspot/src/share/vm/opto/lcm.cpp
++++ b/hotspot/src/share/vm/opto/lcm.cpp
+@@ -39,7 +39,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/hotspot/src/share/vm/opto/loopPredicate.cpp b/hotspot/src/share/vm/opto/loopPredicate.cpp
+index a3030676335..0de17405ccc 100644
+--- a/hotspot/src/share/vm/opto/loopPredicate.cpp
++++ b/hotspot/src/share/vm/opto/loopPredicate.cpp
+@@ -912,7 +912,7 @@ bool PhaseIdealLoop::loop_predication_impl(IdealLoopTree *loop) {
+ Node* idx = cmp->in(1);
+ assert(!invar.is_invariant(idx), "index is variant");
+ Node* rng = cmp->in(2);
+- assert(rng->Opcode() == Op_LoadRange || _igvn.type(rng)->is_int() >= 0, "must be");
++ assert(rng->Opcode() == Op_LoadRange || iff->is_RangeCheck() || _igvn.type(rng)->is_int()->_lo >= 0, "must be");
+ assert(invar.is_invariant(rng), "range must be invariant");
+ int scale = 1;
+ Node* offset = zero;
next prev parent reply other threads:[~2022-10-17 3:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-15 9:20 [PR PATCH] " oreo639
2022-10-15 10:21 ` [PR PATCH] [Updated] " oreo639
2022-10-17 2:07 ` [PR REVIEW] " sgn
2022-10-17 2:59 ` oreo639
2022-10-17 3:01 ` oreo639
2022-10-17 3:03 ` oreo639
2022-10-17 3:06 ` [PR PATCH] [Updated] " oreo639
2022-10-17 3:09 ` oreo639 [this message]
2022-10-17 3:12 ` [PR REVIEW] " oreo639
2022-10-17 3:12 ` oreo639
2022-10-17 3:13 ` oreo639
2022-10-17 4:13 ` oreo639
2022-10-18 11:17 ` sgn
2022-10-18 16:06 ` [PR PATCH] [Updated] " oreo639
2022-10-18 16:06 ` [PR REVIEW] " oreo639
2022-10-18 16:06 ` oreo639
2022-10-18 16:51 ` [PR PATCH] [Updated] " oreo639
2022-10-19 1:34 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221017030908.Q8bRydPXXMSSQDv6EekvytRXJ4t9CFiyZNtKwXuWX_o@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).