openjdk/jdk8u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk8u.git synced 2025-12-10 10:44:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

8354941: Build failure with glibc 2.42 due to uabs() name collision

Browse Source 
Reviewed-by: sgehwolf
Backport-of: 26a8acad1f45bec90ad6c4ff5cd41f4e7450a962
This commit is contained in:
Andrew John Hughes 2025-12-05 16:54:49 +00:00
parent de76f06b9d
commit 48a9edf630
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/cpu/aarch64/vm/assembler_aarch64.cpp
View File

@ -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)

2
hotspot/src/cpu/aarch64/vm/assembler_aarch64.hpp
View File

@ -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)

2
hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
View File

@ -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 {

4
hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp
View File

@ -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);
unsigned int granularity = g_uabs(step);
const Register t0 = r3, t1 = r4;
// <= 96 bytes do inline. Direction doesn't matter because we always

4
hotspot/src/share/vm/opto/mulnode.cpp
View File

@ -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;
}

8
hotspot/src/share/vm/utilities/globalDefinitions.hpp
View File

@ -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) {