[arch-commits] Commit in llvm/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, May 23, 2012 @ 14:38:43
  Author: foutrelis
Revision: 159395

Fix FS#29984: [clang] -coverage is broken

Added:
  llvm/trunk/clang-3.1-fix-libprofile_rt.a-location.patch
Modified:
  llvm/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   10 ++++++++--
 clang-3.1-fix-libprofile_rt.a-location.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-23 18:22:20 UTC (rev 159394)
+++ PKGBUILD	2012-05-23 18:38:43 UTC (rev 159395)
@@ -22,14 +22,16 @@
         llvm-Config-llvm-config.h
         cindexer-clang-path.patch
         clang-pure64.patch
-        enable-lto.patch)
+        enable-lto.patch
+        clang-3.1-fix-libprofile_rt.a-location.patch)
 sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
             'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
             '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
             '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
-            'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7')
+            'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7'
+            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver.src"
@@ -68,6 +70,10 @@
   # Use gold instead of default linker, and always use the plugin
   patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
 
+  # Fix FS#29984: [clang] -coverage is broken
+  patch -d tools/clang -Np1 -i \
+    "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
+
   # Apply strip option to configure
   _optimized_switch="enable"
   [[ $(check_option strip) == n ]] && _optimized_switch="disable"

Added: clang-3.1-fix-libprofile_rt.a-location.patch
===================================================================
--- clang-3.1-fix-libprofile_rt.a-location.patch	                        (rev 0)
+++ clang-3.1-fix-libprofile_rt.a-location.patch	2012-05-23 18:38:43 UTC (rev 159395)
@@ -0,0 +1,12 @@
+diff -upr clang-3.1.src.orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
+--- clang-3.1.src.orig/lib/Driver/Tools.cpp	2012-04-19 00:32:25.000000000 +0300
++++ clang-3.1.src/lib/Driver/Tools.cpp	2012-05-23 21:12:08.000000000 +0300
+@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain
+   // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
+   // not supported by old linkers.
+   std::string ProfileRT =
+-    std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a";
++    std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a";
+ 
+   CmdArgs.push_back(Args.MakeArgString(ProfileRT));
+ }