Skip to content

Cherry-pick LiveDebugValues test additions and debugserver cleanups #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lldb/tools/debugserver/source/DNBArch.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ class DNBArchProtocol {
#include "MacOSX/arm/DNBArchImpl.h"
#include "MacOSX/arm64/DNBArchImplARM64.h"
#include "MacOSX/i386/DNBArchImplI386.h"
#include "MacOSX/ppc/DNBArchImpl.h"
#include "MacOSX/x86_64/DNBArchImplX86_64.h"

#endif
6 changes: 2 additions & 4 deletions lldb/tools/debugserver/source/DNBDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@
#include <unistd.h>

// Define nub_addr_t and the invalid address value from the architecture
#if defined(__x86_64__) || defined(__ppc64__) || defined(__arm64__) || \
defined(__aarch64__)
#if defined(__x86_64__) || defined(__arm64__) || defined(__aarch64__)

// 64 bit address architectures
typedef uint64_t nub_addr_t;
#define INVALID_NUB_ADDRESS ((nub_addr_t)~0ull)

#elif defined(__i386__) || defined(__powerpc__) || defined(__ppc__) || \
defined(__arm__)
#elif defined(__i386__) || defined(__powerpc__) || defined(__arm__)

// 32 bit address architectures

Expand Down
5 changes: 0 additions & 5 deletions lldb/tools/debugserver/source/MacOSX/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ if(NOT LLDB_DEBUGSERVER_ARCH OR "${LLDB_DEBUGSERVER_ARCH}" MATCHES ".*86.*")
include_directories(${CURRENT_SOURCE_DIR}/i386 ${CURRENT_SOURCE_DIR}/x86_64)
endif()

if("${LLDB_DEBUGSERVER_ARCH}" MATCHES ".*ppc.*")
list(APPEND SOURCES ppc/DNBArchImpl.cpp)
include_directories(${CURRENT_SOURCE_DIR}/ppc)
endif()

add_subdirectory(DarwinLog)

include_directories(..)
Expand Down
Loading