Define generic 1, 2 and 4 byte pc relative relocations. They are common
and at least the 4 byte one will be needed to implement the .cfi_* directives.
llvm-svn: 120240
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp
index 3b649db..4b97836 100644
--- a/llvm/lib/MC/ELFObjectWriter.cpp
+++ b/llvm/lib/MC/ELFObjectWriter.cpp
@@ -31,7 +31,6 @@
#include "../Target/X86/X86FixupKinds.h"
#include "../Target/ARM/ARMFixupKinds.h"
-#include "../Target/MBlaze/MBlazeFixupKinds.h"
#include <vector>
using namespace llvm;
@@ -371,8 +370,9 @@
switch (Kind) {
default:
return false;
- case X86::reloc_pcrel_1byte:
- case X86::reloc_pcrel_4byte:
+ case FK_PCRel_1:
+ case FK_PCRel_2:
+ case FK_PCRel_4:
case X86::reloc_riprel_4byte:
case X86::reloc_riprel_4byte_movq_load:
return true;
@@ -401,6 +401,9 @@
switch (Kind) {
default:
return false;
+ case FK_PCRel_1:
+ case FK_PCRel_2:
+ case FK_PCRel_4:
case ARM::fixup_arm_pcrel_12:
case ARM::fixup_arm_vfp_pcrel_12:
case ARM::fixup_arm_branch:
@@ -429,8 +432,9 @@
switch (Kind) {
default:
return false;
- case MBlaze::reloc_pcrel_2byte:
- case MBlaze::reloc_pcrel_4byte:
+ case FK_PCRel_1:
+ case FK_PCRel_2:
+ case FK_PCRel_4:
return true;
}
}
@@ -1509,10 +1513,10 @@
switch ((unsigned)Fixup.getKind()) {
default:
llvm_unreachable("Unimplemented");
- case MBlaze::reloc_pcrel_4byte:
+ case FK_PCRel_4:
Type = ELF::R_MICROBLAZE_64_PCREL;
break;
- case MBlaze::reloc_pcrel_2byte:
+ case FK_PCRel_2:
Type = ELF::R_MICROBLAZE_32_PCREL;
break;
}
@@ -1644,7 +1648,7 @@
default: llvm_unreachable("invalid fixup kind!");
case FK_Data_8: Type = ELF::R_X86_64_64; break;
case X86::reloc_signed_4byte:
- case X86::reloc_pcrel_4byte:
+ case FK_PCRel_4:
assert(isInt<32>(Target.getConstant()));
switch (Modifier) {
default:
@@ -1670,7 +1674,7 @@
Type = ELF::R_X86_64_32;
break;
case FK_Data_2: Type = ELF::R_X86_64_16; break;
- case X86::reloc_pcrel_1byte:
+ case FK_PCRel_1:
case FK_Data_1: Type = ELF::R_X86_64_8; break;
}
}
@@ -1697,7 +1701,7 @@
// FIXME: Should we avoid selecting reloc_signed_4byte in 32 bit mode
// instead?
case X86::reloc_signed_4byte:
- case X86::reloc_pcrel_4byte:
+ case FK_PCRel_4:
case FK_Data_4:
switch (Modifier) {
default:
@@ -1735,7 +1739,7 @@
}
break;
case FK_Data_2: Type = ELF::R_386_16; break;
- case X86::reloc_pcrel_1byte:
+ case FK_PCRel_1:
case FK_Data_1: Type = ELF::R_386_8; break;
}
}
diff --git a/llvm/lib/MC/MCCodeEmitter.cpp b/llvm/lib/MC/MCCodeEmitter.cpp
index d513237..b11751c 100644
--- a/llvm/lib/MC/MCCodeEmitter.cpp
+++ b/llvm/lib/MC/MCCodeEmitter.cpp
@@ -22,9 +22,12 @@
{ "FK_Data_1", 0, 8, 0 },
{ "FK_Data_2", 0, 16, 0 },
{ "FK_Data_4", 0, 32, 0 },
- { "FK_Data_8", 0, 64, 0 }
+ { "FK_Data_8", 0, 64, 0 },
+ { "FK_PCRel_1", 0, 8, MCFixupKindInfo::FKF_IsPCRel },
+ { "FK_PCRel_2", 0, 16, MCFixupKindInfo::FKF_IsPCRel },
+ { "FK_PCRel_4", 0, 32, MCFixupKindInfo::FKF_IsPCRel }
};
- assert(Kind <= 3 && "Unknown fixup kind");
+ assert(Kind <= 6 && "Unknown fixup kind");
return Builtins[Kind];
}
diff --git a/llvm/lib/MC/MCELFStreamer.cpp b/llvm/lib/MC/MCELFStreamer.cpp
index ec28a90..5b707cb 100644
--- a/llvm/lib/MC/MCELFStreamer.cpp
+++ b/llvm/lib/MC/MCELFStreamer.cpp
@@ -398,7 +398,7 @@
DF->getContents().push_back(uint8_t(AbsValue >> (i * 8)));
} else {
DF->addFixup(MCFixup::Create(DF->getContents().size(), AddValueSymbols(Value),
- MCFixup::getKindForSize(Size)));
+ MCFixup::getKindForSize(Size, false)));
DF->getContents().resize(DF->getContents().size() + Size, 0);
}
}
diff --git a/llvm/lib/MC/MCMachOStreamer.cpp b/llvm/lib/MC/MCMachOStreamer.cpp
index 88fa230..39b1d4f 100644
--- a/llvm/lib/MC/MCMachOStreamer.cpp
+++ b/llvm/lib/MC/MCMachOStreamer.cpp
@@ -337,7 +337,7 @@
} else {
DF->addFixup(MCFixup::Create(DF->getContents().size(),
AddValueSymbols(Value),
- MCFixup::getKindForSize(Size)));
+ MCFixup::getKindForSize(Size, false)));
DF->getContents().resize(DF->getContents().size() + Size, 0);
}
}
diff --git a/llvm/lib/MC/MCPureStreamer.cpp b/llvm/lib/MC/MCPureStreamer.cpp
index 6af1659..2dfb389 100644
--- a/llvm/lib/MC/MCPureStreamer.cpp
+++ b/llvm/lib/MC/MCPureStreamer.cpp
@@ -173,7 +173,7 @@
} else {
DF->addFixup(MCFixup::Create(DF->getContents().size(),
AddValueSymbols(Value),
- MCFixup::getKindForSize(Size)));
+ MCFixup::getKindForSize(Size, false)));
DF->getContents().resize(DF->getContents().size() + Size, 0);
}
}
diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp
index a70f1c3..45d2ff7 100644
--- a/llvm/lib/MC/MachObjectWriter.cpp
+++ b/llvm/lib/MC/MachObjectWriter.cpp
@@ -32,11 +32,11 @@
static unsigned getFixupKindLog2Size(unsigned Kind) {
switch (Kind) {
default: llvm_unreachable("invalid fixup kind!");
- case X86::reloc_pcrel_1byte:
+ case FK_PCRel_1:
case FK_Data_1: return 0;
- case X86::reloc_pcrel_2byte:
+ case FK_PCRel_2:
case FK_Data_2: return 1;
- case X86::reloc_pcrel_4byte:
+ case FK_PCRel_4:
case X86::reloc_riprel_4byte:
case X86::reloc_riprel_4byte_movq_load:
case X86::reloc_signed_4byte:
@@ -49,9 +49,9 @@
switch (Kind) {
default:
return false;
- case X86::reloc_pcrel_1byte:
- case X86::reloc_pcrel_2byte:
- case X86::reloc_pcrel_4byte:
+ case FK_PCRel_1:
+ case FK_PCRel_2:
+ case FK_PCRel_4:
case X86::reloc_riprel_4byte:
case X86::reloc_riprel_4byte_movq_load:
return true;
diff --git a/llvm/lib/MC/WinCOFFObjectWriter.cpp b/llvm/lib/MC/WinCOFFObjectWriter.cpp
index fd79203..b330bdd 100644
--- a/llvm/lib/MC/WinCOFFObjectWriter.cpp
+++ b/llvm/lib/MC/WinCOFFObjectWriter.cpp
@@ -689,7 +689,7 @@
Reloc.Data.VirtualAddress += Fixup.getOffset();
switch ((unsigned)Fixup.getKind()) {
- case X86::reloc_pcrel_4byte:
+ case FK_PCRel_4:
case X86::reloc_riprel_4byte:
case X86::reloc_riprel_4byte_movq_load:
Reloc.Data.Type = Is64Bit ? COFF::IMAGE_REL_AMD64_REL32
diff --git a/llvm/lib/MC/WinCOFFStreamer.cpp b/llvm/lib/MC/WinCOFFStreamer.cpp
index 376751b..0f02248 100644
--- a/llvm/lib/MC/WinCOFFStreamer.cpp
+++ b/llvm/lib/MC/WinCOFFStreamer.cpp
@@ -363,7 +363,7 @@
} else {
DF->addFixup(MCFixup::Create(DF->getContents().size(),
AddValueSymbols(Value),
- MCFixup::getKindForSize(Size)));
+ MCFixup::getKindForSize(Size, false)));
DF->getContents().resize(DF->getContents().size() + Size, 0);
}
}