Fix error during compilation of tests for valgrind (bug #234644)

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26 x86_64

4 files changed, 55 insertions, 7 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 18f30383b3a5..eaa1c9ae0fd8 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.89 2008/07/27 17:55:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.90 2008/08/13 20:29:40 griffon26 Exp $
+
+  13 Aug 2008; Maurice van der Pot <griffon26@gentoo.org>
+  +files/valgrind-3.3.1-local-labels.patch, valgrind-3.3.1.ebuild:
+  Use local labels in inline asm to prevent duplicate definition of symbols
+  when optimisation is turned on (bug #234644 reported by Olivier Huber
+  <oli.huber@gmail.com>).
 
   27 Jul 2008; Olivier Crête <tester@gentoo.org> valgrind-3.3.0.ebuild,
   valgrind-3.3.0-r1.ebuild, valgrind-3.3.1.ebuild:
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index bb13d4d91e91..f85969f37fca 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -8,6 +8,7 @@ AUX valgrind-3.2.3-pkg-config.patch 670 RMD160 26d8f37182da50110e4c40c5be0ec9d06
 AUX valgrind-3.2.3-unhandled-instr-amd64.patch 503 RMD160 e132a92f4f36b4019e86018e665d97eef2c1af00 SHA1 8cf0b4a7db85c3ab4b97beee7b6e02081a1c8497 SHA256 a5666ee374f5c0c4d57e6aed73a6765036c659dc4eeeebbd969ea1c1f1cbd2cd
 AUX valgrind-3.3.0-massif-cplusplus.patch 2918 RMD160 4a9d372385a83ce4b6cf43ea249a3736eeedb37e SHA1 f009a2b6d9905af18908cee355977fdbfec7e1f1 SHA256 1308e02e9b5600bc3d88e705efd59ff2e0d0294679d7455849094f9f52c8b0ca
 AUX valgrind-3.3.0-only64bit.patch 580 RMD160 f4304ad005586541400e6c1466dabf8cdaac2b72 SHA1 7c890914ec0fd53b8de662783b230ec78e57e345 SHA256 23485d4b03c66db3c58f3a7e9d0aca439a50b87ea60f2edaaf94229b54a80ee9
+AUX valgrind-3.3.1-local-labels.patch 1186 RMD160 3eeb3a847f85b2b68e32ce5966539067103b12c1 SHA1 07c6afbc4eb2565404ffe12aa8cd0357fd736ab4 SHA256 79a0e65903ce1b7ec0c0759c4face9a23bd9724831bf0b8c201dced2dc7dbb71
 DIST valgrind-3.2.3.tar.bz2 4016265 RMD160 62579fc7f1f3c39038b32467b2d098eeb8f77c79 SHA1 550195a913997ff15f12eea484bd3fe636b25472 SHA256 1bca920527f43fd0c68e8f8eb16a7996b34f415e73af54de0f2cd43a8247c441
 DIST valgrind-3.3.0.tar.bz2 4519551 RMD160 ea969a421163010c263a67fb0a2797d3f6cca62c SHA1 e2d0f3bcb4e6dd4638ceeddc9da8603b32efdf11 SHA256 5af08229d77fe55437a6c558aee9babcff23f28c8a9c8f1f0a7d152754e9947a
 DIST valgrind-3.3.1.tar.bz2 4544805 RMD160 32fb26de2ffd0d62e66a1f29cfa6785b7ffa8c36 SHA1 3a64ee5f6439815fa6c5200dcfd0399f9dc83348 SHA256 95b7b4d815bd479332637c93e69ec24167cd28d4f9d9f9b718e1b091bb88aafa
@@ -15,13 +16,13 @@ EBUILD valgrind-3.2.3-r1.ebuild 3093 RMD160 42e6d59be58e517fcd96d7cf82ca67df81ec
 EBUILD valgrind-3.2.3.ebuild 3045 RMD160 f6477fea15734de984994306e19c6222a64ad0b3 SHA1 898f6bce8fde85ed9a77b745ff080b9766b8b93f SHA256 8a6b3c69d44c6b56f8fbe987a78782ef1165c347aa4be2b623de0f088556d11f
 EBUILD valgrind-3.3.0-r1.ebuild 3213 RMD160 3f57761ab3f21eef8f65f4b06c5ee2d3b43d6f7c SHA1 46decd0f419a3fe03bebed01d77c81bd31abe7bd SHA256 86362a8584f2914702d63da253c2487b12fb30e50beabe29580c09950b5a9c6c
 EBUILD valgrind-3.3.0.ebuild 3079 RMD160 da4102371fa30a15df1566d0958ea40ebe09dfb9 SHA1 72e0b01a128b2782190926aecc9be01c101c4a90 SHA256 9ce02a5699592dd7c91b9ae7cbadb0622c5c3cd9b4c2e5b0d7ffc201e63eef23
-EBUILD valgrind-3.3.1.ebuild 3079 RMD160 e619ac105d13c95bc61b44a26e524ce1c23883e6 SHA1 bbb2e5ac5fb251cfdc34096c8bae504aa6929b03 SHA256 cf48d7e68541d1082cd1aa135e713820eadf6fce55c91b3ae30372e696364517
-MISC ChangeLog 13720 RMD160 f56281af7c2739edd28f0273ac6cf4a2e172f9d9 SHA1 2f4f4c44e75307605c171bc7d88e6094b19d27d1 SHA256 c1c0554b6d04cb040741d2e7c66497461c3885f31cee2f6d398691a0350dba16
+EBUILD valgrind-3.3.1.ebuild 3258 RMD160 ce0a96db7462b63fae9b145a872e21cba4b23f73 SHA1 7aaf86e7d5c6e078e0c8acc76a0b3b58cc562a1e SHA256 cbb1e7ee851cb7ffc7d0738dcfe75e35a6b4b46ec2de5842740ae2fd3914b4b1
+MISC ChangeLog 14023 RMD160 2abb5cb695fdaac94e3ce995a304432b61c4aa4a SHA1 ed7f781ef42773863ebbe9c2de0931a8ebc951ef SHA256 e1bac59e6e425ce2849472d5c4d190ec306915bbc21225647c6ba38bc3803bec
 MISC metadata.xml 1003 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 SHA1 f76bd7adb86b156832175f968d60c6372fcf8968 SHA256 2bf62ba94d772ac968485392127cf4f4303cccf5a1e6d0733d80507005ca7847
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiMtpkACgkQ+IXOQtHLm/j4OgCfT96QR6Q05+Z/PXvxoniXmNmx
-BTEAni+HEQrzyDvQjdg/dErQrMLyvwt2
-=enpd
+iEYEARECAAYFAkijRDwACgkQMGnpIbeahxyefgCguSbO6NTVOlGyKjbwoPWbVQc5
+6ugAn1y6Xyg551Tpn9XlRn2ZlhkBbrmP
+=OxwC
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.3.1-local-labels.patch b/dev-util/valgrind/files/valgrind-3.3.1-local-labels.patch
new file mode 100644
index 000000000000..82b86b731b38
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.3.1-local-labels.patch
@@ -0,0 +1,37 @@
+diff -ruN valgrind-3.3.1/none/tests/x86/jcxz.c valgrind-3.3.1-fixed/none/tests/x86/jcxz.c
+--- valgrind-3.3.1/none/tests/x86/jcxz.c	2008-06-01 03:38:58.000000000 +0200
++++ valgrind-3.3.1-fixed/none/tests/x86/jcxz.c	2008-08-13 22:18:42.000000000 +0200
+@@ -11,12 +11,12 @@
+    __asm__ __volatile__(
+       "movl %0,%%ecx\n\t"
+       "movl $0,%%eax\n"
+-      ".Lxyzzy1:\n\t"
+-      "jcxz .Lfoobar1\n\t"
++      "0:\n\t"
++      "jcxz 1f\n\t"
+       "addl $1, %%eax\n\t"
+       "subl $1, %%ecx\n\t"
+-      "jmp .Lxyzzy1\n"
+-      ".Lfoobar1:\n\t"
++      "jmp 0b\n"
++      "1:\n\t"
+       "movl %%eax, %1"
+       : /*out*/ : /*in*/ "m"(block[0]),
+                          "m"(block[1]) : /*trash*/ "eax","ecx","cc","memory"
+@@ -32,12 +32,12 @@
+    __asm__ __volatile__(
+       "movl %0,%%ecx\n\t"
+       "movl $0,%%eax\n"
+-      ".Lxyzzy2:\n\t"
+-      "jecxz .Lfoobar2\n\t"
++      "0:\n\t"
++      "jecxz 1f\n\t"
+       "addl $1, %%eax\n\t"
+       "subl $1, %%ecx\n\t"
+-      "jmp .Lxyzzy2\n"
+-      ".Lfoobar2:\n\t"
++      "jmp 0b\n"
++      "1:\n\t"
+       "movl %%eax, %1"
+       : /*out*/ : /*in*/ "m"(block[0]),
+                          "m"(block[1]) : /*trash*/ "eax","ecx","cc","memory"
diff --git a/dev-util/valgrind/valgrind-3.3.1.ebuild b/dev-util/valgrind/valgrind-3.3.1.ebuild
index d93b4ecd1702..0534a8cb63fe 100644
--- a/dev-util/valgrind/valgrind-3.3.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.3.1.ebuild,v 1.2 2008/07/27 17:55:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.3.1.ebuild,v 1.3 2008/08/13 20:29:40 griffon26 Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -40,6 +40,10 @@ src_unpack() {
 		epatch "${FILESDIR}/valgrind-3.3.0-only64bit.patch"
 	fi
 
+	# Use local labels in inline asm to prevent 'symbol already defined' errors
+	# when optimisation is on (bug #234644).
+	epatch "${FILESDIR}/valgrind-3.3.1-local-labels.patch"
+
 	# Regenerate autotools files
 	eautoreconf
 }