summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2010-08-16 23:00:12 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2010-08-16 23:00:12 +0000
commit1f8aa7bf08783a438ee2afd3747477923d87b365 (patch)
treed631c2d500cc179178e88451df352e646f713569
parent3620ff9a8b85e6d1b8ef42d8ec356fc3afb49519 (diff)
downloadllvm-1f8aa7bf08783a438ee2afd3747477923d87b365.tar.gz
llvm-1f8aa7bf08783a438ee2afd3747477923d87b365.tar.bz2
llvm-1f8aa7bf08783a438ee2afd3747477923d87b365.tar.xz
Silence warnings and simplify code. Eliminate a 32/64 bit portability issue.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111201 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/MC/ELFObjectWriter.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 5f7ef1217d..4d0b374196 100644
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -545,14 +545,13 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
if (IsPCRel) {
Type = ELF::R_X86_64_PC32;
} else {
- switch (Fixup.getKind()) {
+ switch ((unsigned)Fixup.getKind()) {
+ default: llvm_unreachable("invalid fixup kind!");
case FK_Data_8: Type = ELF::R_X86_64_64; break;
case X86::reloc_pcrel_4byte:
case FK_Data_4:
- long Offset;
- Offset = Target.getConstant();
// check that the offset fits within a signed long
- if (!(((long) -1 << 31) & Offset) || (((long) -1 << 31) & Offset) == ((long) -1 << 31))
+ if (isInt<32>(Target.getConstant()))
Type = ELF::R_X86_64_32S;
else
Type = ELF::R_X86_64_32;