[141464] trunk/dports/lang/llvm-3.8/files/openmp-locations.patch

[eborisch at macports.org]

Revision: 141464
          https://trac.macports.org/changeset/141464
Author:   eborisch at macports.org
Date:     2015-10-19 09:04:31 -0700 (Mon, 19 Oct 2015)
Log Message:
-----------
clang-3.8: Update +openmp patch.

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.8/files/openmp-locations.patch

Modified: trunk/dports/lang/llvm-3.8/files/openmp-locations.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/openmp-locations.patch	2015-10-19 15:27:51 UTC (rev 141463)
+++ trunk/dports/lang/llvm-3.8/files/openmp-locations.patch	2015-10-19 16:04:31 UTC (rev 141464)
@@ -1,6 +1,25 @@
 --- orig/tools/clang/lib/Driver/Tools.cpp	2015-09-03 11:39:15.000000000 -0500
 +++ fixed/tools/clang/lib/Driver/Tools.cpp	2015-09-03 11:44:09.000000000 -0500
-@@ -4064,6 +4064,8 @@
+@@ -2534,12 +2534,18 @@
+ 
+   switch (getOpenMPRuntime(getToolChain(), Args)) {
+   case OMPRT_OMP:
++    // Automatically find MacPorts' libomp
++    CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
+     CmdArgs.push_back("-lomp");
+     break;
+   case OMPRT_GOMP:
++    // Automatically find MacPorts' libgomp (libomp)
++    CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
+     CmdArgs.push_back("-lgomp");
+     break;
+   case OMPRT_IOMP5:
++    // Automatically find MacPorts' libiomp5 (libomp)
++    CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
+     CmdArgs.push_back("-liomp5");
+     break;
+   case OMPRT_Unknown:
+@@ -4285,6 +4291,8 @@
      case OMPRT_OMP:
      case OMPRT_IOMP5:
        // Clang can generate useful OpenMP code for these two runtime libraries.
@@ -9,26 +28,7 @@
        CmdArgs.push_back("-fopenmp");
  
        // If no option regarding the use of TLS in OpenMP codegeneration is
-@@ -6531,12 +6533,18 @@
-                    options::OPT_fno_openmp, false)) {
-     switch (getOpenMPRuntime(getToolChain(), Args)) {
-     case OMPRT_OMP:
-+      // Automatically find MacPorts' libomp
-+      CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
-       CmdArgs.push_back("-lomp");
-       break;
-     case OMPRT_GOMP:
-+      // Automatically find MacPorts' libgomp (libomp)
-+      CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
-       CmdArgs.push_back("-lgomp");
-       break;
-     case OMPRT_IOMP5:
-+      // Automatically find MacPorts' libiomp5 (libomp)
-+      CmdArgs.push_back("-L@@PREFIX@@/lib/libomp");
-       CmdArgs.push_back("-liomp5");
-       break;
-     case OMPRT_Unknown:
-@@ -8248,9 +8256,13 @@
+@@ -8527,9 +8535,13 @@
          // Also link the particular OpenMP runtimes.
          switch (getOpenMPRuntime(ToolChain, Args)) {
          case OMPRT_OMP:
@@ -42,7 +42,7 @@
            CmdArgs.push_back("-lgomp");
  
            // FIXME: Exclude this for platforms with libgomp that don't require
-@@ -8258,6 +8270,8 @@
+@@ -8537,6 +8549,8 @@
            CmdArgs.push_back("-lrt");
            break;
          case OMPRT_IOMP5:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/33a87062/attachment.html>