summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice van der Pot <griffon26@gentoo.org>2007-08-26 09:32:35 +0000
committerMaurice van der Pot <griffon26@gentoo.org>2007-08-26 09:32:35 +0000
commitae0d9ae963470ce509c28645e331fc34ad30c7b0 (patch)
tree05325137a57d070551fedee27557b12e1920629f /dev-util
parentPunt unused versions. (diff)
downloadgentoo-2-ae0d9ae963470ce509c28645e331fc34ad30c7b0.tar.gz
gentoo-2-ae0d9ae963470ce509c28645e331fc34ad30c7b0.tar.bz2
gentoo-2-ae0d9ae963470ce509c28645e331fc34ad30c7b0.zip
Fixed unhandled amd64 instruction bug #189396 (valgrind)
(Portage version: 2.1.3_rc9)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/valgrind/ChangeLog6
-rw-r--r--dev-util/valgrind/files/valgrind-3.2.3-unhandled-instr-amd64.patch13
-rw-r--r--dev-util/valgrind/valgrind-3.2.3.ebuild5
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 246b6330752b..070fb759f059 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/valgrind
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.78 2007/07/17 17:44:15 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.79 2007/08/26 09:32:34 griffon26 Exp $
+
+ 26 Aug 2007; Maurice van der Pot <griffon26@gentoo.org>
+ +files/valgrind-3.2.3-unhandled-instr-amd64.patch, valgrind-3.2.3.ebuild:
+ Added fix for bug #189396 reported by Tiziano Müller <dev-zero@gentoo.org>.
17 Jul 2007; Maurice van der Pot <griffon26@gentoo.org>
+files/valgrind-3.2.3-glibc-2.6.patch, valgrind-3.2.3.ebuild:
diff --git a/dev-util/valgrind/files/valgrind-3.2.3-unhandled-instr-amd64.patch b/dev-util/valgrind/files/valgrind-3.2.3-unhandled-instr-amd64.patch
new file mode 100644
index 000000000000..ef87883ac7bf
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.2.3-unhandled-instr-amd64.patch
@@ -0,0 +1,13 @@
+Index: VEX/priv/guest-amd64/toIR.c
+===================================================================
+--- VEX/priv/guest-amd64/toIR.c (revision 1775)
++++ VEX/priv/guest-amd64/toIR.c (revision 1776)
+@@ -8387,7 +8387,7 @@
+ as many invalid combinations as possible. */
+ n_prefixes = 0;
+ while (True) {
+- if (n_prefixes > 5) goto decode_failure;
++ if (n_prefixes > 7) goto decode_failure;
+ pre = getUChar(delta);
+ switch (pre) {
+ case 0x66: pfx |= PFX_66; break;
diff --git a/dev-util/valgrind/valgrind-3.2.3.ebuild b/dev-util/valgrind/valgrind-3.2.3.ebuild
index 49d5470f76f3..78852099d72b 100644
--- a/dev-util/valgrind/valgrind-3.2.3.ebuild
+++ b/dev-util/valgrind/valgrind-3.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.3.ebuild,v 1.8 2007/07/17 17:44:15 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.3.ebuild,v 1.9 2007/08/26 09:32:34 griffon26 Exp $
inherit autotools eutils flag-o-matic toolchain-funcs
@@ -45,6 +45,9 @@ src_unpack() {
epatch "${FILESDIR}/${P}-glibc-2.6.patch"
+ # Prevent "unhandled instruction bytes: 0x66 0x66 0x66 0x66" (bug #189396)
+ epatch "${FILESDIR}/${P}-unhandled-instr-amd64.patch"
+
# Regenerate autotools files
eautoreconf
}