[llvm] [offload][omp] link libomptarget against liboffload (PR #221730)

Alex Duran via llvm-commits llvm-commits at lists.llvm.org
Wed Sep 16 13:10:41 PDT 2026


https://github.com/adurang updated https://github.com/llvm/llvm-project/pull/221730

>From a67aac87071d461477d458ba5d8e1f02559be976 Mon Sep 17 00:00:00 2001
From: "Duran, Alex" <alejandro.duran at intel.com>
Date: Wed, 16 Sep 2026 12:28:31 -0700
Subject: [PATCH] [offload][omp] Link libomptarget against static liboffload

---
 offload/CMakeLists.txt                 |  3 +-
 offload/liboffload/CMakeLists.txt      | 41 +++++++++++++++++---------
 offload/liboffload/src/OffloadImpl.cpp |  6 ++--
 offload/libomptarget/CMakeLists.txt    |  6 ++--
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/offload/CMakeLists.txt b/offload/CMakeLists.txt
index ade372c3232ef..2cc1acf5313ba 100644
--- a/offload/CMakeLists.txt
+++ b/offload/CMakeLists.txt
@@ -348,11 +348,12 @@ add_subdirectory(plugins-nextgen)
 add_subdirectory(tools)
 add_subdirectory(docs)
 
+add_subdirectory(liboffload)
+
 if(BUILD_LIBOMPTARGET)
   add_subdirectory(libomptarget)
 endif()
 
-add_subdirectory(liboffload)
 add_subdirectory(languages)
 
 # Add tests.
diff --git a/offload/liboffload/CMakeLists.txt b/offload/liboffload/CMakeLists.txt
index 265e1c477e81f..a204e63959f4e 100644
--- a/offload/liboffload/CMakeLists.txt
+++ b/offload/liboffload/CMakeLists.txt
@@ -1,29 +1,26 @@
 add_subdirectory(API)
 
-add_library(LLVMOffload SHARED
+add_library(LLVMOffloadObjects OBJECT
   src/OffloadLib.cpp
   src/OffloadImpl.cpp
 )
-add_dependencies(LLVMOffload OffloadAPI PluginErrcodes)
+add_dependencies(LLVMOffloadObjects OffloadAPI PluginErrcodes)
+set_target_properties(LLVMOffloadObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 if(LLVM_LINK_LLVM_DYLIB)
   set(llvm_libs LLVM)
 else()
   llvm_map_components_to_libnames(llvm_libs FrontendOpenMP Support)
 endif()
-target_link_libraries(LLVMOffload PRIVATE ${llvm_libs})
 
-target_link_libraries(LLVMOffload PRIVATE PluginCommon)
+target_link_libraries(LLVMOffloadObjects PRIVATE PluginCommon)
 
 foreach(plugin IN LISTS LIBOMPTARGET_PLUGINS_TO_BUILD)
-    target_link_libraries(LLVMOffload PRIVATE omptarget.rtl.${plugin})
+    target_link_libraries(LLVMOffloadObjects PRIVATE omptarget.rtl.${plugin})
 endforeach()
 
-if(LLVM_HAVE_LINK_VERSION_SCRIPT)
-  target_link_libraries(LLVMOffload PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
-endif()
 
-target_include_directories(LLVMOffload PUBLIC
+target_include_directories(LLVMOffloadObjects PUBLIC
                             ${CMAKE_CURRENT_BINARY_DIR}/API
                             ${CMAKE_CURRENT_BINARY_DIR}/../include
                             ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -32,15 +29,31 @@ target_include_directories(LLVMOffload PUBLIC
                             ${CMAKE_CURRENT_SOURCE_DIR}/../plugins-nextgen/common/include
                             ${CMAKE_CURRENT_BINARY_DIR}/../plugins-nextgen/common/include
                             )
-
-target_compile_options(LLVMOffload PRIVATE ${offload_compile_flags})
-target_link_options(LLVMOffload PRIVATE ${offload_link_flags})
-
-target_compile_definitions(LLVMOffload PRIVATE
+target_compile_options(LLVMOffloadObjects PRIVATE ${offload_compile_flags})
+target_compile_definitions(LLVMOffloadObjects PRIVATE
   TARGET_NAME="Liboffload"
   DEBUG_PREFIX="Liboffload"
 )
 
+add_library(LLVMOffloadStatic STATIC)
+target_link_libraries(LLVMOffloadStatic PUBLIC LLVMOffloadObjects ${llvm_libs})
+set_target_properties(LLVMOffloadStatic PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+add_library(LLVMOffload SHARED)
+target_link_libraries(LLVMOffload PRIVATE LLVMOffloadObjects ${llvm_libs})
+target_include_directories(LLVMOffload PUBLIC
+                            ${CMAKE_CURRENT_BINARY_DIR}/API
+                            ${CMAKE_CURRENT_BINARY_DIR}/../include
+                            ${CMAKE_CURRENT_SOURCE_DIR}/include
+                            ${CMAKE_CURRENT_SOURCE_DIR}/../include
+                            )
+
+if(LLVM_HAVE_LINK_VERSION_SCRIPT)
+  target_link_libraries(LLVMOffload PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
+endif()
+
+target_link_options(LLVMOffload PRIVATE ${offload_link_flags})
+
 set_target_properties(LLVMOffload PROPERTIES
                       POSITION_INDEPENDENT_CODE ON
                       INSTALL_RPATH "${OFFLOAD_INSTALL_RPATH}"
diff --git a/offload/liboffload/src/OffloadImpl.cpp b/offload/liboffload/src/OffloadImpl.cpp
index 11c07483b38aa..7f804c53142a4 100644
--- a/offload/liboffload/src/OffloadImpl.cpp
+++ b/offload/liboffload/src/OffloadImpl.cpp
@@ -29,9 +29,9 @@
 #ifdef OMPT_SUPPORT
 namespace llvm::omp::target {
 namespace ompt {
-bool Initialized = false;
-ompt_get_callback_t lookupCallbackByCode = nullptr;
-ompt_function_lookup_t lookupCallbackByName = nullptr;
+LLVM_ATTRIBUTE_WEAK bool Initialized = false;
+LLVM_ATTRIBUTE_WEAK ompt_get_callback_t lookupCallbackByCode = nullptr;
+LLVM_ATTRIBUTE_WEAK ompt_function_lookup_t lookupCallbackByName = nullptr;
 } // namespace ompt
 } // namespace llvm::omp::target
 #endif
diff --git a/offload/libomptarget/CMakeLists.txt b/offload/libomptarget/CMakeLists.txt
index 403b3e5dad269..389af3e10e542 100644
--- a/offload/libomptarget/CMakeLists.txt
+++ b/offload/libomptarget/CMakeLists.txt
@@ -30,6 +30,8 @@ endif()
 target_link_libraries(omptarget PRIVATE omp ${llvm_libs})
 target_include_directories(omptarget PRIVATE
   ${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/../plugins-nextgen/common/include
+  ${CMAKE_CURRENT_BINARY_DIR}/../plugins-nextgen/common/include
 )
 
 if(LLVM_HAVE_LINK_VERSION_SCRIPT)
@@ -42,9 +44,7 @@ target_compile_definitions(omptarget PRIVATE
   DEBUG_PREFIX="omptarget"
 )
 
-foreach(plugin IN LISTS LIBOMPTARGET_PLUGINS_TO_BUILD)
-  target_link_libraries(omptarget PRIVATE omptarget.rtl.${plugin})
-endforeach()
+target_link_libraries(omptarget PRIVATE LLVMOffloadStatic)
 
 target_compile_options(omptarget PRIVATE ${offload_compile_flags})
 target_link_options(omptarget PRIVATE ${offload_link_flags})



More information about the llvm-commits mailing list