RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-21 03:53:04 +02:00
Code Issues Projects Releases Wiki Activity

Allow ELF64 relocation type to be more than 8 bits.

Browse Source 
Current targets don't have more than 256 relocations so they don't hit this
limit, but ELF64 actually allows more than 8 bits for a relocation type. These
were being truncated on AArch64.

llvm-svn: 171845
This commit is contained in:
Tim Northover 2013-01-08 10:12:09 +00:00
parent a6bb195552
commit c71f9ebb0d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/llvm/Object/ELF.h
View File

@ -387,14 +387,14 @@ struct Elf_Rel_Impl<target_endianness, max_alignment, true, isRela>
// These accessors and mutators correspond to the ELF64_R_SYM, ELF64_R_TYPE,
// and ELF64_R_INFO macros defined in the ELF specification:
uint64_t getSymbol() const { return (r_info >> 32); }
unsigned char getType() const {
return (unsigned char) (r_info & 0xffffffffL);
uint32_t getSymbol() const { return (uint32_t) (r_info >> 32); }
uint32_t getType() const {
return (uint32_t) (r_info & 0xffffffffL);
}
void setSymbol(uint64_t s) { setSymbolAndType(s, getType()); }
void setType(unsigned char t) { setSymbolAndType(getSymbol(), t); }
void setSymbolAndType(uint64_t s, unsigned char t) {
r_info = (s << 32) + (t&0xffffffffL);
void setSymbol(uint32_t s) { setSymbolAndType(s, getType()); }
void setType(uint32_t t) { setSymbolAndType(getSymbol(), t); }
void setSymbolAndType(uint32_t s, uint32_t t) {
r_info = ((uint64_t)s << 32) + (t&0xffffffffL);
}
};
@ -1553,7 +1553,7 @@ error_code ELFObjectFile<target_endianness, max_alignment, is64Bits>
::getRelocationTypeName(DataRefImpl Rel,
SmallVectorImpl<char> &Result) const {
const Elf_Shdr *sec = getSection(Rel.w.b);
uint8_t type;
uint32_t type;
StringRef res;
switch (sec->sh_type) {
default :