maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Add a relocation for R_AARCH64_ABS32 in ObjectFileELF" 

This reverts commit f055ce7eb893cd0d17ebcfd4125018f46f983aff.

llvm-svn: 339071
This commit is contained in:
Stephane Sezer 2018-08-06 22:21:28 +00:00
parent f2a167fb1d
commit 0c679b7108
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
View File

@ -2697,20 +2697,15 @@ unsigned ObjectFileELF::ApplyRelocations(
break; break;
} }
case R_X86_64_32: case R_X86_64_32:
case R_X86_64_32S: case R_X86_64_32S: {
case R_AARCH64_ABS32: {
symbol = symtab->FindSymbolByID(reloc_symbol(rel)); symbol = symtab->FindSymbolByID(reloc_symbol(rel));
if (symbol) { if (symbol) {
addr_t value = symbol->GetAddressRef().GetFileAddress(); addr_t value = symbol->GetAddressRef().GetFileAddress();
value += ELFRelocation::RelocAddend32(rel); value += ELFRelocation::RelocAddend32(rel);
if (!((IsRelocABS32(rel) && value <= UINT32_MAX) || assert(
(reloc_type(rel) == R_X86_64_32S && (reloc_type(rel) == R_X86_64_32 && (value <= UINT32_MAX)) ||
((int64_t)value <= INT32_MAX && (reloc_type(rel) == R_X86_64_32S &&
(int64_t)value >= INT32_MIN)))) { ((int64_t)value <= INT32_MAX && (int64_t)value >= INT32_MIN)));
Log *log =
lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_MODULES);
log->Printf("Failed to apply debug info relocations");
}
uint32_t truncated_addr = (value & 0xFFFFFFFF); uint32_t truncated_addr = (value & 0xFFFFFFFF);
DataBufferSP &data_buffer_sp = debug_data.GetSharedDataBuffer(); DataBufferSP &data_buffer_sp = debug_data.GetSharedDataBuffer();
uint32_t *dst = reinterpret_cast<uint32_t *>( uint32_t *dst = reinterpret_cast<uint32_t *>(