[Lldb-commits] [lldb] r339071 - Revert "Add a relocation for R_AARCH64_ABS32 in ObjectFileELF"

Stephane Sezer via lldb-commits lldb-commits at lists.llvm.org
Mon Aug 6 15:21:28 PDT 2018


Author: sas
Date: Mon Aug  6 15:21:28 2018
New Revision: 339071

URL: http://llvm.org/viewvc/llvm-project?rev=339071&view=rev
Log:
Revert "Add a relocation for R_AARCH64_ABS32 in ObjectFileELF"

This reverts commit f055ce7eb893cd0d17ebcfd4125018f46f983aff.

Modified:
    lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=339071&r1=339070&r2=339071&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Mon Aug  6 15:21:28 2018
@@ -2697,20 +2697,15 @@ unsigned ObjectFileELF::ApplyRelocations
         break;
       }
       case R_X86_64_32:
-      case R_X86_64_32S:
-      case R_AARCH64_ABS32: {
+      case R_X86_64_32S: {
         symbol = symtab->FindSymbolByID(reloc_symbol(rel));
         if (symbol) {
           addr_t value = symbol->GetAddressRef().GetFileAddress();
           value += ELFRelocation::RelocAddend32(rel);
-          if (!((IsRelocABS32(rel) && value <= UINT32_MAX) ||
-                (reloc_type(rel) == R_X86_64_32S &&
-                 ((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");
-          }
+          assert(
+              (reloc_type(rel) == R_X86_64_32 && (value <= UINT32_MAX)) ||
+              (reloc_type(rel) == R_X86_64_32S &&
+               ((int64_t)value <= INT32_MAX && (int64_t)value >= INT32_MIN)));
           uint32_t truncated_addr = (value & 0xFFFFFFFF);
           DataBufferSP &data_buffer_sp = debug_data.GetSharedDataBuffer();
           uint32_t *dst = reinterpret_cast<uint32_t *>(




More information about the lldb-commits mailing list