rpms/llvm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix OpenMP patch

Browse Source
This commit is contained in:
Tom Stellard 2024-03-15 04:19:32 +00:00 committed by Timm Bäder
parent 97ee1828d7
commit b3de0f3616
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
0001-Restore-fopenmp-implicit-rpath-disabled-by-default.patch
View File

@ -33,26 +33,10 @@ diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolC
index faceee85a2f8..c058df97160b 100644 index faceee85a2f8..c058df97160b 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -1124,6 +1124,39 @@ static void addOpenMPDeviceLibC(const ToolChain &TC, const ArgList &Args, @@ -1124,6 +1124,23 @@ static void addOpenMPDeviceLibC(const ToolChain &TC, const ArgList &Args,
llvm::append_range(CmdArgs, Libraries); llvm::append_range(CmdArgs, Libraries);
} }
+void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
+ const ArgList &Args,
+ ArgStringList &CmdArgs) {
+
+ if (Args.hasFlag(options::OPT_fopenmp_implicit_rpath,
+ options::OPT_fno_openmp_implicit_rpath, false)) {
+ // Default to clang lib / lib64 folder, i.e. the same location as device
+ // runtime
+ SmallString<256> DefaultLibPath =
+ llvm::sys::path::parent_path(TC.getDriver().Dir);
+ llvm::sys::path::append(DefaultLibPath, CLANG_INSTALL_LIBDIR_BASENAME);
+ CmdArgs.push_back("-rpath");
+ CmdArgs.push_back(Args.MakeArgString(DefaultLibPath));
+ }
+}
+
+ +
+void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC, +void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
+ const ArgList &Args, + const ArgList &Args,