Hoist debugserver arch-dep sources out of a side CMakeLists into the debugserver main CMakeLists

[jasonmolenda]

Summary

There was historical reasons why having the debugserver architecture dependent files built in their own separate CMakeLists.txt file was necessary, but that isn't true any longer. This patch puts them in the debugserver source/CMakeLists.txt to have them all organized in the same place.

I'm also considering removing the i386 and armv7 architecture dependent files; we haven't used these in years at Apple, although there may be open source contributors who are using lldb on older OSes. I'll do that in a separate commit at some point, so we can roll it back if there are requests to keep this code around.

[JDevlieghere]

LGTM

lldb/tools/debugserver/source/CMakeLists.txt

 include(CheckCXXCompilerFlag)
 include(CheckLibraryExists)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
 include_directories(${LLDB_SOURCE_DIR}/source)
-
 include_directories(MacOSX)
+include_directories(MacOSX/i386)
+include_directories(MacOSX/x86_64)
+include_directories(MacOSX/arm)
+include_directories(MacOSX/arm64)
 
 function(check_certificate identity result_valid)
   execute_process(
     COMMAND security find-certificate -Z -p -c ${identity} /Library/Keychains/System.keychain
     RESULT_VARIABLE exit_code OUTPUT_QUIET ERROR_QUIET)
   if(exit_code)
     set(${result_valid} FALSE PARENT_SCOPE)
   else()

 # You can only debug arm64e processes using an arm64e debugserver.
 option(LLDB_ENABLE_ARM64E_DEBUGSERVER "Build debugserver for arm64 and arm64e" OFF)
 if (BUILDING_FOR_ARM64_OSX AND LLDB_ENABLE_ARM64E_DEBUGSERVER)
   set(CMAKE_OSX_ARCHITECTURES "arm64;arm64e")
 endif ()
 
 find_library(SECURITY_LIBRARY Security)
 
-add_subdirectory(MacOSX)
-
 set(LLDB_CODESIGN_IDENTITY "" CACHE STRING
     "Identity override for debugserver; see 'Code Signing on macOS' in the documentation (Darwin only)")
 
 get_debugserver_codesign_identity(debugserver_codesign_identity)
 
 # Override locally, so the identity is used for targets created in this scope.
 set(LLVM_CODESIGNING_IDENTITY ${debugserver_codesign_identity})
 
set(lldbDebugserverCommonSources
   MacOSX/MachException.cpp
   MacOSX/MachProcess.mm
   MacOSX/MachTask.mm
   MacOSX/MachThread.cpp
   MacOSX/MachThreadList.cpp
   MacOSX/MachVMMemory.cpp
   MacOSX/MachVMRegion.cpp
   MacOSX/OsLogger.cpp
+  MacOSX/arm/DNBArchImpl.cpp
+  MacOSX/arm64/DNBArchImplARM64.cpp
+  MacOSX/i386/DNBArchImplI386.cpp
+  MacOSX/x86_64/DNBArchImplX86_64.cpp
   ${generated_mach_interfaces}
   ${DEBUGSERVER_VERS_GENERATED_FILE})
 
 # Tell LLVM not to complain about these source files.
 set(LLVM_OPTIONAL_SOURCES
   ${lldbDebugserverCommonSources}
   debugserver.cpp)
 
 add_lldb_library(lldbDebugserverCommon ${lldbDebugserverCommonSources})
 set_target_properties(lldbDebugserverCommon PROPERTIES FOLDER "lldb libraries/debugserver")
 
 target_link_libraries(lldbDebugserverCommon
                       INTERFACE ${COCOA_LIBRARY}
                       ${CORE_FOUNDATION_LIBRARY}
                       ${FOUNDATION_LIBRARY}
                       ${BACKBOARD_LIBRARY}
                       ${FRONTBOARD_LIBRARY}
                       ${SPRINGBOARD_LIBRARY}
                       ${MOBILESERVICES_LIBRARY}
                       ${LOCKDOWN_LIBRARY}
                       ${CAROUSELSERVICES_LIBRARY}
-                      lldbDebugserverArchSupport
                       ${FOUNDATION_LIBRARY}
                       ${SECURITY_LIBRARY}
                       ${LIBCOMPRESSION}
                       ${ENERGY_LIBRARY})
 add_lldb_tool(debugserver ADD_TO_FRAMEWORK
   debugserver.cpp
   LINK_LIBS lldbDebugserverCommon
   ENTITLEMENTS ${entitlements}
set_property(TARGET lldbDebugserverCommon APPEND PROPERTY COMPILE_FLAGS
     -F${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks
     )
 
   add_lldb_library(lldbDebugserverCommon_NonUI ${lldbDebugserverCommonSources})
   target_link_libraries(lldbDebugserverCommon_NonUI
                       INTERFACE ${COCOA_LIBRARY}
                       ${CORE_FOUNDATION_LIBRARY}
                       ${FOUNDATION_LIBRARY}
-                      lldbDebugserverArchSupport
                       ${SECURITY_LIBRARY}
                       ${LIBCOMPRESSION})
 
   add_lldb_tool(debugserver-nonui
     debugserver.cpp
 
     LINK_LIBS
       lldbDebugserverCommon_NonUI
 
     ENTITLEMENTS
       ${entitlements}
     )
 endif()

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

-list(APPEND SOURCES arm/DNBArchImpl.cpp arm64/DNBArchImplARM64.cpp)
-include_directories(${CURRENT_SOURCE_DIR}/arm ${CURRENT_SOURCE_DIR}/arm64)
-
-list(APPEND SOURCES i386/DNBArchImplI386.cpp x86_64/DNBArchImplX86_64.cpp)
-include_directories(${CURRENT_SOURCE_DIR}/i386 ${CURRENT_SOURCE_DIR}/x86_64)
-
-include_directories(..)
-
-include_directories(${LLDB_SOURCE_DIR}/tools/debugserver/source)
-add_library(lldbDebugserverArchSupport
-  ${SOURCES}
-  )
-
-set_target_properties(lldbDebugserverArchSupport PROPERTIES FOLDER "lldb libraries/debugserver")