Remove NVIDIA external line map configure check (#1162)

Now that we require elfutils >= 0.186, this is no longer needed.
dyninst · Nov 23, 2021 · e6b1883 · e6b1883
1 parent 1912be3
commit e6b1883
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 18 deletions.
diff --git a/cmake/ElfUtils.cmake b/cmake/ElfUtils.cmake
@@ -166,13 +166,3 @@ include_directories(${ElfUtils_INCLUDE_DIRS})
 message(STATUS "ElfUtils includes: ${ElfUtils_INCLUDE_DIRS}")
 message(STATUS "ElfUtils library dirs: ${ElfUtils_LIBRARY_DIRS}")
 message(STATUS "ElfUtils libraries: ${ElfUtils_LIBRARIES}")
-
-include(CheckSymbolExists)
-if(ENABLE_NVIDIA_EXT_LINE_MAP)
-  set(CMAKE_REQUIRED_INCLUDES ${ElfUtils_INCLUDE_DIRS})
-  set(CMAKE_REQUIRED_LIBRARIES ${ElfUtils_LIBRARIES})
-  check_symbol_exists(dwarf_linecontext elfutils/libdw.h _has_exmap)
-  if(NOT _has_exmap)
-    message(FATAL_ERROR "ElfUtils does not support NVIDIA line maps")
-  endif()
-endif()
diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -16,7 +16,6 @@ option(BUILD_DOCS "Build manuals from LaTeX sources" ON)
 option (ENABLE_LTO "Enable Link-Time Optimization" OFF)
 
 option(ENABLE_DEBUGINFOD "Enable debuginfod support" OFF)
-option(ENABLE_NVIDIA_EXT_LINE_MAP "Enable support for NVIDIA extended line map" OFF)
 
 # Some global on/off switches
 if (LIGHTWEIGHT_SYMTAB)

diff --git a/symtabAPI/CMakeLists.txt b/symtabAPI/CMakeLists.txt
@@ -102,8 +102,6 @@ endif()
 
 dyninst_library(symtabAPI ${DEPS})
 
-target_compile_definitions(symtabAPI PRIVATE $<$<BOOL:${ENABLE_NVIDIA_EXT_LINE_MAP}>:ENABLE_NVIDIA_EXT_LINE_MAP>)
-
 if(TARGET ElfUtils)
   add_dependencies(symtabAPI ElfUtils)
 endif()

diff --git a/symtabAPI/src/Object-elf.C b/symtabAPI/src/Object-elf.C
@@ -3789,9 +3789,6 @@ LineInformation* Object::parseLineInfoForObject(StringTablePtr strings)
             cout << "dwarf_linebeginstatement failed" << endl;
             continue;
         }
-// ENABLE_NVIDIA_EXT_LINE_MAP is defined if the Dyninst
-// user wants to have nvidia ex line map support
-#if defined (ENABLE_NVIDIA_EXT_LINE_MAP)
 
         // Only attempt to parse inlining context and inline function name
         // when there is a .debug_str section.
@@ -3800,8 +3797,6 @@ LineInformation* Object::parseLineInfoForObject(StringTablePtr strings)
             current_statement.funcname = dwarf_linefunctionname(dbg, line);
         }
 
-#endif // ENABLE_NVIDIA_EXT_LINE_MAP
-
         if (!isZeroAddress && saved_statement.uninitialized()) {
             saved_statement = current_statement;
         } else if (!isZeroAddress) {