diff -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/aarch64/assembler_aarch64.cpp jdk24u-jdk-24.0.2-12/src/hotspot/cpu/aarch64/assembler_aarch64.cpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/aarch64/assembler_aarch64.cpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/cpu/aarch64/assembler_aarch64.cpp 2026-01-12 13:55:44.287575543 +0200 @@ -457,7 +457,7 @@ 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 -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/aarch64/assembler_aarch64.hpp jdk24u-jdk-24.0.2-12/src/hotspot/cpu/aarch64/assembler_aarch64.hpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/aarch64/assembler_aarch64.hpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/cpu/aarch64/assembler_aarch64.hpp 2026-01-12 13:55:41.479583697 +0200 @@ -932,7 +932,7 @@ 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 -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp jdk24u-jdk-24.0.2-12/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp 2026-01-12 13:58:29.959058924 +0200 @@ -3271,7 +3271,7 @@ 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 -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp jdk24u-jdk-24.0.2-12/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp 2026-01-12 14:00:13.382722386 +0200 @@ -1133,7 +1133,7 @@ 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; @@ -1192,7 +1192,7 @@ 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 -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/riscv/assembler_riscv.hpp jdk24u-jdk-24.0.2-12/src/hotspot/cpu/riscv/assembler_riscv.hpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/riscv/assembler_riscv.hpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/cpu/riscv/assembler_riscv.hpp 2026-01-12 14:02:21.006306404 +0200 @@ -3393,7 +3393,7 @@ 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 -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp jdk24u-jdk-24.0.2-12/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp 2026-01-12 14:03:25.462091609 +0200 @@ -874,7 +874,7 @@ 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); @@ -936,7 +936,7 @@ } 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 -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/share/opto/mulnode.cpp jdk24u-jdk-24.0.2-12/src/hotspot/share/opto/mulnode.cpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/share/opto/mulnode.cpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/share/opto/mulnode.cpp 2026-01-12 14:04:58.345811682 +0200 @@ -245,7 +245,7 @@ // 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 @@ // 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 -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/share/opto/subnode.cpp jdk24u-jdk-24.0.2-12/src/hotspot/share/opto/subnode.cpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/share/opto/subnode.cpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/share/opto/subnode.cpp 2026-01-12 14:05:58.785628278 +0200 @@ -1927,14 +1927,14 @@ 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 -Naur jdk24u-jdk-24.0.2-12.orig/src/hotspot/share/utilities/globalDefinitions.hpp jdk24u-jdk-24.0.2-12/src/hotspot/share/utilities/globalDefinitions.hpp --- jdk24u-jdk-24.0.2-12.orig/src/hotspot/share/utilities/globalDefinitions.hpp 2025-06-27 11:03:14.000000000 +0300 +++ jdk24u-jdk-24.0.2-12/src/hotspot/share/utilities/globalDefinitions.hpp 2026-01-12 14:10:19.068796089 +0200 @@ -1144,7 +1144,7 @@ // 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; @@ -1153,7 +1153,7 @@ 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; @@ -1162,8 +1162,8 @@ 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 size_t byte_size(void* from, void* to) {