From 2bf48941a7987cd1abedfb4ddbb45b75201381ad Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Sat, 6 Feb 2016 09:53:58 -0800 Subject: [PATCH] Fix build failure in gold due to signed vs. unsigned comparisons. * reloc.h (Bits::has_unsigned_overflow32): Fix unsigned/signed comparison. (Bits::has_unsigned_overflow): Likewise. --- gold/ChangeLog | 6 ++++++ gold/reloc.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index c883077e44..1b363743f4 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2016-02-06 Cary Coutant + + * reloc.h (Bits::has_unsigned_overflow32): Fix unsigned/signed + comparison. + (Bits::has_unsigned_overflow): Likewise. + 2016-02-06 Marcin Kościelnicki * i386.cc (Target_i386::is_call_to_non_split): Add view and view_size diff --git a/gold/reloc.h b/gold/reloc.h index 4f1e753bf9..fce7313637 100644 --- a/gold/reloc.h +++ b/gold/reloc.h @@ -1015,7 +1015,7 @@ class Bits gold_assert(bits > 0 && bits <= 32); if (bits == 32) return false; - int32_t max = static_cast((1U << bits) - 1); + uint32_t max = static_cast((1U << bits) - 1); return val > max; } @@ -1081,7 +1081,7 @@ class Bits gold_assert(bits > 0 && bits <= 64); if (bits == 64) return false; - int64_t max = static_cast((static_cast(1) << bits) - 1); + uint64_t max = static_cast((static_cast(1) << bits) - 1); return val > max; }