[llvm] [Offload][NFCI] Remove coupling to `omp` target for version scripting (PR #141637)
Joseph Huber via llvm-commits
llvm-commits at lists.llvm.org
Tue May 27 10:27:58 PDT 2025
https://github.com/jhuber6 created https://github.com/llvm/llvm-project/pull/141637
Summary:
This is a weird dependency on libomp just for testing if version scripts
work. We shouldn't need to do this because LLVM already checks for
this. I believe this should be available as well in standalone when we
call `addLLVM` but I did not test that directly.
>From 83bf6fbd212ce16542b19b4b8c9bee409b98faad Mon Sep 17 00:00:00 2001
From: Joseph Huber <huberjn at outlook.com>
Date: Tue, 27 May 2025 12:26:19 -0500
Subject: [PATCH] [Offload][NFCI] Remove coupling to `omp` target for version
scripting
Summary:
This is a weird dependency on libomp just for testing if version scripts
work. We shouldn't need to do this because LLVM already checks for
this. I believe this should be available as well in standalone when we
call `addLLVM` but I did not test that directly.
---
offload/CMakeLists.txt | 8 --------
offload/liboffload/CMakeLists.txt | 4 ++--
offload/libomptarget/CMakeLists.txt | 5 ++---
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/offload/CMakeLists.txt b/offload/CMakeLists.txt
index 2dc8285dd7730..c7cafd105f52a 100644
--- a/offload/CMakeLists.txt
+++ b/offload/CMakeLists.txt
@@ -322,14 +322,6 @@ else()
endif()
endmacro()
-if(OPENMP_STANDALONE_BUILD OR TARGET omp)
- # Check LIBOMP_HAVE_VERSION_SCRIPT_FLAG
- include(LLVMCheckCompilerLinkerFlag)
- if(NOT APPLE)
- llvm_check_compiler_linker_flag(C "-Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/../openmp/runtime/src/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
- endif()
-endif()
-
# OMPT support for libomptarget
# Follow host OMPT support and check if host support has been requested.
# LIBOMP_HAVE_OMPT_SUPPORT indicates whether host OMPT support has been implemented.
diff --git a/offload/liboffload/CMakeLists.txt b/offload/liboffload/CMakeLists.txt
index db12236ddfc7f..1b098bc01e218 100644
--- a/offload/liboffload/CMakeLists.txt
+++ b/offload/liboffload/CMakeLists.txt
@@ -14,8 +14,8 @@ foreach(plugin IN LISTS LIBOMPTARGET_PLUGINS_TO_BUILD)
target_link_libraries(LLVMOffload PRIVATE omptarget.rtl.${plugin})
endforeach()
-if(LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
- target_link_libraries(LLVMOffload PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
+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
diff --git a/offload/libomptarget/CMakeLists.txt b/offload/libomptarget/CMakeLists.txt
index c5f5d902fad14..93e684e53bf17 100644
--- a/offload/libomptarget/CMakeLists.txt
+++ b/offload/libomptarget/CMakeLists.txt
@@ -44,9 +44,8 @@ target_include_directories(omptarget PRIVATE
${LIBOMPTARGET_INCLUDE_DIR} ${LIBOMPTARGET_BINARY_INCLUDE_DIR}
)
-if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG)
- target_link_libraries(omptarget PRIVATE
- "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
+if(LLVM_HAVE_LINK_VERSION_SCRIPT)
+ target_link_libraries(omptarget PRIVATE "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
endif()
# Define the TARGET_NAME and DEBUG_PREFIX.
More information about the llvm-commits
mailing list