summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2026-02-21 19:15:18 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2026-02-21 19:15:18 +0000
commitcd495875e147dea4ad09ca786109d35e80c724d1 (patch)
tree681dd27a9bee25f493b1f33d27fb625dca4f4d19 /dev-java
parent41acd1fc9170cb5dbb6216621dc06e6a4b498809 (diff)
downloadbaldeagleos-repo-cd495875e147dea4ad09ca786109d35e80c724d1.tar.gz
baldeagleos-repo-cd495875e147dea4ad09ca786109d35e80c724d1.tar.xz
baldeagleos-repo-cd495875e147dea4ad09ca786109d35e80c724d1.zip
Adding metadata
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/openjdk/files/openjdk-11.0.28_p6-fixBuild_failure_with_glibc-2.42.patch130
-rw-r--r--dev-java/openjdk/files/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch38
-rw-r--r--dev-java/openjdk/files/openjdk-8.472_p08-fixBuild_failure_with_glibc-2.42.patch134
3 files changed, 0 insertions, 302 deletions
diff --git a/dev-java/openjdk/files/openjdk-11.0.28_p6-fixBuild_failure_with_glibc-2.42.patch b/dev-java/openjdk/files/openjdk-11.0.28_p6-fixBuild_failure_with_glibc-2.42.patch
deleted file mode 100644
index ec7d55319658..000000000000
--- a/dev-java/openjdk/files/openjdk-11.0.28_p6-fixBuild_failure_with_glibc-2.42.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From fa28fbdc260351ff9ae735e473b3d0d9bdc659bf Mon Sep 17 00:00:00 2001
-From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com>
-Date: Mon, 4 Aug 2025 09:42:56 +0000
-Subject: [PATCH] Backport 38bb8adf4f632b08af15f2d8530b35f05f86a020
-
----
- src/hotspot/cpu/aarch64/assembler_aarch64.cpp | 2 +-
- src/hotspot/cpu/aarch64/assembler_aarch64.hpp | 2 +-
- src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp | 2 +-
- src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp | 4 ++--
- src/hotspot/share/opto/mulnode.cpp | 4 ++--
- src/hotspot/share/utilities/globalDefinitions.hpp | 8 ++++----
- 6 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
-index 8047ed8fd2a..aece16763a6 100644
---- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
-+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp
-@@ -1702,7 +1702,7 @@ void Assembler::add_sub_immediate(Register Rd, Register Rn, unsigned uimm, int o
- }
-
- bool Assembler::operand_valid_for_add_sub_immediate(int64_t imm) {
-- uint64_t uimm = (uint64_t)uabs((jlong)imm);
-+ uint64_t uimm = (uint64_t)g_uabs((jlong)imm);
- if (uimm < (1 << 12))
- return true;
- if (uimm < (1 << 24)
-diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
-index e07bbba3f6e..be13d560345 100644
---- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
-+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
-@@ -854,7 +854,7 @@ class Assembler : public AbstractAssembler {
- static const uint64_t branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);
-
- static bool reachable_from_branch_at(address branch, address target) {
-- return uabs(target - branch) < branch_range;
-+ return g_uabs(target - branch) < branch_range;
- }
-
- // Unconditional branch (immediate)
-diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
-index 7f329a45d30..c280df9f726 100644
---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
-+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
-@@ -2206,7 +2206,7 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, unsigned im
- if (operand_valid_for_add_sub_immediate((int)imm)) {
- (this->*insn1)(Rd, Rn, imm);
- } else {
-- if (uabs(imm) < (1 << 24)) {
-+ if (g_uabs(imm) < (1 << 24)) {
- (this->*insn1)(Rd, Rn, imm & -(1 << 12));
- (this->*insn1)(Rd, Rd, imm & ((1 << 12)-1));
- } else {
-diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
-index 598a25969d8..31817702b6b 100644
---- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
-+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
-@@ -1009,7 +1009,7 @@ class StubGenerator: public StubCodeGenerator {
-
- void copy_memory_small(Register s, Register d, Register count, Register tmp, int step) {
- bool is_backwards = step < 0;
-- size_t granularity = uabs(step);
-+ size_t granularity = g_uabs(step);
- int direction = is_backwards ? -1 : 1;
- int unit = wordSize * direction;
-
-@@ -1065,7 +1065,7 @@ class StubGenerator: public StubCodeGenerator {
- Register count, Register tmp, int step) {
- copy_direction direction = step < 0 ? copy_backwards : copy_forwards;
- bool is_backwards = step < 0;
-- unsigned int granularity = uabs(step);
-+ unsigned int granularity = g_uabs(step);
- const Register t0 = r3, t1 = r4;
-
- // <= 80 (or 96 for SIMD) bytes do inline. Direction doesn't matter because we always
-diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
-index 6616fa0ad01..78cd34490da 100644
---- a/src/hotspot/share/opto/mulnode.cpp
-+++ b/src/hotspot/share/opto/mulnode.cpp
-@@ -194,7 +194,7 @@ Node *MulINode::Ideal(PhaseGVN *phase, bool can_reshape) {
- // Check for negative constant; if so negate the final result
- bool sign_flip = false;
-
-- unsigned int abs_con = uabs(con);
-+ unsigned int abs_con = g_uabs(con);
- if (abs_con != (unsigned int)con) {
- sign_flip = true;
- }
-@@ -290,7 +290,7 @@ Node *MulLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
-
- // Check for negative constant; if so negate the final result
- bool sign_flip = false;
-- julong abs_con = uabs(con);
-+ julong abs_con = g_uabs(con);
- if (abs_con != (julong)con) {
- sign_flip = true;
- }
-diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
-index c758fc57432..581753769d7 100644
---- a/src/hotspot/share/utilities/globalDefinitions.hpp
-+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
-@@ -1166,7 +1166,7 @@ inline bool is_even(intx x) { return !is_odd(x); }
-
- // abs methods which cannot overflow and so are well-defined across
- // the entire domain of integer types.
--static inline unsigned int uabs(unsigned int n) {
-+static inline unsigned int g_uabs(unsigned int n) {
- union {
- unsigned int result;
- int value;
-@@ -1175,7 +1175,7 @@ static inline unsigned int uabs(unsigned int n) {
- if (value < 0) result = 0-result;
- return result;
- }
--static inline julong uabs(julong n) {
-+static inline julong g_uabs(julong n) {
- union {
- julong result;
- jlong value;
-@@ -1184,8 +1184,8 @@ static inline julong uabs(julong n) {
- if (value < 0) result = 0-result;
- return result;
- }
--static inline julong uabs(jlong n) { return uabs((julong)n); }
--static inline unsigned int uabs(int n) { return uabs((unsigned int)n); }
-+static inline julong g_uabs(jlong n) { return g_uabs((julong)n); }
-+static inline unsigned int g_uabs(int n) { return g_uabs((unsigned int)n); }
-
- // "to" should be greater than "from."
- inline intx byte_size(void* from, void* to) {
diff --git a/dev-java/openjdk/files/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch b/dev-java/openjdk/files/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch
deleted file mode 100644
index 3e4296d21aac..000000000000
--- a/dev-java/openjdk/files/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 685bf942bdf5b265a3b343c2b682b01b11b6e58a Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 6 Mar 2024 12:20:03 +0000
-Subject: [PATCH 3/4] Fix negative value left shift
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Backport of https://github.com/openjdk/jdk17u/commit/51be7db96f3fc32a7ddb24f8af19fb4fc0577aaf.
-
-```
-jdk/src/share/native/com/sun/java/util/jar/pack/constants.h:226:37: error: left operand of shift expression ‘(-1 << 13)’ is negative [-fpermissive]
-jdk/src/share/native/com/sun/java/util/jar/pack/constants.h:226:39: error: enumerator value for ‘AO_UNUSED_MBZ’ is not an integer constant
- 226 | AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use.
- | ^~
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- jdk/src/share/native/com/sun/java/util/jar/pack/constants.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
-index f1a1f73..536003b 100644
---- a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
-+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
-@@ -223,7 +223,7 @@ enum {
- AO_HAVE_FIELD_FLAGS_HI = 1<<10,
- AO_HAVE_METHOD_FLAGS_HI = 1<<11,
- AO_HAVE_CODE_FLAGS_HI = 1<<12,
-- AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use.
-+ AO_UNUSED_MBZ = (int)((~0U)<<13), // options bits reserved for future use.
-
- #define ARCHIVE_BIT_DO(F) \
- F(AO_HAVE_SPECIAL_FORMATS) \
---
-2.44.0
-
diff --git a/dev-java/openjdk/files/openjdk-8.472_p08-fixBuild_failure_with_glibc-2.42.patch b/dev-java/openjdk/files/openjdk-8.472_p08-fixBuild_failure_with_glibc-2.42.patch
deleted file mode 100644
index 9a4944cdcdb2..000000000000
--- a/dev-java/openjdk/files/openjdk-8.472_p08-fixBuild_failure_with_glibc-2.42.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From nicoslocalrepo Mon Sep 17 00:00:00 2001
-From: Nico Roeser
-Date: Sat, 13 Sep 2025 13:23:33 +0200
-Subject: [PATCH] Backport fix for C2Y uabs() naming collision
-
-Make the code build with glibc 2.42 or later, which include an
-implementation of uabs (for C2Y).
-
-Original patch:
-8354941: Build failure with glibc 2.42 due to uabs() name collision
-
-Backport-of: 38bb8adf4f632b08af15f2d8530b35f05f86a020
----
- hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp | 2 +-
- hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp | 2 +-
- hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp | 2 +-
- hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp | 4 ++--
- hotspot/src/share/vm/opto/mulnode.cpp | 4 ++--
- hotspot/src/share/vm/utilities/globalDefinitions.hpp | 8 ++++----
- 6 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
---- a/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
-+++ b/hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
-@@ -1445,7 +1445,7 @@ void Assembler::add_sub_immediate(Register Rd, Register Rn, unsigned uimm, int o
-
- bool Assembler::operand_valid_for_add_sub_immediate(long imm) {
- bool shift = false;
-- unsigned long uimm = uabs(imm);
-+ unsigned long uimm = g_uabs(imm);
- if (uimm < (1 << 12))
- return true;
- if (uimm < (1 << 24)
-diff --git a/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
---- a/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
-+++ b/hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
-@@ -825,7 +825,7 @@ public:
- static const unsigned long branch_range = NOT_DEBUG(128 * M) DEBUG_ONLY(2 * M);
-
- static bool reachable_from_branch_at(address branch, address target) {
-- return uabs(target - branch) < branch_range;
-+ return g_uabs(target - branch) < branch_range;
- }
-
- // Unconditional branch (immediate)
-diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
---- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
-+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
-@@ -2023,7 +2023,7 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, unsigned im
- if (operand_valid_for_add_sub_immediate((int)imm)) {
- (this->*insn1)(Rd, Rn, imm);
- } else {
-- if (uabs(imm) < (1 << 24)) {
-+ if (g_uabs(imm) < (1 << 24)) {
- (this->*insn1)(Rd, Rn, imm & -(1 << 12));
- (this->*insn1)(Rd, Rd, imm & ((1 << 12)-1));
- } else {
-diff --git a/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
---- a/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
-+++ b/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
-@@ -1093,7 +1093,7 @@ class StubGenerator: public StubCodeGenerator {
-
- void copy_memory_small(Register s, Register d, Register count, Register tmp, int step) {
- bool is_backwards = step < 0;
-- size_t granularity = uabs(step);
-+ size_t granularity = g_uabs(step);
- int direction = is_backwards ? -1 : 1;
- int unit = wordSize * direction;
-
-@@ -1149,7 +1149,7 @@ class StubGenerator: public StubCodeGenerator {
- Register count, Register tmp, int step) {
- copy_direction direction = step < 0 ? copy_backwards : copy_forwards;
- bool is_backwards = step < 0;
-- int granularity = uabs(step);
-+ int granularity = g_uabs(step);
- const Register t0 = r3, t1 = r4;
-
- // <= 96 bytes do inline. Direction doesn't matter because we always
-diff --git a/hotspot/src/share/vm/opto/mulnode.cpp b/hotspot/src/share/vm/opto/mulnode.cpp
---- a/hotspot/src/share/vm/opto/mulnode.cpp
-+++ b/hotspot/src/share/vm/opto/mulnode.cpp
-@@ -189,7 +189,7 @@ Node *MulINode::Ideal(PhaseGVN *phase, bool can_reshape) {
- // Check for negative constant; if so negate the final result
- bool sign_flip = false;
-
-- unsigned int abs_con = uabs(con);
-+ unsigned int abs_con = g_uabs(con);
- if (abs_con != (unsigned int)con) {
- sign_flip = true;
- }
-@@ -285,7 +285,7 @@ Node *MulLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
-
- // Check for negative constant; if so negate the final result
- bool sign_flip = false;
-- julong abs_con = uabs(con);
-+ julong abs_con = g_uabs(con);
- if (abs_con != (julong)con) {
- sign_flip = true;
- }
-diff --git a/hotspot/src/share/vm/utilities/globalDefinitions.hpp b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
---- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp
-+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
-@@ -1254,7 +1254,7 @@ inline bool is_even(intx x) { return !is_odd(x); }
-
- // abs methods which cannot overflow and so are well-defined across
- // the entire domain of integer types.
--static inline unsigned int uabs(unsigned int n) {
-+static inline unsigned int g_uabs(unsigned int n) {
- union {
- unsigned int result;
- int value;
-@@ -1263,7 +1263,7 @@ static inline unsigned int uabs(unsigned int n) {
- if (value < 0) result = 0-result;
- return result;
- }
--static inline julong uabs(julong n) {
-+static inline julong g_uabs(julong n) {
- union {
- julong result;
- jlong value;
-@@ -1272,8 +1272,8 @@ static inline julong uabs(julong n) {
- if (value < 0) result = 0-result;
- return result;
- }
--static inline julong uabs(jlong n) { return uabs((julong)n); }
--static inline unsigned int uabs(int n) { return uabs((unsigned int)n); }
-+static inline julong g_uabs(jlong n) { return g_uabs((julong)n); }
-+static inline unsigned int g_uabs(int n) { return g_uabs((unsigned int)n); }
-
- // "to" should be greater than "from."
- inline intx byte_size(void* from, void* to) {
---
-2.51.0
-