diff options
| author | Alexey Bataev <a.bataev@hotmail.com> | 2015-08-19 04:49:01 +0000 |
|---|---|---|
| committer | Alexey Bataev <a.bataev@hotmail.com> | 2015-08-19 04:49:01 +0000 |
| commit | c7e8435beffedbaa769cc45f6fb5045bc91b7b6d (patch) | |
| tree | 016bc3837bb1143869c3f75ec36e464e8e063fe8 | |
| parent | 1df02ee1f989139c4fcfb47009ce4d62e2ca5146 (diff) | |
| download | bcm5719-llvm-c7e8435beffedbaa769cc45f6fb5045bc91b7b6d.tar.gz bcm5719-llvm-c7e8435beffedbaa769cc45f6fb5045bc91b7b6d.zip | |
[OPENMP] Link libomp.lib on Windows
Adds libomp.lib for -fopenmp=libomp and libiomp5md.lib for -fopenmp=libiomp5 on Windows
Differential Revision: http://reviews.llvm.org/D11932
llvm-svn: 245414
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 21 | ||||
| -rw-r--r-- | clang/test/OpenMP/linking.c | 18 |
2 files changed, 39 insertions, 0 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 53fc45be053..79d8dfb2a94 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -8885,6 +8885,27 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgValues(CmdArgs, options::OPT__SLASH_link); + if (Args.hasFlag(options::OPT_fopenmp, options::OPT_fopenmp_EQ, + options::OPT_fno_openmp, false)) { + CmdArgs.push_back("-nodefaultlib:vcomp.lib"); + CmdArgs.push_back("-nodefaultlib:vcompd.lib"); + CmdArgs.push_back(Args.MakeArgString(std::string("-libpath:") + + TC.getDriver().Dir + "/../lib")); + switch (getOpenMPRuntime(getToolChain(), Args)) { + case OMPRT_OMP: + CmdArgs.push_back("-defaultlib:libomp.lib"); + break; + case OMPRT_IOMP5: + CmdArgs.push_back("-defaultlib:libiomp5md.lib"); + break; + case OMPRT_GOMP: + break; + case OMPRT_Unknown: + // Already diagnosed. + break; + } + } + // Add filenames, libraries, and other linker inputs. for (const auto &Input : Inputs) { if (Input.isFilename()) { diff --git a/clang/test/OpenMP/linking.c b/clang/test/OpenMP/linking.c index 778216d723b..81706d4f620 100644 --- a/clang/test/OpenMP/linking.c +++ b/clang/test/OpenMP/linking.c @@ -69,3 +69,21 @@ // CHECK-LD-OVERRIDE-64: "-lgomp" "-lrt" "-lgcc" // CHECK-LD-OVERRIDE-64: "-lpthread" "-lc" // +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: -fopenmp=libomp -target x86_64-msvc-win32 \ +// RUN: | FileCheck --check-prefix=CHECK-MSVC-LINK-64 %s +// CHECK-MSVC-LINK-64: link.exe +// CHECK-MSVC-LINK-64-SAME: -nodefaultlib:vcomp.lib +// CHECK-MSVC-LINK-64-SAME: -nodefaultlib:vcompd.lib +// CHECK-MSVC-LINK-64-SAME: -libpath:{{.+}}/../lib +// CHECK-MSVC-LINK-64-SAME: -defaultlib:libomp.lib +// +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: -fopenmp=libiomp5 -target x86_64-msvc-win32 \ +// RUN: | FileCheck --check-prefix=CHECK-MSVC-ILINK-64 %s +// CHECK-MSVC-ILINK-64: link.exe +// CHECK-MSVC-ILINK-64-SAME: -nodefaultlib:vcomp.lib +// CHECK-MSVC-ILINK-64-SAME: -nodefaultlib:vcompd.lib +// CHECK-MSVC-ILINK-64-SAME: -libpath:{{.+}}/../lib +// CHECK-MSVC-ILINK-64-SAME: -defaultlib:libiomp5md.lib +// |
