summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCary Coutant <ccoutant@gmail.com>2016-02-06 09:53:58 -0800
committerCary Coutant <ccoutant@gmail.com>2016-02-06 09:53:58 -0800
commit2bf48941a7987cd1abedfb4ddbb45b75201381ad (patch)
tree6605c3ec3906b00f0b6ea8819ac756194ef410b5
parent1554f758410c4307103120424d35050e88433d85 (diff)
downloadbinutils-gdb-2bf48941a7987cd1abedfb4ddbb45b75201381ad.tar.gz
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.
-rw-r--r--gold/ChangeLog6
-rw-r--r--gold/reloc.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index c883077e445..1b363743f4c 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2016-02-06 Cary Coutant <ccoutant@gmail.com>
+
+ * reloc.h (Bits::has_unsigned_overflow32): Fix unsigned/signed
+ comparison.
+ (Bits::has_unsigned_overflow): Likewise.
+
2016-02-06 Marcin Koƛcielnicki <koriakin@0x04.net>
* 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 4f1e753bf99..fce73136375 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<int32_t>((1U << bits) - 1);
+ uint32_t max = static_cast<int32_t>((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<int64_t>((static_cast<uint64_t>(1) << bits) - 1);
+ uint64_t max = static_cast<int64_t>((static_cast<uint64_t>(1) << bits) - 1);
return val > max;
}