diff --git a/libc/utils/gpu/loader/Loader.h b/libc/utils/gpu/loader/Loader.h --- a/libc/utils/gpu/loader/Loader.h +++ b/libc/utils/gpu/loader/Loader.h @@ -9,7 +9,7 @@ #ifndef LLVM_LIBC_UTILS_GPU_LOADER_LOADER_H #define LLVM_LIBC_UTILS_GPU_LOADER_LOADER_H -#include "utils/gpu/server/Server.h" +#include "utils/gpu/server/rpc_server.h" #include #include #include diff --git a/libc/utils/gpu/loader/amdgpu/CMakeLists.txt b/libc/utils/gpu/loader/amdgpu/CMakeLists.txt --- a/libc/utils/gpu/loader/amdgpu/CMakeLists.txt +++ b/libc/utils/gpu/loader/amdgpu/CMakeLists.txt @@ -5,5 +5,5 @@ PRIVATE hsa-runtime64::hsa-runtime64 gpu_loader - rpc_server + llvmlibc_rpc_server ) diff --git a/libc/utils/gpu/loader/nvptx/CMakeLists.txt b/libc/utils/gpu/loader/nvptx/CMakeLists.txt --- a/libc/utils/gpu/loader/nvptx/CMakeLists.txt +++ b/libc/utils/gpu/loader/nvptx/CMakeLists.txt @@ -8,7 +8,7 @@ target_link_libraries(nvptx_loader PRIVATE gpu_loader - rpc_server + llvmlibc_rpc_server CUDA::cuda_driver LLVMObject LLVMSupport diff --git a/libc/utils/gpu/server/CMakeLists.txt b/libc/utils/gpu/server/CMakeLists.txt --- a/libc/utils/gpu/server/CMakeLists.txt +++ b/libc/utils/gpu/server/CMakeLists.txt @@ -1,8 +1,14 @@ -add_library(rpc_server STATIC Server.cpp) +add_library(llvmlibc_rpc_server STATIC rpc_server.cpp) # Include the RPC implemenation from libc. -add_dependencies(rpc_server libc.src.__support.RPC.rpc) -target_include_directories(rpc_server PRIVATE ${LIBC_SOURCE_DIR}) -# TODO: This is for the opcodes, we will copy the file here when installed. -target_include_directories(rpc_server PUBLIC ${LIBC_SOURCE_DIR}/include) -target_include_directories(rpc_server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(llvmlibc_rpc_server PRIVATE ${LIBC_SOURCE_DIR}) +target_include_directories(llvmlibc_rpc_server PUBLIC ${LIBC_SOURCE_DIR}/include) +target_include_directories(llvmlibc_rpc_server PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +# Install the server and associated header. +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rpc_server.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gpu-none-llvm/ + COMPONENT libc) +install(TARGETS llvmlibc_rpc_server + ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}" + COMPONENT libc) diff --git a/libc/utils/gpu/server/Server.h b/libc/utils/gpu/server/rpc_server.h rename from libc/utils/gpu/server/Server.h rename to libc/utils/gpu/server/rpc_server.h diff --git a/libc/utils/gpu/server/Server.cpp b/libc/utils/gpu/server/rpc_server.cpp rename from libc/utils/gpu/server/Server.cpp rename to libc/utils/gpu/server/rpc_server.cpp --- a/libc/utils/gpu/server/Server.cpp +++ b/libc/utils/gpu/server/rpc_server.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "Server.h" +#include "rpc_server.h" #include "src/__support/RPC/rpc.h" #include