File jdk-8354941.patch of Package java-13-openjdk

--- a/src/hotspot/cpu/aarch64/assembler_aarch64.cpp	2025-08-26 08:13:09.500123129 +0200
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.cpp	2025-08-26 08:13:55.492480571 +0200
@@ -1706,7 +1706,7 @@
 
 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)
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp	2025-08-26 08:13:09.500214514 +0200
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp	2025-08-26 08:13:50.831175492 +0200
@@ -556,7 +556,7 @@
   static bool offset_ok_for_immed(long offset, int shift = 0) {
     unsigned mask = (1 << shift) - 1;
     if (offset < 0 || offset & mask) {
-      return (uabs(offset) < (1 << (20 - 12))); // Unscaled offset
+      return (g_uabs(offset) < (1 << (20 - 12))); // Unscaled offset
     } else {
       return ((offset >> shift) < (1 << (21 - 10 + 1))); // Scaled, unsigned offset
     }
@@ -846,7 +846,7 @@
   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)
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	2025-08-26 08:13:09.503641515 +0200
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	2025-08-26 08:14:05.332284430 +0200
@@ -2273,7 +2273,7 @@
   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 {
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp	2025-08-26 08:13:09.504514303 +0200
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp	2025-08-26 08:14:00.556248551 +0200
@@ -1022,7 +1022,7 @@
 
   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;
 
@@ -1078,7 +1078,7 @@
                    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
--- a/src/hotspot/share/opto/mulnode.cpp	2025-08-26 08:13:09.637402554 +0200
+++ b/src/hotspot/share/opto/mulnode.cpp	2025-08-26 08:14:09.067950452 +0200
@@ -190,7 +190,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;
   }
@@ -286,7 +286,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;
   }
--- a/src/hotspot/share/utilities/globalDefinitions.hpp	2025-08-26 08:13:09.658191936 +0200
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp	2025-08-26 08:14:14.062350014 +0200
@@ -1017,7 +1017,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;
@@ -1026,7 +1026,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;
@@ -1035,8 +1035,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 intx byte_size(void* from, void* to) {