diff options
Diffstat (limited to 'dev-java/openjdk')
| -rw-r--r-- | dev-java/openjdk/Manifest | 3 | ||||
| -rw-r--r-- | dev-java/openjdk/files/openjdk-17.0.16_p8-fixBuild_failure_with_glibc-2.42.patch | 170 | ||||
| -rw-r--r-- | dev-java/openjdk/files/openjdk-21.0.8_p9-fixBuild_failure_with_glibc-2.42.patch | 191 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild (renamed from dev-java/openjdk/openjdk-25.0.1_p8.ebuild) | 1 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-26_beta28.ebuild (renamed from dev-java/openjdk/openjdk-26_alpha20.ebuild) | 6 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-27_alpha2.ebuild | 356 |
6 files changed, 361 insertions, 366 deletions
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index ca9443998d22..e9f00214d678 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -3,7 +3,8 @@ DIST openjdk-11.0.29_p7.tar.gz 116622259 BLAKE2B 9b4b2abe361914e4e9c44ff27b53dbc DIST openjdk-17.0.17_p10.tar.gz 107966134 BLAKE2B 638ddbcab4a958c54b9aab4bb2d1deabd313bf0f2c9944465ed8b5d5c9b0e890af04ada7180c0a3608d21604cda67b5568e79fb1d840b4b91e905b79893c601a SHA512 ddb409fe2c8714af081e1174df2b1febcb05097dd83eed60abe9cdaf6b9cfb9a960626480ff4f8719e8890480274ca5ce2abb449317aeb617d9bfe964b33ad29 DIST openjdk-21.0.9_p10.tar.gz 113806114 BLAKE2B b6511bd023d022bbc21a11acc173257ec8b015e89ee148be94dad9a7bd71e711f576b74d4e94dac8e06bc19c54745b134d7b0da4284e4de424a1e1489c071ae6 SHA512 f209839c830e5db7080613b5d5e7c33ccd6a55cb72a2e6237bb26646569691a34a7b93349c9fa219a3496e111e156c2d24abda3b389056b16625668e8756aed0 DIST openjdk-25.0.1_p8.tar.gz 119363842 BLAKE2B 24fcb7607cf7847c743cc5f538b1ae11f8fd551e5c75777ae68a58efb7bcba67a02ef0b02b0123c715a5dabe0d68c9dd49e51678b73e3fe232009bc6a834b4b5 SHA512 002ca3cbd9b581bed8c01e2bbda7647845b88d165f638460870aee510feffcc014588b6c5315e77467458682b049e7d2bb1c6be8728f8cf5067539f5d8233352 -DIST openjdk-26_alpha20.tar.gz 120727025 BLAKE2B c865aee089e2751d623fc781a02ef1863caa411b2f85c3b7c108c5d56f9937a6c3c7a3b6940298aba7269e770a39450601646ebe1b1ef2270fb8762422e67840 SHA512 499ebde384ffff39dcf07e5876dbb7f00f103595b57fc1eb55d036ac4beef0e9d8cc092b96411640f1427cd6812adfb2a7fb0e810f6668078f1a332dabda1cf8 +DIST openjdk-26_beta28.tar.gz 121524950 BLAKE2B 5ad807bf475335b9866579104a2b8d5fa9ccb0a9d24c7b57682d036d2ac0422fc9a5a468c322d357f172539b039a43d67d6452c84f240232201fd9eb56d8728e SHA512 5046ead222d09ca494979c7767d5bfc7a4e55035a48404bce17665e1e01c671410124121a1039b11c6e72435fde1b3d500479114f4b363710c1ad9d0f7a9bae6 +DIST openjdk-27_alpha2.tar.gz 121547511 BLAKE2B e6e2a8c6dc8685ecc0345c6881fb1f5f06152e8fdda097c90175a7dfe284b17bee2c157de518ed15d48b0bc992bc6150a9125dee1597d655b1277f8f9b188019 SHA512 cc966cedb963bcd8e3bd3685e5ddd2f3476cd4aee8215eefade70e1dc0eb63608ea111ebb3f584a6104f0937c795ed2b136795a752ad5b4a36a43a66c9df7722 DIST openjdk-8.472_p08.tar.gz 92827251 BLAKE2B 5f5c90ef0eeaf934947c943798e2ef035fc2fb6a86c21d5408cf737257e4db63555581278ca688b9dd1cb76913effa22149152986eddaf233b1217f884ca84d1 SHA512 1acebcb878d0da98fe9d66040037ddeb10c307c89402a8e2471f074068589f6bcbcaafffd24d2eb94e1aaf25e953430d94e299465e3222869789f252eacc6446 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f diff --git a/dev-java/openjdk/files/openjdk-17.0.16_p8-fixBuild_failure_with_glibc-2.42.patch b/dev-java/openjdk/files/openjdk-17.0.16_p8-fixBuild_failure_with_glibc-2.42.patch deleted file mode 100644 index 040b257d144f..000000000000 --- a/dev-java/openjdk/files/openjdk-17.0.16_p8-fixBuild_failure_with_glibc-2.42.patch +++ /dev/null @@ -1,170 +0,0 @@ -From 4241313127be05704eeebcc6454120742cc93753 Mon Sep 17 00:00:00 2001 -From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com> -Date: Thu, 12 Jun 2025 16:21:01 +0000 -Subject: [PATCH] 8354941: Build failure with glibc 2.42 due to uabs() name - collision - -Reviewed-by: phh -Backport-of: 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/cpu/riscv/assembler_riscv.hpp | 2 +- - src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 4 ++-- - src/hotspot/share/opto/mulnode.cpp | 4 ++-- - src/hotspot/share/utilities/globalDefinitions.hpp | 8 ++++---- - 8 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -index 0c503e0b7fd..70a750f0043 100644 ---- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -@@ -318,7 +318,7 @@ void Assembler::wrap_label(Label &L, prfop op, prefetch_insn insn) { - - bool Assembler::operand_valid_for_add_sub_immediate(int64_t imm) { - bool shift = false; -- 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 5a8047bc2af..12fff1972bd 100644 ---- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -@@ -858,7 +858,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 7abb2205414..c9a8db901e4 100644 ---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -@@ -2410,7 +2410,7 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t im - if (fits) { - (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 c92f0cf05bd..4920b7cb47c 100644 ---- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -@@ -1042,7 +1042,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; - -@@ -1098,7 +1098,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/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp -index 98c51e9883d..31a8f59f802 100644 ---- a/src/hotspot/cpu/riscv/assembler_riscv.hpp -+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp -@@ -2779,7 +2779,7 @@ enum Nf { - static const unsigned long branch_range = 1 * M; - - static bool reachable_from_branch_at(address branch, address target) { -- return uabs(target - branch) < branch_range; -+ return g_uabs(target - branch) < branch_range; - } - - // Decode the given instruction, checking if it's a 16-bit compressed -diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -index 7fe0392ea5c..a0ebb34a548 100644 ---- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -@@ -925,7 +925,7 @@ class StubGenerator: public StubCodeGenerator { - - void copy_memory_v(Register s, Register d, Register count, Register tmp, int step) { - bool is_backward = step < 0; -- int granularity = uabs(step); -+ int granularity = g_uabs(step); - - const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17; - assert_different_registers(s, d, cnt, vl, tmp, tmp1, tmp2); -@@ -974,7 +974,7 @@ class StubGenerator: public StubCodeGenerator { - } - - bool is_backwards = step < 0; -- int granularity = uabs(step); -+ int granularity = g_uabs(step); - - const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17, tmp5 = x14, tmp6 = x13; - -diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp -index 6d35fd8bf7b..6eb47eb38bb 100644 ---- a/src/hotspot/share/opto/mulnode.cpp -+++ b/src/hotspot/share/opto/mulnode.cpp -@@ -242,7 +242,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; - } -@@ -336,7 +336,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 98d7fbc674c..d5840b0c001 100644 ---- a/src/hotspot/share/utilities/globalDefinitions.hpp -+++ b/src/hotspot/share/utilities/globalDefinitions.hpp -@@ -1064,7 +1064,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; -@@ -1073,7 +1073,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; -@@ -1082,8 +1082,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-21.0.8_p9-fixBuild_failure_with_glibc-2.42.patch b/dev-java/openjdk/files/openjdk-21.0.8_p9-fixBuild_failure_with_glibc-2.42.patch deleted file mode 100644 index b5ffdf580067..000000000000 --- a/dev-java/openjdk/files/openjdk-21.0.8_p9-fixBuild_failure_with_glibc-2.42.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 3445b99bedfba659da49d72a39979703969cfc91 Mon Sep 17 00:00:00 2001 -From: Francesco Andreuzzi <andreuzzi.francesco@gmail.com> -Date: Fri, 6 Jun 2025 14:29:04 +0000 -Subject: [PATCH] 8354941: Build failure with glibc 2.42 due to uabs() name - collision - -Backport-of: 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/cpu/riscv/assembler_riscv.hpp | 2 +- - src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 4 ++-- - src/hotspot/share/opto/mulnode.cpp | 4 ++-- - src/hotspot/share/opto/subnode.cpp | 4 ++-- - src/hotspot/share/utilities/globalDefinitions.hpp | 8 ++++---- - 9 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -index c7b867a4207..fab224847f4 100644 ---- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp -@@ -461,7 +461,7 @@ void Assembler::bang_stack_with_offset(int offset) { Unimplemented(); } - - bool asm_util::operand_valid_for_immediate_bits(int64_t imm, unsigned nbits) { - guarantee(nbits == 8 || nbits == 12, "invalid nbits value"); -- uint64_t uimm = (uint64_t)uabs((jlong)imm); -+ uint64_t uimm = (uint64_t)g_uabs((jlong)imm); - if (uimm < (UCONST64(1) << nbits)) - return true; - if (uimm < (UCONST64(1) << (2 * nbits)) -diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -index dafb4f5229b..5d3ca441b41 100644 ---- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp -@@ -930,7 +930,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 0a2dd0dce97..8ec1af1bd7a 100644 ---- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp -@@ -2894,7 +2894,7 @@ void MacroAssembler::wrap_add_sub_imm_insn(Register Rd, Register Rn, uint64_t im - if (fits) { - (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 b2cc462ff8e..2bfc49d05dd 100644 ---- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp -@@ -1130,7 +1130,7 @@ class StubGenerator: public StubCodeGenerator { - - void copy_memory_small(DecoratorSet decorators, BasicType type, Register s, Register d, Register count, int step) { - bool is_backwards = step < 0; -- size_t granularity = uabs(step); -+ size_t granularity = g_uabs(step); - int direction = is_backwards ? -1 : 1; - - Label Lword, Lint, Lshort, Lbyte; -@@ -1189,7 +1189,7 @@ class StubGenerator: public StubCodeGenerator { - Register s, Register d, Register count, 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/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp -index 24de7c15fe3..afb661e180d 100644 ---- a/src/hotspot/cpu/riscv/assembler_riscv.hpp -+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp -@@ -2913,7 +2913,7 @@ enum Nf { - static const unsigned long branch_range = 1 * M; - - static bool reachable_from_branch_at(address branch, address target) { -- return uabs(target - branch) < branch_range; -+ return g_uabs(target - branch) < branch_range; - } - - // Decode the given instruction, checking if it's a 16-bit compressed -diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -index 8c5e1c097ef..bc4d2e94414 100644 ---- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp -@@ -917,7 +917,7 @@ class StubGenerator: public StubCodeGenerator { - - void copy_memory_v(Register s, Register d, Register count, int step) { - bool is_backward = step < 0; -- int granularity = uabs(step); -+ int granularity = g_uabs(step); - - const Register src = x30, dst = x31, vl = x14, cnt = x15, tmp1 = x16, tmp2 = x17; - assert_different_registers(s, d, cnt, vl, tmp1, tmp2); -@@ -973,7 +973,7 @@ class StubGenerator: public StubCodeGenerator { - } - - bool is_backwards = step < 0; -- int granularity = uabs(step); -+ int granularity = g_uabs(step); - - const Register src = x30, dst = x31, cnt = x15, tmp3 = x16, tmp4 = x17, tmp5 = x14, tmp6 = x13; - const Register gct1 = x28, gct2 = x29, gct3 = t2; -diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp -index f42d06a3650..43d842173dd 100644 ---- a/src/hotspot/share/opto/mulnode.cpp -+++ b/src/hotspot/share/opto/mulnode.cpp -@@ -245,7 +245,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; - } -@@ -480,7 +480,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/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp -index 8b2538f8ab5..c4a86d76506 100644 ---- a/src/hotspot/share/opto/subnode.cpp -+++ b/src/hotspot/share/opto/subnode.cpp -@@ -1899,14 +1899,14 @@ const Type* AbsNode::Value(PhaseGVN* phase) const { - case Type::Int: { - const TypeInt* ti = t1->is_int(); - if (ti->is_con()) { -- return TypeInt::make(uabs(ti->get_con())); -+ return TypeInt::make(g_uabs(ti->get_con())); - } - break; - } - case Type::Long: { - const TypeLong* tl = t1->is_long(); - if (tl->is_con()) { -- return TypeLong::make(uabs(tl->get_con())); -+ return TypeLong::make(g_uabs(tl->get_con())); - } - break; - } -diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp -index 0083442be6c..625fdcc414f 100644 ---- a/src/hotspot/share/utilities/globalDefinitions.hpp -+++ b/src/hotspot/share/utilities/globalDefinitions.hpp -@@ -1164,7 +1164,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; -@@ -1173,7 +1173,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; -@@ -1182,8 +1182,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/openjdk-25.0.1_p8.ebuild b/dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild index e2b154f5742a..1e5e0f14f2ef 100644 --- a/dev-java/openjdk/openjdk-25.0.1_p8.ebuild +++ b/dev-java/openjdk/openjdk-25.0.1_p8-r1.ebuild @@ -344,7 +344,6 @@ src_install() { if use doc ; then docinto html dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } diff --git a/dev-java/openjdk/openjdk-26_alpha20.ebuild b/dev-java/openjdk/openjdk-26_beta28.ebuild index f07e404fcc6e..d49473c8982f 100644 --- a/dev-java/openjdk/openjdk-26_alpha20.ebuild +++ b/dev-java/openjdk/openjdk-26_beta28.ebuild @@ -189,10 +189,10 @@ src_prepare() { src_configure() { local myconf=() - if has_version dev-java/openjdk:25; then - export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-25 - elif has_version dev-java/openjdk:${SLOT}; then + if has_version dev-java/openjdk:${SLOT}; then export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT} + elif has_version dev-java/openjdk:25; then + export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-25 elif use !system-bootstrap ; then local xpakvar="${ARCH^^}_XPAK" export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" diff --git a/dev-java/openjdk/openjdk-27_alpha2.ebuild b/dev-java/openjdk/openjdk-27_alpha2.ebuild new file mode 100644 index 000000000000..fda63d9859bc --- /dev/null +++ b/dev-java/openjdk/openjdk-27_alpha2.ebuild @@ -0,0 +1,356 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Avoid circular dependency +JAVA_DISABLE_DEPEND_ON_JAVA_DEP_CHECK="true" + +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs + +# variable name format: <UPPERCASE_KEYWORD>_XPAK +PPC64_XPAK="25_p36" # big-endian bootstrap tarball + +# Usage: bootstrap_uri <keyword> <version> [extracond] +# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian) +# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) ) +bootstrap_uri() { + local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" + local suff="tar.xz" + local kw="${1:?${FUNCNAME[0]}: keyword not specified}" + local ver="${2:?${FUNCNAME[0]}: version not specified}" + local cond="${3-}" + [[ ${cond} == elibc_musl* ]] && local musl=yes + + # here be dragons + echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })" +} + +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. +# MY_PV="${PV%_p*}-ga" + +# Upstream starts new major versions usually in https://github.com/openjdk/jdk. +# In ebuilds for those early versions, use '_alpha' in the version string. +# Exapmle: openjdk-26_alpha10.ebuild +# Later, upstream creates the versioned repository like e.g. +# https://github.com/openjdk/jdk25u. +# In ebuilds for those later versions, use '_beta' in the version string. +# Example: openjdk-25_beta35.ebuild +if [[ "${PV%_alpha*}" != "${PV}" ]]; then # version string contains "_alpha" + MY_PV="${PV/_alpha/+}" + JDK_REPO="jdk" + MY_VERSION_STRING="${PV%_alpha*}" + MY_VERSION_BUILD="${PV#*_alpha}" +elif [[ "${PV%_beta*}" != "${PV}" ]]; then # version string contains "_beta" + MY_PV="${PV/_beta/+}" + JDK_REPO="jdk$(ver_cut 1)u" + MY_VERSION_STRING="${PV%_beta*}" + MY_VERSION_BUILD="${PV#*_beta}" +else + MY_PV="${PV%_p*}-ga" + JDK_REPO="jdk$(ver_cut 1)u" + MY_VERSION_STRING="${PV%_p*}" + MY_VERSION_BUILD="${PV#*_p}" +fi + +DESCRIPTION="Open source implementation of the Java programming language" +HOMEPAGE="https://openjdk.org" +SRC_URI=" + https://github.com/${PN}/${JDK_REPO}/archive/jdk-${MY_PV}.tar.gz + -> ${P}.tar.gz + !system-bootstrap? ( + $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) + ) +" +S="${WORKDIR}/${JDK_REPO}-jdk-${MY_PV//+/-}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT="$(ver_cut 1)" +# KEYWORDS="" # Not an LTS candidate + +IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) + !system-bootstrap? ( jbootstrap ) + !system-bootstrap? ( ppc64 ) +" + +COMMON_DEPEND=" + media-libs/freetype:2= + media-libs/giflib:0/7 + media-libs/harfbuzz:= + media-libs/libpng:0= + media-libs/lcms:2= + virtual/zlib:= + media-libs/libjpeg-turbo:0= + systemtap? ( dev-debug/systemtap ) +" + +# Many libs are required to build, but not to run, make is possible to remove +# by listing conditionally in RDEPEND unconditionally in DEPEND +RDEPEND=" + ${COMMON_DEPEND} + >=sys-apps/baselayout-java-0.1.0-r1 + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) +" + +DEPEND=" + ${COMMON_DEPEND} + app-arch/zip + media-libs/alsa-lib + net-print/cups + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + javafx? ( dev-java/openjfx:${SLOT}= ) + system-bootstrap? ( + || ( + dev-java/openjdk:26 + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} + ) + ) +" + +# The space required to build varies wildly depending on USE flags, +# ranging from 2GB to 16GB. This function is certainly not exact but +# should be close enough to be useful. +openjdk_check_requirements() { + local M + M=2048 + M=$(( $(usex jbootstrap 2 1) * $M )) + M=$(( $(usex debug 3 1) * $M )) + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) + + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} +} + +pkg_pretend() { + openjdk_check_requirements + if [[ ${MERGE_TYPE} != binary ]]; then + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" + fi +} + +pkg_setup() { + openjdk_check_requirements + java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return + + JAVA_PKG_WANT_BUILD_VM="openjdk-25 openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + + # The nastiness below is necessary while the gentoo-vm USE flag is + # masked. First we call java-pkg-2_pkg_setup if it looks like the + # flag was unmasked against one of the possible build VMs. If not, + # we try finding one of them in their expected locations. This would + # have been slightly less messy if openjdk-bin had been installed to + # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env + # file but disable it so that it would not normally be selectable. + + local vm + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then + java-pkg-2_pkg_setup + return + fi + done +} + +src_prepare() { + default + chmod +x configure || die +} + +src_configure() { + local myconf=() + + if has_version dev-java/openjdk:${SLOT}; then + export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT} + elif has_version dev-java/openjdk:26; then + export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-26 + elif use !system-bootstrap ; then + local xpakvar="${ARCH^^}_XPAK" + export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" + else + JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) + [[ -n ${JDK_HOME} ]] || die "Build VM not found!" + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*} + export JDK_HOME + fi + + # bug 906987; append-cppflags doesnt work + use elibc_musl && append-flags -D_LARGEFILE64_SOURCE + + # Strip some flags users may set, but should not. #818502 + filter-flags -fexceptions + + # Strip lto related flags, we rely on --with-jvm-features=link-time-opt + # See bug #833097 and bug #833098. + # + # .. but because of -Werror=odr (bug #916735), we disable it + # entirely for now. + #tc-is-lto && myconf+=( --with-jvm-features=link-time-opt ) + filter-lto + filter-flags -fdevirtualize-at-ltrans + + # Enabling full docs appears to break doc building. If not + # explicitly disabled, the flag will get auto-enabled if pandoc and + # graphviz are detected. pandoc has loads of dependencies anyway. + + myconf+=( + --disable-ccache + --disable-precompiled-headers + --disable-warnings-as-errors + --enable-full-docs=no + --with-boot-jdk="${JDK_HOME}" + --with-extra-cflags="${CFLAGS}" + --with-extra-cxxflags="${CXXFLAGS}" + --with-extra-ldflags="${LDFLAGS}" + --with-freetype="${XPAK_BOOTSTRAP:-system}" + --with-giflib="${XPAK_BOOTSTRAP:-system}" + --with-harfbuzz="${XPAK_BOOTSTRAP:-system}" + --with-lcms="${XPAK_BOOTSTRAP:-system}" + --with-libjpeg="${XPAK_BOOTSTRAP:-system}" + --with-libpng="${XPAK_BOOTSTRAP:-system}" + --with-stdc++lib=dynamic + --with-native-debug-symbols=$(usex debug internal none) + --with-vendor-name="Gentoo" + --with-vendor-url="https://gentoo.org" + --with-vendor-bug-url="https://bugs.gentoo.org" + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" + --with-vendor-version-string="${PVR}" + --with-version-pre="" + --with-version-string="${MY_VERSION_STRING}" + --with-version-build="${MY_VERSION_BUILD}" + --with-zlib="${XPAK_BOOTSTRAP:-system}" + --enable-jvm-feature-dtrace=$(usex systemtap yes no) + --enable-headless-only=$(usex headless-awt yes no) + $(tc-is-clang && echo "--with-toolchain-type=clang") + ) + + use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) + + if use javafx; then + local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + if [[ -r ${zip} ]]; then + myconf+=( --with-import-modules="${zip}" ) + else + die "${zip} not found or not readable" + fi + fi + + # Workaround for bug #938302 + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace ) + fi + + if use !system-bootstrap ; then + addpredict /dev/random + addpredict /proc/self/coredump_filter + fi + + ( + unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS + CFLAGS= CXXFLAGS= LDFLAGS= \ + CONFIG_SITE=/dev/null \ + econf "${myconf[@]}" + ) +} + +src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + + local myemakeargs=( + JOBS=$(makeopts_jobs) + LOG=debug + CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror + NICE= # Use PORTAGE_NICENESS, don't adjust further down + $(usex doc docs '') + $(usex jbootstrap bootcycle-images product-images) + ) + emake "${myemakeargs[@]}" -j1 +} + +src_install() { + local dest="/usr/$(get_libdir)/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # https://bugs.gentoo.org/922741 + docompress "${dest}/man" + + cd "${S}"/build/*-release/images/jdk || die + + # Create files used as storage for system preferences. + mkdir .systemPrefs || die + touch .systemPrefs/.system.lock || die + touch .systemPrefs/.systemRootModFile || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but OpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if ! use examples ; then + rm -vr demo/ || die + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + # must be done before running itself + java-vm_set-pax-markings "${ddest}" + + einfo "Creating the Class Data Sharing archives and disabling usage tracking" + "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die + + java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter + + if use doc ; then + docinto html + dodoc -r "${S}"/build/*-release/images/docs/* + dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + fi +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} |