shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[OpenMP] Update the bitcode library install and search path (#136754)

Browse Source 
Summary:
This was accidentally kept in the old location when we moved to the
new `lib/<triple>/` location for the DeviceRTL. Move this to reduce the
delta with https://github.com/llvm/llvm-project/pull/136729.
This commit is contained in:
Joseph Huber 2025-04-23 08:20:15 -05:00 committed by GitHub
parent 92bba68634
commit 6d0d50f0ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Driver/ToolChains/CommonArgs.cpp
View File

@ -2794,6 +2794,11 @@ void tools::addOpenMPDeviceRTL(const Driver &D,
for (const auto &LibPath : HostTC.getFilePaths()) for (const auto &LibPath : HostTC.getFilePaths())
LibraryPaths.emplace_back(LibPath); LibraryPaths.emplace_back(LibPath);
// Check the target specific library path for the triple as well.
SmallString<128> P(D.Dir);
llvm::sys::path::append(P, "..", "lib", Triple.getTriple());
LibraryPaths.emplace_back(P);
OptSpecifier LibomptargetBCPathOpt = OptSpecifier LibomptargetBCPathOpt =
Triple.isAMDGCN() ? options::OPT_libomptarget_amdgpu_bc_path_EQ Triple.isAMDGCN() ? options::OPT_libomptarget_amdgpu_bc_path_EQ
: Triple.isNVPTX() ? options::OPT_libomptarget_nvptx_bc_path_EQ : Triple.isNVPTX() ? options::OPT_libomptarget_nvptx_bc_path_EQ

2
offload/DeviceRTL/CMakeLists.txt
View File

@ -137,7 +137,7 @@ function(compileDeviceRTLLibrary target_name target_triple)
"-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" "-march=") "-r" "-nostdlib" "-flto" "-Wl,--lto-emit-llvm" "-march=")
install(TARGETS libomptarget-${target_name} install(TARGETS libomptarget-${target_name}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
DESTINATION ${OFFLOAD_INSTALL_LIBDIR}) DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${target_triple}")
add_library(omptarget.${target_name}.all_objs OBJECT IMPORTED) add_library(omptarget.${target_name}.all_objs OBJECT IMPORTED)
set_property(TARGET omptarget.${target_name}.all_objs APPEND PROPERTY IMPORTED_OBJECTS set_property(TARGET omptarget.${target_name}.all_objs APPEND PROPERTY IMPORTED_OBJECTS