From c728a3341577f0069003c78de3a011ac3ea7753a Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 20 Sep 2012 16:48:45 +0200 Subject: [PATCH] 3.8.1-1 Upgrade to valgrind 3.8.1. --- .gitignore | 1 + sources | 2 +- valgrind-3.8.0-avx-alignment-check.patch | 38 -------- valgrind-3.8.0-lzcnt-tzcnt-bugfix.patch | 66 -------------- ...tch => valgrind-3.8.1-abbrev-parsing.patch | 26 +----- ...gz => valgrind-3.8.1-avx2-bmi-fma.patch.gz | Bin ....patch => valgrind-3.8.1-avx2-prereq.patch | 9 +- ...tch => valgrind-3.8.1-bmi-conf-check.patch | 8 +- ...lgrind-3.8.1-cachegrind-improvements.patch | 4 +- ...apget.patch => valgrind-3.8.1-capget.patch | 25 ++++++ ...s.patch => valgrind-3.8.1-cfi_dw_ops.patch | 16 ++-- ...g_h.patch => valgrind-3.8.1-config_h.patch | 0 ...patch => valgrind-3.8.1-enable-armv5.patch | 8 +- ...patch => valgrind-3.8.1-find-buildid.patch | 6 +- ...=> valgrind-3.8.1-helgrind-race-supp.patch | 0 ...pp.patch => valgrind-3.8.1-ldso-supp.patch | 4 +- ....1-memcheck-mc_translate-Iop_8HLto16.patch | 4 +- ...penat.patch => valgrind-3.8.1-openat.patch | 4 +- ....8.0-pie.patch => valgrind-3.8.1-pie.patch | 0 ...tat_h.patch => valgrind-3.8.1-stat_h.patch | 0 ...atch => valgrind-3.8.1-x86-backtrace.patch | 4 +- valgrind.spec | 85 +++++++++++------- 22 files changed, 114 insertions(+), 196 deletions(-) delete mode 100644 valgrind-3.8.0-avx-alignment-check.patch delete mode 100644 valgrind-3.8.0-lzcnt-tzcnt-bugfix.patch rename valgrind-3.8.0-abbrev-parsing.patch => valgrind-3.8.1-abbrev-parsing.patch (62%) rename valgrind-3.8.0-avx2-bmi-fma.patch.gz => valgrind-3.8.1-avx2-bmi-fma.patch.gz (100%) rename valgrind-3.8.0-avx2-prereq.patch => valgrind-3.8.1-avx2-prereq.patch (57%) rename valgrind-3.8.0-bmi-conf-check.patch => valgrind-3.8.1-bmi-conf-check.patch (79%) rename valgrind-3.8.0-cachegrind-improvements.patch => valgrind-3.8.1-cachegrind-improvements.patch (93%) rename valgrind-3.8.0-capget.patch => valgrind-3.8.1-capget.patch (58%) rename valgrind-3.8.0-cfi_dw_ops.patch => valgrind-3.8.1-cfi_dw_ops.patch (89%) rename valgrind-3.8.0-config_h.patch => valgrind-3.8.1-config_h.patch (100%) rename valgrind-3.8.0-enable-armv5.patch => valgrind-3.8.1-enable-armv5.patch (58%) rename valgrind-3.8.0-find-buildid.patch => valgrind-3.8.1-find-buildid.patch (85%) rename valgrind-3.8.0-helgrind-race-supp.patch => valgrind-3.8.1-helgrind-race-supp.patch (100%) rename valgrind-3.8.0-ldso-supp.patch => valgrind-3.8.1-ldso-supp.patch (78%) rename valgrind-3.8.0-memcheck-mc_translate-Iop_8HLto16.patch => valgrind-3.8.1-memcheck-mc_translate-Iop_8HLto16.patch (73%) rename valgrind-3.8.0-openat.patch => valgrind-3.8.1-openat.patch (90%) rename valgrind-3.8.0-pie.patch => valgrind-3.8.1-pie.patch (100%) rename valgrind-3.8.0-stat_h.patch => valgrind-3.8.1-stat_h.patch (100%) rename valgrind-3.8.0-x86-backtrace.patch => valgrind-3.8.1-x86-backtrace.patch (93%) diff --git a/.gitignore b/.gitignore index 2369402..86b12a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /valgrind-3.7.0.tar.bz2 /valgrind-3.8.0-TEST1.tar.bz2 /valgrind-3.8.0.tar.bz2 +/valgrind-3.8.1.tar.bz2 diff --git a/sources b/sources index c420f24..400b660 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec04dfd1256307432b2a7b520398c526 valgrind-3.8.0.tar.bz2 +288758010b271119a0ffc0183f1d6e38 valgrind-3.8.1.tar.bz2 diff --git a/valgrind-3.8.0-avx-alignment-check.patch b/valgrind-3.8.0-avx-alignment-check.patch deleted file mode 100644 index 7a5421b..0000000 --- a/valgrind-3.8.0-avx-alignment-check.patch +++ /dev/null @@ -1,38 +0,0 @@ ------------------------------------------------------------------------- -r2499 | sewardj | 2012-09-02 14:13:34 +0200 (Sun, 02 Sep 2012) | 4 lines - -Remove alignment checks for VMPSADBW, VPHMINPOSUW, VPALIGNR since they -do not apply to the AVX versions of these instructions. Fixes #305926. -(Jakub Jelinek, jakub@redhat.com) - ------------------------------------------------------------------------- -Index: priv/guest_amd64_toIR.c -=================================================================== ---- valgrind-3.8.0/VEX/priv/guest_amd64_toIR.c (revision 2498) -+++ valgrind-3.8.0/VEX/priv/guest_amd64_toIR.c (revision 2499) -@@ -16028,7 +16028,8 @@ - DIP("%sphminposuw %s,%s\n", mbV, nameXMMReg(rE), nameXMMReg(rG)); - } else { - addr = disAMode ( &alen, vbi, pfx, delta, dis_buf, 0 ); -- gen_SEGV_if_not_16_aligned(addr); -+ if (!isAvx) -+ gen_SEGV_if_not_16_aligned(addr); - assign( sV, loadLE(Ity_V128, mkexpr(addr)) ); - delta += alen; - DIP("%sphminposuw %s,%s\n", mbV, dis_buf, nameXMMReg(rG)); -@@ -25898,7 +25899,6 @@ - nameXMMReg(rV), nameXMMReg(rG)); - } else { - addr = disAMode( &alen, vbi, pfx, delta, dis_buf, 1 ); -- gen_SEGV_if_not_16_aligned( addr ); - assign( sV, loadLE(Ity_V128, mkexpr(addr)) ); - imm8 = getUChar(delta+alen); - delta += alen+1; -@@ -26291,7 +26291,6 @@ - } else { - addr = disAMode( &alen, vbi, pfx, delta, dis_buf, - 1/* imm8 is 1 byte after the amode */ ); -- gen_SEGV_if_not_16_aligned( addr ); - assign( src_vec, loadLE( Ity_V128, mkexpr(addr) ) ); - imm8 = (Int)getUChar(delta+alen); - delta += alen+1; diff --git a/valgrind-3.8.0-lzcnt-tzcnt-bugfix.patch b/valgrind-3.8.0-lzcnt-tzcnt-bugfix.patch deleted file mode 100644 index 00d8bf3..0000000 --- a/valgrind-3.8.0-lzcnt-tzcnt-bugfix.patch +++ /dev/null @@ -1,66 +0,0 @@ ------------------------------------------------------------------------- -r2478 | sewardj | 2012-08-23 22:14:51 +0200 (Thu, 23 Aug 2012) | 4 lines - -Fix LZCNT and TZCNT properly. Fixes #295808. (Jakub Jelinek, -jakub@redhat.com) - - ------------------------------------------------------------------------- -Index: priv/guest_amd64_toIR.c -=================================================================== ---- valgrind-3.8.0/VEX/priv/guest_amd64_toIR.c (revision 2477) -+++ valgrind-3.8.0/VEX/priv/guest_amd64_toIR.c (revision 2478) -@@ -20084,13 +20084,16 @@ - return delta; - - case 0xBC: /* BSF Gv,Ev */ -- if (haveF2orF3(pfx)) goto decode_failure; -+ if (haveF2(pfx)) goto decode_failure; - delta = dis_bs_E_G ( vbi, pfx, sz, delta, True ); - return delta; - - case 0xBD: /* BSR Gv,Ev */ -- if (!haveF2orF3(pfx)) { -- /* no-F2 no-F3 0F BD = BSR */ -+ if (!haveF2orF3(pfx) -+ || (haveF3noF2(pfx) -+ && 0 == (archinfo->hwcaps & VEX_HWCAPS_AMD64_LZCNT))) { -+ /* no-F2 no-F3 0F BD = BSR -+ or F3 0F BD = REP; BSR on older CPUs. */ - delta = dis_bs_E_G ( vbi, pfx, sz, delta, False ); - return delta; - } -Index: priv/guest_x86_toIR.c -=================================================================== ---- valgrind-3.8.0/VEX/priv/guest_x86_toIR.c (revision 2477) -+++ valgrind-3.8.0/VEX/priv/guest_x86_toIR.c (revision 2478) -@@ -14021,12 +14021,28 @@ - for the rest, it means REP) */ - case 0xF3: { - Addr32 eip_orig = guest_EIP_bbstart + delta_start; -- if (sorb != 0) goto decode_failure; - abyte = getIByte(delta); delta++; - - if (abyte == 0x66) { sz = 2; abyte = getIByte(delta); delta++; } - -+ if (sorb != 0 && abyte != 0x0F) goto decode_failure; -+ - switch (abyte) { -+ case 0x0F: -+ switch (getIByte(delta)) { -+ /* On older CPUs, TZCNT behaves the same as BSF. */ -+ case 0xBC: /* REP BSF Gv,Ev */ -+ delta = dis_bs_E_G ( sorb, sz, delta + 1, True ); -+ break; -+ /* On older CPUs, LZCNT behaves the same as BSR. */ -+ case 0xBD: /* REP BSR Gv,Ev */ -+ delta = dis_bs_E_G ( sorb, sz, delta + 1, False ); -+ break; -+ default: -+ goto decode_failure; -+ } -+ break; -+ - case 0xA4: sz = 1; /* REP MOVS */ - case 0xA5: - dis_REP_op ( &dres, X86CondAlways, dis_MOVS, sz, eip_orig, diff --git a/valgrind-3.8.0-abbrev-parsing.patch b/valgrind-3.8.1-abbrev-parsing.patch similarity index 62% rename from valgrind-3.8.0-abbrev-parsing.patch rename to valgrind-3.8.1-abbrev-parsing.patch index fdd5199..a12dc82 100644 --- a/valgrind-3.8.0-abbrev-parsing.patch +++ b/valgrind-3.8.1-abbrev-parsing.patch @@ -1,29 +1,7 @@ Index: coregrind/m_debuginfo/readdwarf.c =================================================================== ---- valgrind-3.8.0/coregrind/m_debuginfo/readdwarf.c (revision 12871) -+++ valgrind-3.8.0/coregrind/m_debuginfo/readdwarf.c (working copy) -@@ -1115,7 +1115,8 @@ - case 0x01: /* FORM_addr */ p += addr_size; break; - case 0x03: /* FORM_block2 */ p += ML_(read_UShort)(p) + 2; break; - case 0x04: /* FORM_block4 */ p += ML_(read_UInt)(p) + 4; break; -- case 0x09: /* FORM_block */ p += read_leb128U( &p ); break; -+ case 0x09: /* FORM_block */ /* fallthrough */ -+ case 0x18: /* FORM_exprloc */ { ULong block_len = read_leb128U( &p ); p += block_len; break; } - case 0x0a: /* FORM_block1 */ p += *p + 1; break; - case 0x0c: /* FORM_flag */ p++; break; - case 0x0d: /* FORM_sdata */ read_leb128S( &p ); break; -@@ -1126,7 +1127,6 @@ - case 0x13: /* FORM_ref4 */ p += 4; break; - case 0x14: /* FORM_ref8 */ p += 8; break; - case 0x15: /* FORM_ref_udata */ read_leb128U( &p ); break; -- case 0x18: /* FORM_exprloc */ p += read_leb128U( &p ); break; - case 0x19: /* FORM_flag_present */break; - case 0x20: /* FORM_ref_sig8 */ p += 8; break; - case 0x1f20: /* FORM_GNU_ref_alt */ p += ui->dw64 ? 8 : 4; break; -Index: coregrind/m_debuginfo/readdwarf.c -=================================================================== ---- valgrind-3.8.0/coregrind/m_debuginfo/readdwarf.c (revision 12871) -+++ valgrind-3.8.0/coregrind/m_debuginfo/readdwarf.c (working copy) +--- valgrind/coregrind/m_debuginfo/readdwarf.c (revision 12871) ++++ valgrind/coregrind/m_debuginfo/readdwarf.c (working copy) @@ -945,11 +945,11 @@ /* Return abbrev for given code * Returned pointer points to the tag diff --git a/valgrind-3.8.0-avx2-bmi-fma.patch.gz b/valgrind-3.8.1-avx2-bmi-fma.patch.gz similarity index 100% rename from valgrind-3.8.0-avx2-bmi-fma.patch.gz rename to valgrind-3.8.1-avx2-bmi-fma.patch.gz diff --git a/valgrind-3.8.0-avx2-prereq.patch b/valgrind-3.8.1-avx2-prereq.patch similarity index 57% rename from valgrind-3.8.0-avx2-prereq.patch rename to valgrind-3.8.1-avx2-prereq.patch index 615f61c..2585091 100644 --- a/valgrind-3.8.0-avx2-prereq.patch +++ b/valgrind-3.8.1-avx2-prereq.patch @@ -1,21 +1,18 @@ -diff -u valgrind.avx.orig/none/tests/amd64/avx2-1.vgtest valgrind/none/tests/amd64/avx2-1.vgtest ---- valgrind.avx.orig/none/tests/amd64/avx2-1.vgtest 2012-09-19 16:40:20.675627549 +0200 +--- valgrind/none/tests/amd64/avx2-1.vgtest 2012-09-19 16:40:20.675627549 +0200 +++ valgrind/none/tests/amd64/avx2-1.vgtest 2012-09-19 20:53:16.939765249 +0200 @@ -1,3 +1,3 @@ prog: avx2-1 -prereq: ../../../tests/x86_amd64_features amd64-avx +prereq: test -x avx2-1 && ../../../tests/x86_amd64_features amd64-avx vgopts: -q -diff -u valgrind.avx.orig/none/tests/amd64/bmi.vgtest valgrind/none/tests/amd64/bmi.vgtest ---- valgrind.avx.orig/none/tests/amd64/bmi.vgtest 2012-09-19 16:40:20.368622951 +0200 +--- valgrind/none/tests/amd64/bmi.vgtest 2012-09-19 16:40:20.368622951 +0200 +++ valgrind/none/tests/amd64/bmi.vgtest 2012-09-19 20:54:31.168839454 +0200 @@ -1,3 +1,3 @@ prog: bmi -prereq: ../../../tests/x86_amd64_features amd64-avx +prereq: test -x bmi && ../../../tests/x86_amd64_features amd64-avx vgopts: -q -diff -u valgrind.avx.orig/none/tests/amd64/fma.vgtest valgrind/none/tests/amd64/fma.vgtest ---- valgrind.avx.orig/none/tests/amd64/fma.vgtest 2012-09-19 16:40:20.755628747 +0200 +--- valgrind/none/tests/amd64/fma.vgtest 2012-09-19 16:40:20.755628747 +0200 +++ valgrind/none/tests/amd64/fma.vgtest 2012-09-19 20:54:58.851240219 +0200 @@ -1,3 +1,3 @@ prog: fma diff --git a/valgrind-3.8.0-bmi-conf-check.patch b/valgrind-3.8.1-bmi-conf-check.patch similarity index 79% rename from valgrind-3.8.0-bmi-conf-check.patch rename to valgrind-3.8.1-bmi-conf-check.patch index 1ac3301..a201cf7 100644 --- a/valgrind-3.8.0-bmi-conf-check.patch +++ b/valgrind-3.8.1-bmi-conf-check.patch @@ -1,5 +1,5 @@ ---- valgrind-3.8.0/configure 2012-09-12 20:20:29.868427602 +0200 -+++ valgrind-3.8.0/configure 2012-09-13 18:28:42.354382238 +0200 +--- valgrind/configure 2012-09-12 20:20:29.868427602 +0200 ++++ valgrind/configure 2012-09-13 18:28:42.354382238 +0200 @@ -8389,9 +8389,9 @@ do { unsigned int h, l; @@ -12,8 +12,8 @@ while (0) ; ---- valgrind-3.8.0/configure.in 2012-09-13 14:53:45.826948006 +0200 -+++ valgrind-3.8.0/configure.in 2012-09-13 18:28:20.725057751 +0200 +--- valgrind/configure.in 2012-09-13 14:53:45.826948006 +0200 ++++ valgrind/configure.in 2012-09-13 18:28:20.725057751 +0200 @@ -1822,9 +1822,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ do { unsigned int h, l; diff --git a/valgrind-3.8.0-cachegrind-improvements.patch b/valgrind-3.8.1-cachegrind-improvements.patch similarity index 93% rename from valgrind-3.8.0-cachegrind-improvements.patch rename to valgrind-3.8.1-cachegrind-improvements.patch index b74af5c..f6f9a1f 100644 --- a/valgrind-3.8.0-cachegrind-improvements.patch +++ b/valgrind-3.8.1-cachegrind-improvements.patch @@ -1,5 +1,5 @@ ---- valgrind-3.8.0/cachegrind/cg_sim.c.jj 2011-10-26 23:24:32.000000000 +0200 -+++ valgrind-3.8.0/cachegrind/cg_sim.c 2011-12-09 17:31:19.256023683 +0100 +--- valgrind-3.8.1/cachegrind/cg_sim.c.jj 2011-10-26 23:24:32.000000000 +0200 ++++ valgrind-3.8.1/cachegrind/cg_sim.c 2011-12-09 17:31:19.256023683 +0100 @@ -42,27 +42,30 @@ typedef struct { Int size; /* bytes */ Int assoc; diff --git a/valgrind-3.8.0-capget.patch b/valgrind-3.8.1-capget.patch similarity index 58% rename from valgrind-3.8.0-capget.patch rename to valgrind-3.8.1-capget.patch index 562cdec..c6bf39f 100644 --- a/valgrind-3.8.0-capget.patch +++ b/valgrind-3.8.1-capget.patch @@ -1,3 +1,28 @@ +#include +#include +#include + +int +main (int c, char **argv) +{ + struct __user_cap_header_struct hdr; + hdr.version = _LINUX_CAPABILITY_VERSION; + hdr.pid = 0; + (void) capget(&hdr, NULL); + switch (hdr.version) { + case _LINUX_CAPABILITY_VERSION_1: + printf("Version 1\n"); + break; + case _LINUX_CAPABILITY_VERSION_2: + printf("Version 2\n"); + break; + default: + printf("Unknown version\n"); + break; + } + return 0; +} + --- valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c.jj 2010-04-07 08:14:12.000000000 -0400 +++ valgrind-3.7.0/coregrind/m_syswrap/syswrap-linux.c 2010-04-12 07:24:12.838876000 -0400 @@ -2212,8 +2212,9 @@ PRE(sys_capget) diff --git a/valgrind-3.8.0-cfi_dw_ops.patch b/valgrind-3.8.1-cfi_dw_ops.patch similarity index 89% rename from valgrind-3.8.0-cfi_dw_ops.patch rename to valgrind-3.8.1-cfi_dw_ops.patch index 254f50f..38962b0 100644 --- a/valgrind-3.8.0-cfi_dw_ops.patch +++ b/valgrind-3.8.1-cfi_dw_ops.patch @@ -1,5 +1,5 @@ ---- valgrind-3.8.0/coregrind/m_debuginfo/readdwarf.c (revision 12990) -+++ valgrind-3.8.0/coregrind/m_debuginfo/readdwarf.c (working copy) +--- valgrind/coregrind/m_debuginfo/readdwarf.c (revision 12990) ++++ valgrind/coregrind/m_debuginfo/readdwarf.c (working copy) @@ -2733,6 +2733,7 @@ Word sw; UWord uw; @@ -80,8 +80,8 @@ case DW_OP_minus: op = Cop_Sub; opname = "minus"; goto binop; case DW_OP_plus: ---- valgrind-3.8.0/coregrind/m_debuginfo/debuginfo.c (revision 12990) -+++ valgrind-3.8.0/coregrind/m_debuginfo/debuginfo.c (working copy) +--- valgrind/coregrind/m_debuginfo/debuginfo.c (revision 12990) ++++ valgrind/coregrind/m_debuginfo/debuginfo.c (working copy) @@ -2051,7 +2051,7 @@ UWord evalCfiExpr ( XArray* exprs, Int ix, CfiExprEvalContext* eec, Bool* ok ) @@ -108,8 +108,8 @@ default: goto unhandled; } ---- valgrind-3.8.0/coregrind/m_debuginfo/storage.c (revision 12990) -+++ valgrind-3.8.0/coregrind/m_debuginfo/storage.c (working copy) +--- valgrind/coregrind/m_debuginfo/storage.c (revision 12990) ++++ valgrind/coregrind/m_debuginfo/storage.c (working copy) @@ -595,6 +595,16 @@ e.Cex.Binop.ixR = ixR; return (Int)VG_(addToXA)( dst, &e ); @@ -127,8 +127,8 @@ Int ML_(CfiExpr_CfiReg)( XArray* dst, CfiReg reg ) { CfiExpr e; ---- valgrind-3.8.0/coregrind/m_debuginfo/priv_storage.h (revision 12990) -+++ valgrind-3.8.0/coregrind/m_debuginfo/priv_storage.h (working copy) +--- valgrind/coregrind/m_debuginfo/priv_storage.h (revision 12990) ++++ valgrind/coregrind/m_debuginfo/priv_storage.h (working copy) @@ -296,6 +296,14 @@ typedef diff --git a/valgrind-3.8.0-config_h.patch b/valgrind-3.8.1-config_h.patch similarity index 100% rename from valgrind-3.8.0-config_h.patch rename to valgrind-3.8.1-config_h.patch diff --git a/valgrind-3.8.0-enable-armv5.patch b/valgrind-3.8.1-enable-armv5.patch similarity index 58% rename from valgrind-3.8.0-enable-armv5.patch rename to valgrind-3.8.1-enable-armv5.patch index 9f9a66f..2bc23b6 100644 --- a/valgrind-3.8.0-enable-armv5.patch +++ b/valgrind-3.8.1-enable-armv5.patch @@ -1,5 +1,5 @@ ---- valgrind-3.7.0.old/configure.in 2012-03-05 15:16:23.000000000 -0500 -+++ valgrind-3.7.0/configure.in 2012-03-05 13:49:04.000000000 -0500 +--- valgrind/configure.in 2012-03-05 15:16:23.000000000 -0500 ++++ valgrind/configure.in 2012-03-05 13:49:04.000000000 -0500 @@ -186,7 +186,7 @@ case "${host_cpu}" in ARCH_MAX="s390x" ;; @@ -9,8 +9,8 @@ AC_MSG_RESULT([ok (${host_cpu})]) ARCH_MAX="arm" ;; ---- valgrind-3.7.0.old/configure 2012-03-05 15:16:23.000000000 -0500 -+++ valgrind-3.7.0/configure 2012-03-05 13:49:04.000000000 -0500 +--- valgrind/configure 2012-03-05 15:16:23.000000000 -0500 ++++ valgrind/configure 2012-03-05 13:49:04.000000000 -0500 @@ -5335,7 +5335,7 @@ ARCH_MAX="s390x" ;; diff --git a/valgrind-3.8.0-find-buildid.patch b/valgrind-3.8.1-find-buildid.patch similarity index 85% rename from valgrind-3.8.0-find-buildid.patch rename to valgrind-3.8.1-find-buildid.patch index f58d59f..078bdb0 100644 --- a/valgrind-3.8.0-find-buildid.patch +++ b/valgrind-3.8.1-find-buildid.patch @@ -1,7 +1,5 @@ -Index: coregrind/m_debuginfo/readelf.c -=================================================================== ---- valgrind-3.8.0/coregrind/m_debuginfo/readelf.c (revision 12871) -+++ valgrind-3.8.0/coregrind/m_debuginfo/readelf.c (working copy) +--- valgrind/coregrind/m_debuginfo/readelf.c (revision 12871) ++++ valgrind/coregrind/m_debuginfo/readelf.c (working copy) @@ -888,7 +888,7 @@ * http://fedoraproject.org/wiki/RolandMcGrath/BuildID */ diff --git a/valgrind-3.8.0-helgrind-race-supp.patch b/valgrind-3.8.1-helgrind-race-supp.patch similarity index 100% rename from valgrind-3.8.0-helgrind-race-supp.patch rename to valgrind-3.8.1-helgrind-race-supp.patch diff --git a/valgrind-3.8.0-ldso-supp.patch b/valgrind-3.8.1-ldso-supp.patch similarity index 78% rename from valgrind-3.8.0-ldso-supp.patch rename to valgrind-3.8.1-ldso-supp.patch index 1f999b8..d7a42c7 100644 --- a/valgrind-3.8.0-ldso-supp.patch +++ b/valgrind-3.8.1-ldso-supp.patch @@ -1,5 +1,5 @@ ---- valgrind-3.7.0/glibc-2.X.supp.in.jj 2011-10-26 23:24:45.000000000 +0200 -+++ valgrind-3.7.0/glibc-2.X.supp.in 2012-05-07 10:55:20.395942656 +0200 +--- valgrind/glibc-2.X.supp.in.jj 2011-10-26 23:24:45.000000000 +0200 ++++ valgrind/glibc-2.X.supp.in 2012-05-07 10:55:20.395942656 +0200 @@ -124,7 +124,7 @@ glibc-2.5.x-on-SUSE-10.2-(PPC)-2a Memcheck:Cond diff --git a/valgrind-3.8.0-memcheck-mc_translate-Iop_8HLto16.patch b/valgrind-3.8.1-memcheck-mc_translate-Iop_8HLto16.patch similarity index 73% rename from valgrind-3.8.0-memcheck-mc_translate-Iop_8HLto16.patch rename to valgrind-3.8.1-memcheck-mc_translate-Iop_8HLto16.patch index 49346a6..5a6390b 100644 --- a/valgrind-3.8.0-memcheck-mc_translate-Iop_8HLto16.patch +++ b/valgrind-3.8.1-memcheck-mc_translate-Iop_8HLto16.patch @@ -1,5 +1,5 @@ ---- valgrind-3.8.0/memcheck/mc_translate.c (revision 12883) -+++ valgrind-3.8.0/memcheck/mc_translate.c (revision 12884) +--- valgrind/memcheck/mc_translate.c (revision 12883) ++++ valgrind/memcheck/mc_translate.c (revision 12884) @@ -3313,6 +3313,8 @@ case Iop_DivModS128to64: return mkLazy2(mce, Ity_I128, vatom1, vatom2); diff --git a/valgrind-3.8.0-openat.patch b/valgrind-3.8.1-openat.patch similarity index 90% rename from valgrind-3.8.0-openat.patch rename to valgrind-3.8.1-openat.patch index 87a4098..cb3a433 100644 --- a/valgrind-3.8.0-openat.patch +++ b/valgrind-3.8.1-openat.patch @@ -15,8 +15,8 @@ main (void) return 0; } ---- valgrind-3.8.0/coregrind/m_syswrap/syswrap-linux.c.jj 2007-12-11 00:18:43.000000000 +0100 -+++ valgrind-3.8.0/coregrind/m_syswrap/syswrap-linux.c 2008-03-03 11:35:15.000000000 +0100 +--- valgrind-3.8.1/coregrind/m_syswrap/syswrap-linux.c.jj 2007-12-11 00:18:43.000000000 +0100 ++++ valgrind-3.8.1/coregrind/m_syswrap/syswrap-linux.c 2008-03-03 11:35:15.000000000 +0100 @@ -3308,10 +3308,15 @@ PRE(sys_openat) int, dfd, const char *, filename, int, flags); } diff --git a/valgrind-3.8.0-pie.patch b/valgrind-3.8.1-pie.patch similarity index 100% rename from valgrind-3.8.0-pie.patch rename to valgrind-3.8.1-pie.patch diff --git a/valgrind-3.8.0-stat_h.patch b/valgrind-3.8.1-stat_h.patch similarity index 100% rename from valgrind-3.8.0-stat_h.patch rename to valgrind-3.8.1-stat_h.patch diff --git a/valgrind-3.8.0-x86-backtrace.patch b/valgrind-3.8.1-x86-backtrace.patch similarity index 93% rename from valgrind-3.8.0-x86-backtrace.patch rename to valgrind-3.8.1-x86-backtrace.patch index fc9d055..17ff658 100644 --- a/valgrind-3.8.0-x86-backtrace.patch +++ b/valgrind-3.8.1-x86-backtrace.patch @@ -1,5 +1,5 @@ ---- valgrind-3.8.0/coregrind/m_stacktrace.c.jj 2012-08-05 18:04:16.000000000 +0200 -+++ valgrind-3.8.0/coregrind/m_stacktrace.c 2012-08-10 12:13:46.069797051 +0200 +--- valgrind/coregrind/m_stacktrace.c.jj 2012-08-05 18:04:16.000000000 +0200 ++++ valgrind/coregrind/m_stacktrace.c 2012-08-10 12:13:46.069797051 +0200 @@ -149,11 +149,23 @@ UInt VG_(get_StackTrace_wrk) ( ThreadId /* Try to derive a new (ip,sp,fp) triple from the current set. */ diff --git a/valgrind.spec b/valgrind.spec index 2d04240..817a119 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -2,8 +2,8 @@ Summary: Tool for finding memory management bugs in programs Name: %{?scl_prefix}valgrind -Version: 3.8.0 -Release: 8%{?dist} +Version: 3.8.1 +Release: 1%{?dist} Epoch: 1 License: GPLv2 URL: http://www.valgrind.org/ @@ -13,21 +13,45 @@ Group: Development/Debuggers BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2 -Patch1: valgrind-3.8.0-cachegrind-improvements.patch -Patch2: valgrind-3.8.0-openat.patch -Patch3: valgrind-3.8.0-helgrind-race-supp.patch -Patch4: valgrind-3.8.0-stat_h.patch -Patch5: valgrind-3.8.0-config_h.patch -Patch6: valgrind-3.8.0-capget.patch -Patch7: valgrind-3.8.0-pie.patch -Patch9: valgrind-3.8.0-enable-armv5.patch -Patch10: valgrind-3.8.0-ldso-supp.patch -Patch11: valgrind-3.8.0-x86-backtrace.patch -Patch12: valgrind-3.8.0-find-buildid.patch -Patch13: valgrind-3.8.0-abbrev-parsing.patch -Patch14: valgrind-3.8.0-lzcnt-tzcnt-bugfix.patch -Patch15: valgrind-3.8.0-avx-alignment-check.patch +Patch1: valgrind-3.8.1-cachegrind-improvements.patch + +# KDE#307103 - sys_openat If pathname is absolute, then dirfd is ignored. +Patch2: valgrind-3.8.1-openat.patch + +# KDE#211352 - helgrind races in helgrind's own mythread_wrapper +Patch3: valgrind-3.8.1-helgrind-race-supp.patch + +Patch4: valgrind-3.8.1-stat_h.patch + +# Support really ancient gcc. Check __GNUC__ >= 3 for __builtin_expect. +Patch5: valgrind-3.8.1-config_h.patch + +# KDE#307101 - sys_capget second argument can be NULL +Patch6: valgrind-3.8.1-capget.patch + +# KDE#263034 - Crash when loading some PPC64 binaries +Patch7: valgrind-3.8.1-pie.patch + +# configure detection change from armv7* to armv[57]*. +Patch8: valgrind-3.8.1-enable-armv5.patch + +Patch9: valgrind-3.8.1-ldso-supp.patch + +# On x86 GCC 4.6 and later now defaults to -fomit-frame-pointer +# together with emitting unwind info (-fasynchronous-unwind-tables). +# So, try CF info first. +Patch10: valgrind-3.8.1-x86-backtrace.patch + +# KDE#305431 - Use find_buildid shdr fallback for separate .debug files +Patch11: valgrind-3.8.1-find-buildid.patch + +# KDE#305513 - Robustify abbrev reading (part already upstream). +Patch12: valgrind-3.8.1-abbrev-parsing.patch + +# KDE#307038 - DWARF2 CFI reader: unhandled DW_OP_ opcode 0x8 (DW_OP_const1u) +Patch13: valgrind-3.8.1-cfi_dw_ops.patch + # KDE#305728 - Add support for AVX2, BMI1, BMI2 and FMA instructions # Combined patch for: @@ -49,16 +73,16 @@ Patch15: valgrind-3.8.0-avx-alignment-check.patch # ./none/tests/amd64/avx2-1.stderr.exp # ./none/tests/amd64/fma.stderr.exp # ./none/tests/amd64/bmi.stderr.exp -Patch16: valgrind-3.8.0-avx2-bmi-fma.patch.gz +Patch21: valgrind-3.8.1-avx2-bmi-fma.patch.gz # Small fixup for above patch, just a configure check. # This is equivalent to valgrind-bmi-5.patch from KDE#305728 -Patch17: valgrind-3.8.0-bmi-conf-check.patch +Patch22: valgrind-3.8.1-bmi-conf-check.patch # Partial backport of upstream revision 12884 without it AVX2 VPBROADCASTB # insn is broken under memcheck. -Patch18: valgrind-3.8.0-memcheck-mc_translate-Iop_8HLto16.patch -Patch19: valgrind-3.8.0-avx2-prereq.patch +Patch23: valgrind-3.8.1-memcheck-mc_translate-Iop_8HLto16.patch +# vgtest files should prereq that the binary is there (for old binutils). +Patch24: valgrind-3.8.1-avx2-prereq.patch -Patch20: valgrind-3.8.0-cfi_dw_ops.patch Obsoletes: valgrind-callgrind %ifarch x86_64 ppc64 @@ -150,6 +174,7 @@ for details. %prep %setup -q %{?scl:-n %{pkg_name}-%{version}} + %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -157,24 +182,21 @@ for details. %patch5 -p1 %patch6 -p1 %patch7 -p1 - +%patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 +# Add support for AVX2, BMI1, BMI2 and FMA instructions +%patch21 -p1 touch ./none/tests/amd64/avx2-1.stderr.exp touch ./none/tests/amd64/fma.stderr.exp touch ./none/tests/amd64/bmi.stderr.exp -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 - -%patch20 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build # We need to use the software collection compiler and binutils if available. @@ -301,7 +323,7 @@ echo ===============END TESTING=============== %endif %changelog -* Thu Sep 20 2012 Mark Wielaard +* Thu Sep 20 2012 Mark Wielaard 3.8.1-1 - Add partial backport of upstream revision 12884 valgrind-3.8.0-memcheck-mc_translate-Iop_8HLto16.patch without it AVX2 VPBROADCASTB insn is broken under memcheck. @@ -312,6 +334,7 @@ echo ===============END TESTING=============== Makefile.in from valgrind-3.8.0-avx2-bmi-fma.patch.gz - Remove valgrind-3.8.0-tests.patch tests no longer hang. - Added SCL macros to support building as part of a Software Collection. +- Upgrade to valgrind 3.8.1. * Wed Sep 12 2012 Mark Wielaard 3.8.0-8 - Add configure fixup valgrind-3.8.0-bmi-conf-check.patch