diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2020-08-09 15:52:38 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2020-08-09 15:52:38 +0000 |
| commit | 3564c224e19bb101c38377afea11f76002259f29 (patch) | |
| tree | 03760df20997ce4fc2b3e386af431e8ed462fa39 /gnu/llvm/lldb | |
| parent | 3b64cbebab7e4b3804c0b8b10522a72e53167188 (diff) | |
Import LLVM 10.0.1 including clang, lld and lldb.
Diffstat (limited to 'gnu/llvm/lldb')
| -rw-r--r-- | gnu/llvm/lldb/source/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gnu/llvm/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gnu/llvm/lldb/source/CMakeLists.txt b/gnu/llvm/lldb/source/CMakeLists.txt index d229f74904a..b196147e68e 100644 --- a/gnu/llvm/lldb/source/CMakeLists.txt +++ b/gnu/llvm/lldb/source/CMakeLists.txt @@ -18,14 +18,14 @@ endforeach() set(version_inc "${CMAKE_CURRENT_BINARY_DIR}/VCSVersion.inc") set(generate_vcs_version_script "${LLVM_CMAKE_PATH}/GenerateVersionFromVCS.cmake") -if(lldb_vc) +if(lldb_vc AND LLVM_APPEND_VC_REV) set(lldb_source_dir ${LLDB_SOURCE_DIR}) endif() add_custom_command(OUTPUT "${version_inc}" DEPENDS "${lldb_vc}" "${generate_vcs_version_script}" COMMAND ${CMAKE_COMMAND} "-DNAMES=LLDB" - "-DLLDB_SOURCE_DIR=${LLDB_SOURCE_DIR}" + "-DLLDB_SOURCE_DIR=${lldb_source_dir}" "-DHEADER_FILE=${version_inc}" -P "${generate_vcs_version_script}") diff --git a/gnu/llvm/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/gnu/llvm/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp index 2e62e3292b9..750bc77bdf7 100644 --- a/gnu/llvm/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/gnu/llvm/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -780,6 +780,9 @@ std::unique_ptr<CallFrameInfo> ObjectFilePECOFF::CreateCallFrameInfo() { if (!data_dir_exception.vmaddr) return {}; + if (m_coff_header.machine != llvm::COFF::IMAGE_FILE_MACHINE_AMD64) + return {}; + return std::make_unique<PECallFrameInfo>(*this, data_dir_exception.vmaddr, data_dir_exception.vmsize); } |