This is an archive of the discontinued LLVM Phabricator instance.

Differential D69523

[debugserver] Detect arch from LLVM_DEFAULT_TARGET_TRIPLE
ClosedPublic

Authored by vsk on Oct 28 2019, 12:07 PM.

Details

Reviewers
davide
JDevlieghere
xiaobai
jasonmolenda
Commits
rG82d3ba87d06f: [debugserver] Detect arch from LLVM_DEFAULT_TARGET_TRIPLE
Summary

The debugserver build needs to conditionally include files depending on the
target architecture.

Switch on the architecture specified by LLVM_DEFAULT_TARGET_TRIPLE, as
the llvm and swift build systems use this variable to identify the
target (the latter, indirectly, through LLVM_HOST_TRIPLE).

It would be possible to switch on CMAKE_OSX_ARCHITECTURES, but the swift
build does not provide it, preferring instead to pass arch-specific
CFLAGS etc explicitly. Switching on LLVM_HOST_TRIPLE is also an option,
but it breaks down when cross-compiling.

Diff Detail

Event Timeline

vsk created this revision.Oct 28 2019, 12:07 PM
Herald added a subscriber: mgorny. · View Herald TranscriptOct 28 2019, 12:07 PM
vsk added a reviewer: jasonmolenda.Oct 28 2019, 12:08 PM
davide accepted this revision.Oct 28 2019, 3:16 PM

LGTM

This revision is now accepted and ready to land.Oct 28 2019, 3:16 PM
vsk closed this revision.Oct 28 2019, 5:18 PM

Landed in 82d3ba.

Revision Contents

PathSize
lldb/
tools/
debugserver/
source/
MacOSX/
20 lines

Diff 226725

lldb/tools/debugserver/source/MacOSX/CMakeLists.txt

if("${CMAKE_OSX_ARCHITECTURES}" MATCHES ".*arm.*") # The debugserver build needs to conditionally include files depending on the
# target architecture.
#
# Switch on the architecture specified by LLVM_DEFAULT_TARGET_TRIPLE, as
# the llvm and swift build systems use this variable to identify the
# target (the latter, indirectly, through LLVM_HOST_TRIPLE).
#
# It would be possible to switch on CMAKE_OSX_ARCHITECTURES, but the swift
# build does not provide it, preferring instead to pass arch-specific
# CFLAGS etc explicitly. Switching on LLVM_HOST_TRIPLE is also an option,
# but it breaks down when cross-compiling.
string(REGEX MATCH "^[^-]*" LLDB_DEBUGSERVER_ARCH ${LLVM_DEFAULT_TARGET_TRIPLE})
if("${LLDB_DEBUGSERVER_ARCH}" MATCHES ".*arm.*")
list(APPEND SOURCES arm/DNBArchImpl.cpp arm64/DNBArchImplARM64.cpp) list(APPEND SOURCES arm/DNBArchImpl.cpp arm64/DNBArchImplARM64.cpp)
include_directories(${CURRENT_SOURCE_DIR}/arm ${CURRENT_SOURCE_DIR}/arm64) include_directories(${CURRENT_SOURCE_DIR}/arm ${CURRENT_SOURCE_DIR}/arm64)
endif() endif()
if(NOT CMAKE_OSX_ARCHITECTURES OR "${CMAKE_OSX_ARCHITECTURES}" MATCHES ".*86.*") if(NOT LLDB_DEBUGSERVER_ARCH OR "${LLDB_DEBUGSERVER_ARCH}" MATCHES ".*86.*")
list(APPEND SOURCES i386/DNBArchImplI386.cpp x86_64/DNBArchImplX86_64.cpp) list(APPEND SOURCES i386/DNBArchImplI386.cpp x86_64/DNBArchImplX86_64.cpp)
include_directories(${CURRENT_SOURCE_DIR}/i386 ${CURRENT_SOURCE_DIR}/x86_64) include_directories(${CURRENT_SOURCE_DIR}/i386 ${CURRENT_SOURCE_DIR}/x86_64)
endif() endif()
if("${CMAKE_OSX_ARCHITECTURES}" MATCHES ".*ppc.*") if("${LLDB_DEBUGSERVER_ARCH}" MATCHES ".*ppc.*")
list(APPEND SOURCES ppc/DNBArchImpl.cpp) list(APPEND SOURCES ppc/DNBArchImpl.cpp)
include_directories(${CURRENT_SOURCE_DIR}/ppc) include_directories(${CURRENT_SOURCE_DIR}/ppc)
endif() endif()
add_subdirectory(DarwinLog) add_subdirectory(DarwinLog)
include_directories(..) include_directories(..)
include_directories(${LLDB_SOURCE_DIR}/tools/debugserver/source) include_directories(${LLDB_SOURCE_DIR}/tools/debugserver/source)
add_library(lldbDebugserverArchSupport add_library(lldbDebugserverArchSupport
${SOURCES} ${SOURCES}
) )
set_target_properties(lldbDebugserverArchSupport PROPERTIES FOLDER "lldb libraries/debugserver") set_target_properties(lldbDebugserverArchSupport PROPERTIES FOLDER "lldb libraries/debugserver")