summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael J. Spencer <bigcheesegs@gmail.com>2013-01-08 02:12:15 +0000
committerMichael J. Spencer <bigcheesegs@gmail.com>2013-01-08 02:12:15 +0000
commitd2a4ccf8f99213c39ffc35bf636d0a15444d3abc (patch)
tree4f4e42f532d325ce36017da06ddbec0493086829
parent8f80cd92d9c77c58bb39add16b4ed2c6dd3a721d (diff)
downloadbcm5719-llvm-d2a4ccf8f99213c39ffc35bf636d0a15444d3abc.tar.gz
bcm5719-llvm-d2a4ccf8f99213c39ffc35bf636d0a15444d3abc.zip
[ELF] Add R_X86_64_64 relocation.
llvm-svn: 171836
-rw-r--r--lld/lib/ReaderWriter/ELF/X86_64Reference.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/lld/lib/ReaderWriter/ELF/X86_64Reference.cpp b/lld/lib/ReaderWriter/ELF/X86_64Reference.cpp
index 0ac5a652983..fde00bd9e5d 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64Reference.cpp
+++ b/lld/lib/ReaderWriter/ELF/X86_64Reference.cpp
@@ -20,6 +20,14 @@
using namespace llvm::ELF;
namespace {
+/// \brief R_X86_64_64 - word64: S + A
+int reloc64(uint8_t *location, uint64_t P, uint64_t S, uint64_t A) {
+ uint64_t result = S + A;
+ *reinterpret_cast<llvm::support::ulittle64_t *>(location) = result |
+ (uint64_t)*reinterpret_cast<llvm::support::ulittle64_t *>(location);
+ return 0;
+}
+
/// \brief R_X86_64_PC32 - word32: S + A - P
int relocPC32(uint8_t *location, uint64_t P, uint64_t S, uint64_t A) {
uint32_t result = (uint32_t)((S + A) - P);
@@ -50,6 +58,7 @@ int reloc32S(uint8_t *location, uint64_t P, uint64_t S, uint64_t A) {
namespace lld {
namespace elf {
X86_64KindHandler::X86_64KindHandler(){
+ _fixupHandler[R_X86_64_64] = reloc64;
_fixupHandler[R_X86_64_PC32] = relocPC32;
_fixupHandler[R_X86_64_32] = reloc32;
_fixupHandler[R_X86_64_32S] = reloc32S;
@@ -61,6 +70,7 @@ X86_64KindHandler::~X86_64KindHandler() {
Reference::Kind X86_64KindHandler::stringToKind(StringRef str) {
return llvm::StringSwitch<Reference::Kind>(str)
.Case("none", none)
+ .Case("R_X86_64_64", R_X86_64_64)
.Case("R_X86_64_PC32", R_X86_64_PC32)
.Case("R_X86_64_32S", R_X86_64_32S)
.Default(invalid);
@@ -68,6 +78,8 @@ Reference::Kind X86_64KindHandler::stringToKind(StringRef str) {
StringRef X86_64KindHandler::kindToString(Reference::Kind kind) {
switch ((int32_t)kind) {
+ case R_X86_64_64:
+ return "R_X86_64_64";
case R_X86_64_PC32:
return "R_X86_64_PC32";
case R_X86_64_32S:
OpenPOWER on IntegriCloud