rebase of the patches

This commit is contained in:
Sylvestre Ledru 2020-01-14 11:48:13 +01:00
parent 5c9ac1d24c
commit e3f463d048
2 changed files with 13 additions and 13 deletions

View File

@ -12,11 +12,11 @@ which could then break something else.
This probably should have upstream bug but I couldn't find any existing report. This probably should have upstream bug but I couldn't find any existing report.
Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp Index: llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp --- llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -34,6 +34,7 @@ @@ -35,6 +35,7 @@
#include "lldb/Utility/StreamString.h" #include "lldb/Utility/StreamString.h"
#include "llvm/ADT/SmallString.h" #include "llvm/ADT/SmallString.h"
#include "llvm/Support/ScopedPrinter.h" #include "llvm/Support/ScopedPrinter.h"
@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/Plugin
#include "ProcessGDBRemoteLog.h" #include "ProcessGDBRemoteLog.h"
@@ -42,7 +43,7 @@ @@ -43,7 +44,7 @@
#elif defined(_WIN32) #elif defined(_WIN32)
#define DEBUGSERVER_BASENAME "lldb-server.exe" #define DEBUGSERVER_BASENAME "lldb-server.exe"
#else #else

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/tools/argdumper/CMakeLists.txt Index: llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516/lldb/tools/argdumper/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/lldb/tools/argdumper/CMakeLists.txt --- llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516.orig/lldb/tools/argdumper/CMakeLists.txt
+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/tools/argdumper/CMakeLists.txt +++ llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516/lldb/tools/argdumper/CMakeLists.txt
@@ -4,3 +4,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM @@ -4,3 +4,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM
LINK_COMPONENTS LINK_COMPONENTS
Support Support
@ -9,13 +9,13 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/tools/argdump
+ +
+install(TARGETS lldb-argdumper +install(TARGETS lldb-argdumper
+ RUNTIME DESTINATION bin) + RUNTIME DESTINATION bin)
Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/tools/lldb-server/CMakeLists.txt Index: llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516/lldb/tools/lldb-server/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/lldb/tools/lldb-server/CMakeLists.txt --- llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516.orig/lldb/tools/lldb-server/CMakeLists.txt
+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/tools/lldb-server/CMakeLists.txt +++ llvm-toolchain-snapshot_10~++20200114112031+ddbc0b1e516/lldb/tools/lldb-server/CMakeLists.txt
@@ -77,3 +77,7 @@ add_lldb_tool(lldb-server @@ -52,3 +52,7 @@ add_lldb_tool(lldb-server
)
target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source")
target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS}) target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS})
+ +
+install(TARGETS lldb-server +install(TARGETS lldb-server