Add support to properly reference private symbols on relocation entries.
Use proper relocation type to build relocations for JumpTables (rodata
sections).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76326 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86ELFWriterInfo.cpp b/lib/Target/X86/X86ELFWriterInfo.cpp
index 2736a81..4002e26 100644
--- a/lib/Target/X86/X86ELFWriterInfo.cpp
+++ b/lib/Target/X86/X86ELFWriterInfo.cpp
@@ -43,7 +43,7 @@
return R_X86_64_64;
case X86::reloc_picrel_word:
default:
- llvm_unreachable("unknown relocation type");
+ llvm_unreachable("unknown x86_64 machine relocation type");
}
} else {
switch(MachineRelTy) {
@@ -54,22 +54,55 @@
case X86::reloc_absolute_dword:
case X86::reloc_picrel_word:
default:
- llvm_unreachable("unknown relocation type");
+ llvm_unreachable("unknown x86 machine relocation type");
}
}
return 0;
}
-long int X86ELFWriterInfo::getAddendForRelTy(unsigned RelTy) const {
+long int X86ELFWriterInfo::getDefaultAddendForRelTy(unsigned RelTy) const {
if (is64Bit) {
switch(RelTy) {
case R_X86_64_PC32: return -4;
- break;
case R_X86_64_32: return 0;
- break;
+ default:
+ llvm_unreachable("unknown x86_64 relocation type");
+ }
+ } else {
+ switch(RelTy) {
+ case R_386_PC32: return -4;
+ case R_386_32: return 0;
default:
llvm_unreachable("unknown x86 relocation type");
}
}
return 0;
}
+
+unsigned X86ELFWriterInfo::getRelocationTySize(unsigned RelTy) const {
+ if (is64Bit) {
+ switch(RelTy) {
+ case R_X86_64_PC32:
+ case R_X86_64_32:
+ return 32;
+ case R_X86_64_64:
+ return 64;
+ default:
+ llvm_unreachable("unknown x86_64 relocation type");
+ }
+ } else {
+ switch(RelTy) {
+ case R_386_PC32:
+ case R_386_32:
+ return 32;
+ default:
+ llvm_unreachable("unknown x86 relocation type");
+ }
+ }
+ return 0;
+}
+
+unsigned X86ELFWriterInfo::getJumpTableMachineRelocationTy() const {
+ return X86::reloc_absolute_dword;
+}
+
diff --git a/lib/Target/X86/X86ELFWriterInfo.h b/lib/Target/X86/X86ELFWriterInfo.h
index 2ba1a0b..f372658 100644
--- a/lib/Target/X86/X86ELFWriterInfo.h
+++ b/lib/Target/X86/X86ELFWriterInfo.h
@@ -51,7 +51,14 @@
/// getAddendForRelTy - Gets the addend value for an ELF relocation entry
/// based on the target relocation type
- virtual long int getAddendForRelTy(unsigned RelTy) const;
+ virtual long int getDefaultAddendForRelTy(unsigned RelTy) const;
+
+ /// getRelTySize - Returns the size of relocatable field in bits
+ virtual unsigned getRelocationTySize(unsigned RelTy) const;
+
+ /// getJumpTableRelocationTy - Returns the machine relocation type used
+ /// to reference a jumptable.
+ virtual unsigned getJumpTableMachineRelocationTy() const;
};
} // end llvm namespace