Date: Thu, 24 Aug 2017 16:35:38 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r322845 - in vendor/lldb/dist: packages/Python/lldbsuite/test/functionalities/register/register_command source/Core source/Host source/Plugins/Process/Utility unittests Message-ID: <201708241635.v7OGZc6d074263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Thu Aug 24 16:35:38 2017 New Revision: 322845 URL: https://svnweb.freebsd.org/changeset/base/322845 Log: Vendor import of lldb release_50 branch r311606: https://llvm.org/svn/llvm-project/lldb/branches/release_50@311606 Modified: vendor/lldb/dist/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py vendor/lldb/dist/source/Core/CMakeLists.txt vendor/lldb/dist/source/Host/CMakeLists.txt vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContext_x86.h vendor/lldb/dist/unittests/CMakeLists.txt Modified: vendor/lldb/dist/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py ============================================================================== --- vendor/lldb/dist/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py Thu Aug 24 16:35:35 2017 (r322844) +++ vendor/lldb/dist/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py Thu Aug 24 16:35:38 2017 (r322845) @@ -256,7 +256,7 @@ class RegisterCommandsTestCase(TestBase): self.expect( "register read ftag", substrs=[ 'ftag' + ' = ', str( - "0x%0.2x" % + "0x%0.4x" % (reg_value_ftag_initial | ( 1 << fstat_top_pointer_initial)))]) reg_value_ftag_initial = reg_value_ftag_initial | ( Modified: vendor/lldb/dist/source/Core/CMakeLists.txt ============================================================================== --- vendor/lldb/dist/source/Core/CMakeLists.txt Thu Aug 24 16:35:35 2017 (r322844) +++ vendor/lldb/dist/source/Core/CMakeLists.txt Thu Aug 24 16:35:38 2017 (r322845) @@ -1,3 +1,12 @@ +set(LLDB_CURSES_LIBS) + +if (NOT LLDB_DISABLE_CURSES) + list(APPEND LLDB_CURSES_LIBS ${CURSES_LIBRARIES}) + if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO) + list(APPEND LLDB_CURSES_LIBS ${TERMINFO_LIBS}) + endif() +endif() + add_lldb_library(lldbCore Address.cpp AddressRange.cpp @@ -62,6 +71,7 @@ add_lldb_library(lldbCore lldbPluginCPlusPlusLanguage lldbPluginObjCLanguage lldbPluginObjectFileJIT + ${LLDB_CURSES_LIBS} LINK_COMPONENTS BinaryFormat Modified: vendor/lldb/dist/source/Host/CMakeLists.txt ============================================================================== --- vendor/lldb/dist/source/Host/CMakeLists.txt Thu Aug 24 16:35:35 2017 (r322844) +++ vendor/lldb/dist/source/Host/CMakeLists.txt Thu Aug 24 16:35:38 2017 (r322845) @@ -156,9 +156,23 @@ if (${get_python_libdir}) endif() endif() +set(EXTRA_LIBS) if (CMAKE_SYSTEM_NAME MATCHES "NetBSD") - set(EXTRA_LIBS kvm) + list(APPEND EXTRA_LIBS kvm) endif () +if (APPLE) + list(APPEND EXTRA_LIBS xml2) +else () + if (LIBXML2_FOUND) + list(APPEND EXTRA_LIBS ${LIBXML2_LIBRARIES}) + endif() +endif () +if (HAVE_LIBDL) + list(APPEND EXTRA_LIBS ${CMAKE_DL_LIBS}) +endif() +if (NOT LLDB_DISABLE_LIBEDIT) + list(APPEND EXTRA_LIBS edit) +endif() add_lldb_library(lldbHost ${HOST_SOURCES} Modified: vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp ============================================================================== --- vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp Thu Aug 24 16:35:35 2017 (r322844) +++ vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp Thu Aug 24 16:35:38 2017 (r322845) @@ -36,8 +36,7 @@ struct GPR { struct FPR_i386 { uint16_t fctrl; // FPU Control Word (fcw) uint16_t fstat; // FPU Status Word (fsw) - uint8_t ftag; // FPU Tag Word (ftw) - uint8_t reserved_1; // Reserved + uint16_t ftag; // FPU Tag Word (ftw) uint16_t fop; // Last Instruction Opcode (fop) union { struct { Modified: vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContext_x86.h ============================================================================== --- vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContext_x86.h Thu Aug 24 16:35:35 2017 (r322844) +++ vendor/lldb/dist/source/Plugins/Process/Utility/RegisterContext_x86.h Thu Aug 24 16:35:38 2017 (r322845) @@ -257,8 +257,7 @@ struct XMMReg { struct FXSAVE { uint16_t fctrl; // FPU Control Word (fcw) uint16_t fstat; // FPU Status Word (fsw) - uint8_t ftag; // FPU Tag Word (ftw) - uint8_t reserved_1; // Reserved + uint16_t ftag; // FPU Tag Word (ftw) uint16_t fop; // Last Instruction Opcode (fop) union { struct { Modified: vendor/lldb/dist/unittests/CMakeLists.txt ============================================================================== --- vendor/lldb/dist/unittests/CMakeLists.txt Thu Aug 24 16:35:35 2017 (r322844) +++ vendor/lldb/dist/unittests/CMakeLists.txt Thu Aug 24 16:35:38 2017 (r322845) @@ -19,6 +19,12 @@ if (LLDB_BUILT_STANDALONE) if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest AND NOT TARGET gtest) add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/unittest utils/unittest) endif() + # LLVMTestingSupport library is needed for Process/gdb-remote. + if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support + AND NOT TARGET LLVMTestingSupport) + add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support + lib/Testing/Support) + endif() endif() function(add_lldb_unittest test_name)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708241635.v7OGZc6d074263>