brucem created this revision. brucem added reviewers: clayborg, labath. brucem added a subscriber: lldb-commits.
* cmake/LLDBDependencies.cmake: elf-core is already included globally in LLDB_USED_LIBS, so it doesn't need to be re-added on individual platforms. * lib/Makefile: elf-core is linked on each platform, so move it to the global list of used libraries. * source/Plugins/Makefile: elf-core is built on each platform, so move it to the global list of things to build. http://reviews.llvm.org/D12762 Files: cmake/LLDBDependencies.cmake lib/Makefile source/Plugins/Makefile Index: source/Plugins/Makefile =================================================================== --- source/Plugins/Makefile +++ source/Plugins/Makefile @@ -18,7 +18,7 @@ ObjectContainer/BSD-Archive ObjectFile/ELF ObjectFile/PECOFF \ ObjectContainer/Universal-Mach-O ObjectFile/Mach-O \ ObjectFile/JIT SymbolFile/DWARF SymbolFile/Symtab Process/Utility \ - DynamicLoader/Static Platform Process/gdb-remote \ + DynamicLoader/Static Platform Process/elf-core Process/gdb-remote \ Instruction/ARM Instruction/ARM64 Instruction/MIPS Instruction/MIPS64 \ UnwindAssembly/InstEmulation UnwindAssembly/x86 \ LanguageRuntime/CPlusPlus/ItaniumABI \ @@ -45,24 +45,20 @@ PARALLEL_DIRS += SymbolVendor/MacOSX #PARALLEL_DIRS += Process/MacOSX-User PARALLEL_DIRS += Process/mach-core -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifeq ($(HOST_OS),Linux) PARALLEL_DIRS += Process/Linux Process/POSIX -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifeq ($(HOST_OS),MingW) -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) PARALLEL_DIRS += Process/FreeBSD Process/POSIX -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif Index: lib/Makefile =================================================================== --- lib/Makefile +++ lib/Makefile @@ -71,6 +71,7 @@ lldbPluginObjectFilePECOFF.a \ lldbPluginOSPython.a \ lldbPluginPlatformGDB.a \ + lldbPluginProcessElfCore.a \ lldbPluginProcessGDBRemote.a \ lldbPluginSymbolFileDWARF.a \ lldbPluginSymbolFileSymtab.a \ @@ -124,26 +125,22 @@ lldbPluginSymbolVendorMacOSX.a \ lldbPluginProcessDarwin.a \ lldbPluginProcessMachCore.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif ifeq ($(HOST_OS),Linux) USEDLIBS += lldbPluginProcessLinux.a \ lldbPluginProcessPOSIX.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif ifeq ($(HOST_OS),MingW) - USEDLIBS += lldbPluginProcessElfCore.a \ - lldbPluginJITLoaderGDB.a + USEDLIBS += lldbPluginJITLoaderGDB.a endif ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) USEDLIBS += lldbPluginProcessPOSIX.a \ lldbPluginProcessFreeBSD.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif Index: cmake/LLDBDependencies.cmake =================================================================== --- cmake/LLDBDependencies.cmake +++ cmake/LLDBDependencies.cmake @@ -89,16 +89,14 @@ list(APPEND LLDB_USED_LIBS lldbPluginProcessLinux lldbPluginProcessPOSIX - lldbPluginProcessElfCore ) endif () # FreeBSD-only libraries if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" ) list(APPEND LLDB_USED_LIBS lldbPluginProcessFreeBSD lldbPluginProcessPOSIX - lldbPluginProcessElfCore ) endif ()
Index: source/Plugins/Makefile =================================================================== --- source/Plugins/Makefile +++ source/Plugins/Makefile @@ -18,7 +18,7 @@ ObjectContainer/BSD-Archive ObjectFile/ELF ObjectFile/PECOFF \ ObjectContainer/Universal-Mach-O ObjectFile/Mach-O \ ObjectFile/JIT SymbolFile/DWARF SymbolFile/Symtab Process/Utility \ - DynamicLoader/Static Platform Process/gdb-remote \ + DynamicLoader/Static Platform Process/elf-core Process/gdb-remote \ Instruction/ARM Instruction/ARM64 Instruction/MIPS Instruction/MIPS64 \ UnwindAssembly/InstEmulation UnwindAssembly/x86 \ LanguageRuntime/CPlusPlus/ItaniumABI \ @@ -45,24 +45,20 @@ PARALLEL_DIRS += SymbolVendor/MacOSX #PARALLEL_DIRS += Process/MacOSX-User PARALLEL_DIRS += Process/mach-core -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifeq ($(HOST_OS),Linux) PARALLEL_DIRS += Process/Linux Process/POSIX -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifeq ($(HOST_OS),MingW) -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) PARALLEL_DIRS += Process/FreeBSD Process/POSIX -PARALLEL_DIRS += Process/elf-core PARALLEL_DIRS += JITLoader/GDB endif Index: lib/Makefile =================================================================== --- lib/Makefile +++ lib/Makefile @@ -71,6 +71,7 @@ lldbPluginObjectFilePECOFF.a \ lldbPluginOSPython.a \ lldbPluginPlatformGDB.a \ + lldbPluginProcessElfCore.a \ lldbPluginProcessGDBRemote.a \ lldbPluginSymbolFileDWARF.a \ lldbPluginSymbolFileSymtab.a \ @@ -124,26 +125,22 @@ lldbPluginSymbolVendorMacOSX.a \ lldbPluginProcessDarwin.a \ lldbPluginProcessMachCore.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif ifeq ($(HOST_OS),Linux) USEDLIBS += lldbPluginProcessLinux.a \ lldbPluginProcessPOSIX.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif ifeq ($(HOST_OS),MingW) - USEDLIBS += lldbPluginProcessElfCore.a \ - lldbPluginJITLoaderGDB.a + USEDLIBS += lldbPluginJITLoaderGDB.a endif ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD)) USEDLIBS += lldbPluginProcessPOSIX.a \ lldbPluginProcessFreeBSD.a \ - lldbPluginProcessElfCore.a \ lldbPluginJITLoaderGDB.a endif Index: cmake/LLDBDependencies.cmake =================================================================== --- cmake/LLDBDependencies.cmake +++ cmake/LLDBDependencies.cmake @@ -89,16 +89,14 @@ list(APPEND LLDB_USED_LIBS lldbPluginProcessLinux lldbPluginProcessPOSIX - lldbPluginProcessElfCore ) endif () # FreeBSD-only libraries if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" ) list(APPEND LLDB_USED_LIBS lldbPluginProcessFreeBSD lldbPluginProcessPOSIX - lldbPluginProcessElfCore ) endif ()
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits