[Openmp-commits] [openmp] 83fcba8 - [Libomptarget] Add proper LLVM libraries now that the AMDGPU plugin uses them

[Joseph Huber via Openmp-commits]

Author: Joseph Huber
Date: 2022-09-09T10:33:26-05:00
New Revision: 83fcba82cc7e97725de8442631e3eb5bfef8880d

URL: https://github.com/llvm/llvm-project/commit/83fcba82cc7e97725de8442631e3eb5bfef8880d
DIFF: https://github.com/llvm/llvm-project/commit/83fcba82cc7e97725de8442631e3eb5bfef8880d.diff

LOG: [Libomptarget] Add proper LLVM libraries now that the AMDGPU plugin uses them

Summary:
The AMDGPU and CUDA plugins now relies on the Object and Support
libraries. This patch adds them explicitly rather than hoping that they
share the symbols loaded from the standard `libomptarget`.

Added: 
    

Modified: 
    openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
    openmp/libomptarget/plugins/cuda/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt b/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
index 3e70dea2edefc..dfd3671b9a8f5 100644
--- a/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
+++ b/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
@@ -75,6 +75,10 @@ add_llvm_library(omptarget.rtl.amdgpu SHARED
   ${LIBOMPTARGET_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/impl
 
+  LINK_COMPONENTS
+  Support
+  Object
+
   LINK_LIBS 
   PRIVATE
   elf_common

diff  --git a/openmp/libomptarget/plugins/cuda/CMakeLists.txt b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
index 505c093c81fbd..244060efca606 100644
--- a/openmp/libomptarget/plugins/cuda/CMakeLists.txt
+++ b/openmp/libomptarget/plugins/cuda/CMakeLists.txt
@@ -44,6 +44,10 @@ if (LIBOMPTARGET_CAN_LINK_LIBCUDA AND NOT LIBOMPTARGET_FORCE_DLOPEN_LIBCUDA)
     ADDITIONAL_HEADER_DIRS
     ${LIBOMPTARGET_INCLUDE_DIR}
 
+    LINK_COMPONENTS
+    Support
+    Object
+
     LINK_LIBS
     PRIVATE
     elf_common