aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-08-24 16:35:38 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-08-24 16:35:38 +0000
commitf9cfece4e841319f868ef5eac1d5350c35f2bf19 (patch)
treed16e96d2a76706c04b4caa77b1f193a4a19a6929
parente74d4ea48caeee19d9d7f8223340152a0fde11ef (diff)
downloadsrc-f9cfece4e841319f868ef5eac1d5350c35f2bf19.tar.gz
src-f9cfece4e841319f868ef5eac1d5350c35f2bf19.zip
Vendor import of lldb release_50 branch r311606:vendor/lldb/lldb-release_50-r311606
Notes
Notes: svn path=/vendor/lldb/dist/; revision=322845 svn path=/vendor/lldb/lldb-release_50-r311606/; revision=322846; tag=vendor/lldb/lldb-release_50-r311606
-rw-r--r--packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py2
-rw-r--r--source/Core/CMakeLists.txt10
-rw-r--r--source/Host/CMakeLists.txt16
-rw-r--r--source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp3
-rw-r--r--source/Plugins/Process/Utility/RegisterContext_x86.h3
-rw-r--r--unittests/CMakeLists.txt6
6 files changed, 34 insertions, 6 deletions
diff --git a/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py b/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py
index cc1389ca6b01..fe6ce2c25a3e 100644
--- a/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py
+++ b/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py
@@ -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 | (
diff --git a/source/Core/CMakeLists.txt b/source/Core/CMakeLists.txt
index c5105bd9ab12..c345afb4064a 100644
--- a/source/Core/CMakeLists.txt
+++ b/source/Core/CMakeLists.txt
@@ -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
diff --git a/source/Host/CMakeLists.txt b/source/Host/CMakeLists.txt
index 2ee599cf43a2..1696e7eab6ea 100644
--- a/source/Host/CMakeLists.txt
+++ b/source/Host/CMakeLists.txt
@@ -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}
diff --git a/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp b/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
index 6563796db12c..2cb17cb182e2 100644
--- a/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
+++ b/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
@@ -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 {
diff --git a/source/Plugins/Process/Utility/RegisterContext_x86.h b/source/Plugins/Process/Utility/RegisterContext_x86.h
index ab2ca2bb6c2c..5f6fc295a15c 100644
--- a/source/Plugins/Process/Utility/RegisterContext_x86.h
+++ b/source/Plugins/Process/Utility/RegisterContext_x86.h
@@ -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 {
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index c7c3140b121a..f7b611802fbf 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -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)