diff --git a/.cvsignore b/.cvsignore
index 9697be4..6ffccec 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-valgrind-3.4.1.tar.bz2
+valgrind-3.5.0.tar.bz2
diff --git a/sources b/sources
index 0ee930f..72a9367 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5f039dd2271aaf9ae570ab4116f87c7 valgrind-3.4.1.tar.bz2
+f03522a4687cf76c676c9494fcc0a517 valgrind-3.5.0.tar.bz2
diff --git a/valgrind-3.4.1-cachegrind-improvements.patch b/valgrind-3.4.1-cachegrind-improvements.patch
deleted file mode 100644
index 5fbb3cc..0000000
--- a/valgrind-3.4.1-cachegrind-improvements.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- valgrind-3.4.0/cachegrind/cg_sim.c.jj 2007-01-08 02:43:10.000000000 -0500
-+++ valgrind-3.4.0/cachegrind/cg_sim.c 2007-02-13 07:15:46.000000000 -0500
-@@ -42,27 +42,30 @@ typedef struct {
- Int size; /* bytes */
- Int assoc;
- Int line_size; /* bytes */
-- Int sets;
- Int sets_min_1;
- Int line_size_bits;
- Int tag_shift;
-- Char desc_line[128];
- UWord* tags;
--} cache_t2;
-+ Char desc_line[128];
-+} cache_t2
-+#ifdef __GNUC__
-+__attribute__ ((aligned (8 * sizeof (Int))))
-+#endif
-+;
-
- /* By this point, the size/assoc/line_size has been checked. */
- static void cachesim_initcache(cache_t config, cache_t2* c)
- {
-- Int i;
-+ Int sets;
-
- c->size = config.size;
- c->assoc = config.assoc;
- c->line_size = config.line_size;
-
-- c->sets = (c->size / c->line_size) / c->assoc;
-- c->sets_min_1 = c->sets - 1;
-+ sets = (c->size / c->line_size) / c->assoc;
-+ c->sets_min_1 = sets - 1;
- c->line_size_bits = VG_(log2)(c->line_size);
-- c->tag_shift = c->line_size_bits + VG_(log2)(c->sets);
-+ c->tag_shift = c->line_size_bits + VG_(log2)(sets);
-
- if (c->assoc == 1) {
- VG_(sprintf)(c->desc_line, "%d B, %d B, direct-mapped",
-@@ -72,11 +75,8 @@ static void cachesim_initcache(cache_t c
- c->size, c->line_size, c->assoc);
- }
-
-- c->tags = VG_(malloc)("cg.sim.ci.1",
-- sizeof(UWord) * c->sets * c->assoc);
--
-- for (i = 0; i < c->sets * c->assoc; i++)
-- c->tags[i] = 0;
-+ c->tags = VG_(calloc)("cg.sim.ci.1",
-+ sizeof(UWord), sets * c->assoc);
- }
-
- /* This is done as a macro rather than by passing in the cache_t2 as an
-@@ -138,8 +138,7 @@ void cachesim_##L##_doref(Addr a, UChar
- return; \
- \
- /* Second case: word straddles two lines. */ \
-- /* Nb: this is a fast way of doing ((set1+1) % L.sets) */ \
-- } else if (((set1 + 1) & (L.sets-1)) == set2) { \
-+ } else if (((set1 + 1) & (L.sets_min_1)) == set2) { \
- set = &(L.tags[set1 * L.assoc]); \
- if (tag == set[0]) { \
- goto block2; \
diff --git a/valgrind-3.4.1-dwarf-cfa-remember-state1.patch b/valgrind-3.4.1-dwarf-cfa-remember-state1.patch
deleted file mode 100644
index 101dc53..0000000
--- a/valgrind-3.4.1-dwarf-cfa-remember-state1.patch
+++ /dev/null
@@ -1,310 +0,0 @@
---- valgrind/coregrind/m_debuginfo/readdwarf.c.jj 2009-07-13 14:09:14.478329957 +0200
-+++ valgrind/coregrind/m_debuginfo/readdwarf.c 2009-07-13 15:18:35.596080042 +0200
-@@ -1923,6 +1923,11 @@ static void ppRegRule ( XArray* exprs, R
- }
-
-
-+/* Size of the stack of register unwind rules. This is only
-+ exceedingly rarely used, so a stack of size 1 should actually work
-+ with almost all compiler-generated CFA. */
-+#define N_RR_STACK 4
-+
- typedef
- struct {
- /* Read-only fields (set by the CIE) */
-@@ -1939,8 +1944,12 @@ typedef
- Int cfa_reg;
- Int cfa_off; /* in bytes */
- Int cfa_expr_ix; /* index into cfa_exprs */
-- /* register unwind rules */
-- RegRule reg[N_CFI_REGS];
-+ /* A stack of register unwind rules. We need a stack of them,
-+ rather than just one set of rules, in order to handle
-+ DW_CFA_{remember,restore}_state. */
-+ RegRule reg[N_RR_STACK][N_CFI_REGS];
-+ Int reg_sp; /* 0 <= reg_sp < N_RR_STACK; points at the
-+ currently-in-use rule set. */
- /* array of CfiExpr, shared by reg[] and cfa_expr_ix */
- XArray* exprs;
- }
-@@ -1948,7 +1957,7 @@ typedef
-
- static void ppUnwindContext ( UnwindContext* ctx )
- {
-- Int i;
-+ Int j, i;
- VG_(printf)("0x%llx: ", (ULong)ctx->loc);
- if (ctx->cfa_is_regoff) {
- VG_(printf)("%d(r%d) ", ctx->cfa_off, ctx->cfa_reg);
-@@ -1958,14 +1967,19 @@ static void ppUnwindContext ( UnwindCont
- ML_(ppCfiExpr)( ctx->exprs, ctx->cfa_expr_ix );
- VG_(printf)("} ");
- }
-- for (i = 0; i < N_CFI_REGS; i++)
-- ppRegRule(ctx->exprs, &ctx->reg[i]);
-+ for (j = 0; j <= ctx->reg_sp; j++) {
-+ VG_(printf)("%s[%d]={ ", j > 0 ? " " : "", j);
-+ for (i = 0; i < N_CFI_REGS; i++)
-+ ppRegRule(ctx->exprs, &ctx->reg[j][i]);
-+ VG_(printf)("}");
-+ }
- VG_(printf)("\n");
- }
-
- static void initUnwindContext ( /*OUT*/UnwindContext* ctx )
- {
-- Int i;
-+ Int j, i;
-+ VG_(memset)(ctx, 0, sizeof(*ctx));
- ctx->code_a_f = 0;
- ctx->data_a_f = 0;
- ctx->initloc = 0;
-@@ -1976,9 +1990,12 @@ static void initUnwindContext ( /*OUT*/U
- ctx->cfa_off = 0;
- ctx->cfa_expr_ix = 0;
- ctx->exprs = NULL;
-- for (i = 0; i < N_CFI_REGS; i++) {
-- ctx->reg[i].tag = RR_Undef;
-- ctx->reg[i].arg = 0;
-+ ctx->reg_sp = 0;
-+ for (j = 0; j < N_RR_STACK; j++) {
-+ for (i = 0; i < N_CFI_REGS; i++) {
-+ ctx->reg[j][i].tag = RR_Undef;
-+ ctx->reg[j][i].arg = 0;
-+ }
- }
- }
-
-@@ -2104,8 +2121,15 @@ static Bool summarise_context( /*OUT*/Di
- why = 2; goto failed; /* otherwise give up */ \
- }
-
-- SUMMARISE_HOW(si->ra_how, si->ra_off, ctx->reg[ctx->ra_reg] );
-- SUMMARISE_HOW(si->fp_how, si->fp_off, ctx->reg[FP_REG] );
-+ /* Guard against obviously stupid settings of the reg-rule stack
-+ pointer. */
-+ if (ctx->reg_sp < 0) { why = 8; goto failed; }
-+ if (ctx->reg_sp >= N_RR_STACK) { why = 9; goto failed; }
-+
-+ SUMMARISE_HOW(si->ra_how, si->ra_off,
-+ ctx->reg[ctx->reg_sp][ctx->ra_reg] );
-+ SUMMARISE_HOW(si->fp_how, si->fp_off,
-+ ctx->reg[ctx->reg_sp][FP_REG] );
-
- # undef SUMMARISE_HOW
-
-@@ -2116,7 +2140,7 @@ static Bool summarise_context( /*OUT*/Di
-
- /* also, gcc says "Undef" for %{e,r}bp when it is unchanged. So
- .. */
-- if (ctx->reg[FP_REG].tag == RR_Undef)
-+ if (ctx->reg[ctx->reg_sp][FP_REG].tag == RR_Undef)
- si->fp_how = CFIR_SAME;
-
- /* knock out some obviously stupid cases */
-@@ -2215,10 +2239,10 @@ static void ppUnwindContext_summary ( Un
- }
-
- VG_(printf)("RA=");
-- ppRegRule( ctx->exprs, &ctx->reg[ctx->ra_reg] );
-+ ppRegRule( ctx->exprs, &ctx->reg[ctx->reg_sp][ctx->ra_reg] );
-
- VG_(printf)("FP=");
-- ppRegRule( ctx->exprs, &ctx->reg[FP_REG] );
-+ ppRegRule( ctx->exprs, &ctx->reg[ctx->reg_sp][FP_REG] );
- VG_(printf)("\n");
- }
-
-@@ -2664,6 +2688,9 @@ static Int run_CF_instruction ( /*MOD*/U
- Addr printing_bias = ((Addr)ctx->initloc) - ((Addr)di->text_bias);
- i++;
-
-+ if (ctx->reg_sp < 0 || ctx->reg_sp >= N_RR_STACK)
-+ return 0; /* bogus reg-rule stack pointer */
-+
- if (hi2 == DW_CFA_advance_loc) {
- delta = (UInt)lo6;
- ctx->loc += delta;
-@@ -2680,12 +2707,13 @@ static Int run_CF_instruction ( /*MOD*/U
- reg = (Int)lo6;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_CFAOff;
-- ctx->reg[reg].arg = off * ctx->data_a_f;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_CFAOff;
-+ ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_offset: r%d at cfa%s%d\n",
-- (Int)reg, ctx->reg[reg].arg < 0 ? "" : "+",
-- (Int)ctx->reg[reg].arg );
-+ (Int)reg,
-+ ctx->reg[ctx->reg_sp][reg].arg < 0 ? "" : "+",
-+ (Int)ctx->reg[ctx->reg_sp][reg].arg );
- return i;
- }
-
-@@ -2695,7 +2723,7 @@ static Int run_CF_instruction ( /*MOD*/U
- return 0; /* fail */
- if (restore_ctx == NULL)
- return 0; /* fail */
-- ctx->reg[reg] = restore_ctx->reg[reg];
-+ ctx->reg[ctx->reg_sp][reg] = restore_ctx->reg[ctx->reg_sp][reg];
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_restore: r%d\n", (Int)reg);
- return i;
-@@ -2781,8 +2809,8 @@ static Int run_CF_instruction ( /*MOD*/U
- return 0; /* fail */
- if (reg2 < 0 || reg2 >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_Reg;
-- ctx->reg[reg].arg = reg2;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_Reg;
-+ ctx->reg[ctx->reg_sp][reg].arg = reg2;
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_register: r%d in r%d\n",
- (Int)reg, (Int)reg2);
-@@ -2795,8 +2823,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_CFAOff;
-- ctx->reg[reg].arg = off * ctx->data_a_f;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_CFAOff;
-+ ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_offset_extended\n");
- break;
-@@ -2808,12 +2836,13 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_CFAOff;
-- ctx->reg[reg].arg = off * ctx->data_a_f;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_CFAOff;
-+ ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_offset_extended_sf: r%d at cfa%s%d\n",
-- reg, ctx->reg[reg].arg < 0 ? "" : "+",
-- (Int)ctx->reg[reg].arg);
-+ reg,
-+ ctx->reg[ctx->reg_sp][reg].arg < 0 ? "" : "+",
-+ (Int)ctx->reg[ctx->reg_sp][reg].arg);
- break;
-
- case DW_CFA_GNU_negative_offset_extended:
-@@ -2823,8 +2852,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_CFAOff;
-- ctx->reg[reg].arg = (-off) * ctx->data_a_f;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_CFAOff;
-+ ctx->reg[ctx->reg_sp][reg].arg = (-off) * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_GNU_negative_offset_extended\n");
- break;
-@@ -2836,7 +2865,7 @@ static Int run_CF_instruction ( /*MOD*/U
- return 0; /* fail */
- if (restore_ctx == NULL)
- return 0; /* fail */
-- ctx->reg[reg] = restore_ctx->reg[reg];
-+ ctx->reg[ctx->reg_sp][reg] = restore_ctx->reg[ctx->reg_sp][reg];
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_restore_extended\n");
- break;
-@@ -2848,8 +2877,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_CFAValOff;
-- ctx->reg[reg].arg = off * ctx->data_a_f;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_CFAValOff;
-+ ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_val_offset\n");
- break;
-@@ -2861,8 +2890,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_CFAValOff;
-- ctx->reg[reg].arg = off * ctx->data_a_f;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_CFAValOff;
-+ ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_val_offset_sf\n");
- break;
-@@ -2907,8 +2936,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_Undef;
-- ctx->reg[reg].arg = 0;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_Undef;
-+ ctx->reg[ctx->reg_sp][reg].arg = 0;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_undefined\n");
- break;
-@@ -2952,8 +2981,8 @@ static Int run_CF_instruction ( /*MOD*/U
- return 0; /* fail */
- /* Add an extra dereference */
- j = ML_(CfiExpr_Deref)( ctx->exprs, j );
-- ctx->reg[reg].tag = RR_ValExpr;
-- ctx->reg[reg].arg = j;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_ValExpr;
-+ ctx->reg[ctx->reg_sp][reg].arg = j;
- break;
-
- case DW_CFA_val_expression:
-@@ -2981,8 +3010,8 @@ static Int run_CF_instruction ( /*MOD*/U
- }
- if (j == -1)
- return 0; /* fail */
-- ctx->reg[reg].tag = RR_ValExpr;
-- ctx->reg[reg].arg = j;
-+ ctx->reg[ctx->reg_sp][reg].tag = RR_ValExpr;
-+ ctx->reg[ctx->reg_sp][reg].arg = j;
- break;
-
- case DW_CFA_def_cfa_expression:
-@@ -3008,7 +3037,39 @@ static Int run_CF_instruction ( /*MOD*/U
- /* Ignored. This appears to be sparc-specific; quite why it
- turns up in SuSE-supplied x86 .so's beats me. */
- if (di->ddump_frames)
-- VG_(printf)("DW_CFA_GNU_window_save\n");
-+ VG_(printf)(" DW_CFA_GNU_window_save\n");
-+ break;
-+
-+ case DW_CFA_remember_state:
-+ if (di->ddump_frames)
-+ VG_(printf)(" DW_CFA_remember_state\n");
-+ /* we just checked this at entry, so: */
-+ vg_assert(ctx->reg_sp >= 0 && ctx->reg_sp < N_RR_STACK);
-+ ctx->reg_sp++;
-+ if (ctx->reg_sp == N_RR_STACK) {
-+ /* stack overflow. We're hosed. */
-+ VG_(message)(Vg_DebugMsg, "DWARF2 CFI reader: N_RR_STACK is "
-+ "too low; increase and recompile.");
-+ i = 0; /* indicate failure */
-+ } else {
-+ VG_(memcpy)(/*dst*/&ctx->reg[ctx->reg_sp],
-+ /*src*/&ctx->reg[ctx->reg_sp - 1],
-+ sizeof(ctx->reg[ctx->reg_sp]) );
-+ }
-+ break;
-+
-+ case DW_CFA_restore_state:
-+ if (di->ddump_frames)
-+ VG_(printf)(" DW_CFA_restore_state\n");
-+ /* we just checked this at entry, so: */
-+ vg_assert(ctx->reg_sp >= 0 && ctx->reg_sp < N_RR_STACK);
-+ if (ctx->reg_sp == 0) {
-+ /* stack overflow. Give up. */
-+ i = 0; /* indicate failure */
-+ } else {
-+ /* simply fall back to previous entry */
-+ ctx->reg_sp--;
-+ }
- break;
-
- default:
diff --git a/valgrind-3.4.1-dwarf-cfa-remember-state2.patch b/valgrind-3.4.1-dwarf-cfa-remember-state2.patch
deleted file mode 100644
index 9559b28..0000000
--- a/valgrind-3.4.1-dwarf-cfa-remember-state2.patch
+++ /dev/null
@@ -1,518 +0,0 @@
---- valgrind/coregrind/m_debuginfo/readdwarf.c.jj 2009-07-13 15:18:35.596080042 +0200
-+++ valgrind/coregrind/m_debuginfo/readdwarf.c 2009-07-13 15:54:43.576955651 +0200
-@@ -1939,17 +1939,20 @@ typedef
- run_CF_instruction. */
- /* The LOC entry */
- Addr loc;
-- /* The CFA entry. This can be either reg+/-offset or an expr. */
-- Bool cfa_is_regoff; /* True=>is reg+offset; False=>is expr */
-- Int cfa_reg;
-- Int cfa_off; /* in bytes */
-- Int cfa_expr_ix; /* index into cfa_exprs */
-- /* A stack of register unwind rules. We need a stack of them,
-- rather than just one set of rules, in order to handle
-+ /* We need a stack of these in order to handle
- DW_CFA_{remember,restore}_state. */
-- RegRule reg[N_RR_STACK][N_CFI_REGS];
-- Int reg_sp; /* 0 <= reg_sp < N_RR_STACK; points at the
-- currently-in-use rule set. */
-+ struct UnwindContextState {
-+ /* The CFA entry. This can be either reg+/-offset or an expr. */
-+ Bool cfa_is_regoff; /* True=>is reg+offset; False=>is expr */
-+ Int cfa_reg;
-+ Int cfa_off; /* in bytes */
-+ Int cfa_expr_ix; /* index into cfa_exprs */
-+ /* Register unwind rules. */
-+ RegRule reg[N_CFI_REGS];
-+ }
-+ state[N_RR_STACK];
-+ Int state_sp; /* 0 <= state_sp < N_RR_STACK; points at the
-+ currently-in-use rule set. */
- /* array of CfiExpr, shared by reg[] and cfa_expr_ix */
- XArray* exprs;
- }
-@@ -1959,18 +1962,20 @@ static void ppUnwindContext ( UnwindCont
- {
- Int j, i;
- VG_(printf)("0x%llx: ", (ULong)ctx->loc);
-- if (ctx->cfa_is_regoff) {
-- VG_(printf)("%d(r%d) ", ctx->cfa_off, ctx->cfa_reg);
-- } else {
-- vg_assert(ctx->exprs);
-- VG_(printf)("{");
-- ML_(ppCfiExpr)( ctx->exprs, ctx->cfa_expr_ix );
-- VG_(printf)("} ");
-- }
-- for (j = 0; j <= ctx->reg_sp; j++) {
-+ for (j = 0; j <= ctx->state_sp; j++) {
-+ struct UnwindContextState* ctxs = &ctx->state[j];
- VG_(printf)("%s[%d]={ ", j > 0 ? " " : "", j);
-+ if (ctxs->cfa_is_regoff) {
-+ VG_(printf)("%d(r%d) ", ctxs->cfa_off, ctxs->cfa_reg);
-+ } else {
-+ vg_assert(ctx->exprs);
-+ VG_(printf)("{");
-+ ML_(ppCfiExpr)( ctx->exprs, ctxs->cfa_expr_ix );
-+ VG_(printf)("} ");
-+ }
-+ VG_(printf)("{ ");
- for (i = 0; i < N_CFI_REGS; i++)
-- ppRegRule(ctx->exprs, &ctx->reg[j][i]);
-+ ppRegRule(ctx->exprs, &ctxs->reg[i]);
- VG_(printf)("}");
- }
- VG_(printf)("\n");
-@@ -1980,21 +1985,22 @@ static void initUnwindContext ( /*OUT*/U
- {
- Int j, i;
- VG_(memset)(ctx, 0, sizeof(*ctx));
-- ctx->code_a_f = 0;
-+ /* ctx->code_a_f = 0;
- ctx->data_a_f = 0;
-- ctx->initloc = 0;
-+ ctx->initloc = 0; */
- ctx->ra_reg = RA_REG_DEFAULT;
-- ctx->loc = 0;
-- ctx->cfa_is_regoff = True;
-- ctx->cfa_reg = 0;
-- ctx->cfa_off = 0;
-- ctx->cfa_expr_ix = 0;
-+ /* ctx->loc = 0;
- ctx->exprs = NULL;
-- ctx->reg_sp = 0;
-+ ctx->state_sp = 0; */
- for (j = 0; j < N_RR_STACK; j++) {
-+ ctx->state[j].cfa_is_regoff = True;
-+ /* ctx->state[j].cfa_reg = 0;
-+ ctx->state[j].cfa_off = 0;
-+ ctx->state[j].cfa_expr_ix = 0; */
- for (i = 0; i < N_CFI_REGS; i++) {
-- ctx->reg[j][i].tag = RR_Undef;
-- ctx->reg[j][i].arg = 0;
-+ if (RR_Undef != 0)
-+ ctx->state[j].reg[i].tag = RR_Undef;
-+ /* ctx->state[j].reg[i].arg = 0; */
- }
- }
- }
-@@ -2048,10 +2054,17 @@ static Bool summarise_context( /*OUT*/Di
- struct _DebugInfo* debuginfo )
- {
- Int why = 0;
-+ struct UnwindContextState* ctxs;
- initCfiSI(si);
-
-+ /* Guard against obviously stupid settings of the reg-rule stack
-+ pointer. */
-+ if (ctx->state_sp < 0) { why = 8; goto failed; }
-+ if (ctx->state_sp >= N_RR_STACK) { why = 9; goto failed; }
-+ ctxs = &ctx->state[ctx->state_sp];
-+
- /* How to generate the CFA */
-- if (!ctx->cfa_is_regoff) {
-+ if (!ctxs->cfa_is_regoff) {
- /* it was set by DW_CFA_def_cfa_expression; try to convert */
- XArray *src, *dst;
- Int conv;
-@@ -2064,7 +2077,7 @@ static Bool summarise_context( /*OUT*/Di
- debuginfo->cfsi_exprs = dst;
- }
- conv = copy_convert_CfiExpr_tree
-- ( dst, ctx, ctx->cfa_expr_ix );
-+ ( dst, ctx, ctxs->cfa_expr_ix );
- vg_assert(conv >= -1);
- if (conv == -1) { why = 6; goto failed; }
- si->cfa_how = CFIC_EXPR;
-@@ -2072,13 +2085,13 @@ static Bool summarise_context( /*OUT*/Di
- if (0 && debuginfo->ddump_frames)
- ML_(ppCfiExpr)(dst, conv);
- } else
-- if (ctx->cfa_is_regoff && ctx->cfa_reg == SP_REG) {
-+ if (ctxs->cfa_is_regoff && ctxs->cfa_reg == SP_REG) {
- si->cfa_how = CFIC_SPREL;
-- si->cfa_off = ctx->cfa_off;
-+ si->cfa_off = ctxs->cfa_off;
- } else
-- if (ctx->cfa_is_regoff && ctx->cfa_reg == FP_REG) {
-+ if (ctxs->cfa_is_regoff && ctxs->cfa_reg == FP_REG) {
- si->cfa_how = CFIC_FPREL;
-- si->cfa_off = ctx->cfa_off;
-+ si->cfa_off = ctxs->cfa_off;
- } else {
- why = 1;
- goto failed;
-@@ -2121,15 +2134,10 @@ static Bool summarise_context( /*OUT*/Di
- why = 2; goto failed; /* otherwise give up */ \
- }
-
-- /* Guard against obviously stupid settings of the reg-rule stack
-- pointer. */
-- if (ctx->reg_sp < 0) { why = 8; goto failed; }
-- if (ctx->reg_sp >= N_RR_STACK) { why = 9; goto failed; }
--
- SUMMARISE_HOW(si->ra_how, si->ra_off,
-- ctx->reg[ctx->reg_sp][ctx->ra_reg] );
-+ ctxs->reg[ctx->ra_reg] );
- SUMMARISE_HOW(si->fp_how, si->fp_off,
-- ctx->reg[ctx->reg_sp][FP_REG] );
-+ ctxs->reg[FP_REG] );
-
- # undef SUMMARISE_HOW
-
-@@ -2140,7 +2148,7 @@ static Bool summarise_context( /*OUT*/Di
-
- /* also, gcc says "Undef" for %{e,r}bp when it is unchanged. So
- .. */
-- if (ctx->reg[ctx->reg_sp][FP_REG].tag == RR_Undef)
-+ if (ctxs->reg[FP_REG].tag == RR_Undef)
- si->fp_how = CFIR_SAME;
-
- /* knock out some obviously stupid cases */
-@@ -2227,22 +2235,24 @@ static Int copy_convert_CfiExpr_tree ( X
-
- static void ppUnwindContext_summary ( UnwindContext* ctx )
- {
-+ struct UnwindContextState* ctxs = &ctx->state[ctx->state_sp];
-+
- VG_(printf)("0x%llx-1: ", (ULong)ctx->loc);
-
-- if (ctx->cfa_reg == SP_REG) {
-- VG_(printf)("SP/CFA=%d+SP ", ctx->cfa_off);
-+ if (ctxs->cfa_reg == SP_REG) {
-+ VG_(printf)("SP/CFA=%d+SP ", ctxs->cfa_off);
- } else
-- if (ctx->cfa_reg == FP_REG) {
-- VG_(printf)("SP/CFA=%d+FP ", ctx->cfa_off);
-+ if (ctxs->cfa_reg == FP_REG) {
-+ VG_(printf)("SP/CFA=%d+FP ", ctxs->cfa_off);
- } else {
- VG_(printf)("SP/CFA=unknown ");
- }
-
- VG_(printf)("RA=");
-- ppRegRule( ctx->exprs, &ctx->reg[ctx->reg_sp][ctx->ra_reg] );
-+ ppRegRule( ctx->exprs, &ctxs->reg[ctx->ra_reg] );
-
- VG_(printf)("FP=");
-- ppRegRule( ctx->exprs, &ctx->reg[ctx->reg_sp][FP_REG] );
-+ ppRegRule( ctx->exprs, &ctxs->reg[FP_REG] );
- VG_(printf)("\n");
- }
-
-@@ -2510,6 +2520,7 @@ static Int dwarfexpr_to_dag ( UnwindCont
-
- Int sp; /* # of top element: valid is -1 .. N_EXPR_STACK-1 */
- Int stack[N_EXPR_STACK]; /* indices into ctx->exprs */
-+ struct UnwindContextState* ctxs = &ctx->state[ctx->state_sp];
-
- XArray* dst = ctx->exprs;
- UChar* limit = expr + exprlen;
-@@ -2521,17 +2532,17 @@ static Int dwarfexpr_to_dag ( UnwindCont
-
- /* Synthesise the CFA as a CfiExpr */
- if (push_cfa_at_start) {
-- if (ctx->cfa_is_regoff) {
-+ if (ctxs->cfa_is_regoff) {
- /* cfa is reg +/- offset */
- ix = ML_(CfiExpr_Binop)( dst,
- Cop_Add,
-- ML_(CfiExpr_DwReg)( dst, ctx->cfa_reg ),
-- ML_(CfiExpr_Const)( dst, (UWord)(Word)ctx->cfa_off )
-+ ML_(CfiExpr_DwReg)( dst, ctxs->cfa_reg ),
-+ ML_(CfiExpr_Const)( dst, (UWord)(Word)ctxs->cfa_off )
- );
- PUSH(ix);
- } else {
- /* CFA is already an expr; use its root node */
-- PUSH(ctx->cfa_expr_ix);
-+ PUSH(ctxs->cfa_expr_ix);
- }
- }
-
-@@ -2686,11 +2697,13 @@ static Int run_CF_instruction ( /*MOD*/U
- UChar hi2 = (instr[i] >> 6) & 3;
- UChar lo6 = instr[i] & 0x3F;
- Addr printing_bias = ((Addr)ctx->initloc) - ((Addr)di->text_bias);
-+ struct UnwindContextState* ctxs;
- i++;
-
-- if (ctx->reg_sp < 0 || ctx->reg_sp >= N_RR_STACK)
-+ if (ctx->state_sp < 0 || ctx->state_sp >= N_RR_STACK)
- return 0; /* bogus reg-rule stack pointer */
-
-+ ctxs = &ctx->state[ctx->state_sp];
- if (hi2 == DW_CFA_advance_loc) {
- delta = (UInt)lo6;
- ctx->loc += delta;
-@@ -2707,13 +2720,13 @@ static Int run_CF_instruction ( /*MOD*/U
- reg = (Int)lo6;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_CFAOff;
-- ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
-+ ctxs->reg[reg].tag = RR_CFAOff;
-+ ctxs->reg[reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_offset: r%d at cfa%s%d\n",
- (Int)reg,
-- ctx->reg[ctx->reg_sp][reg].arg < 0 ? "" : "+",
-- (Int)ctx->reg[ctx->reg_sp][reg].arg );
-+ ctxs->reg[reg].arg < 0 ? "" : "+",
-+ (Int)ctxs->reg[reg].arg );
- return i;
- }
-
-@@ -2723,7 +2736,7 @@ static Int run_CF_instruction ( /*MOD*/U
- return 0; /* fail */
- if (restore_ctx == NULL)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg] = restore_ctx->reg[ctx->reg_sp][reg];
-+ ctxs->reg[reg] = restore_ctx->state[restore_ctx->state_sp].reg[reg];
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_restore: r%d\n", (Int)reg);
- return i;
-@@ -2777,10 +2791,10 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->cfa_is_regoff = True;
-- ctx->cfa_expr_ix = 0;
-- ctx->cfa_reg = reg;
-- ctx->cfa_off = off;
-+ ctxs->cfa_is_regoff = True;
-+ ctxs->cfa_expr_ix = 0;
-+ ctxs->cfa_reg = reg;
-+ ctxs->cfa_off = off;
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_def_cfa: r%d ofs %d\n", (Int)reg, (Int)off);
- break;
-@@ -2792,10 +2806,10 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->cfa_is_regoff = True;
-- ctx->cfa_expr_ix = 0;
-- ctx->cfa_reg = reg;
-- ctx->cfa_off = off * ctx->data_a_f;
-+ ctxs->cfa_is_regoff = True;
-+ ctxs->cfa_expr_ix = 0;
-+ ctxs->cfa_reg = reg;
-+ ctxs->cfa_off = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_def_cfa_sf\n");
- break;
-@@ -2809,8 +2823,8 @@ static Int run_CF_instruction ( /*MOD*/U
- return 0; /* fail */
- if (reg2 < 0 || reg2 >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_Reg;
-- ctx->reg[ctx->reg_sp][reg].arg = reg2;
-+ ctxs->reg[reg].tag = RR_Reg;
-+ ctxs->reg[reg].arg = reg2;
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_register: r%d in r%d\n",
- (Int)reg, (Int)reg2);
-@@ -2823,8 +2837,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_CFAOff;
-- ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
-+ ctxs->reg[reg].tag = RR_CFAOff;
-+ ctxs->reg[reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_offset_extended\n");
- break;
-@@ -2836,13 +2850,13 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_CFAOff;
-- ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
-+ ctxs->reg[reg].tag = RR_CFAOff;
-+ ctxs->reg[reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_offset_extended_sf: r%d at cfa%s%d\n",
- reg,
-- ctx->reg[ctx->reg_sp][reg].arg < 0 ? "" : "+",
-- (Int)ctx->reg[ctx->reg_sp][reg].arg);
-+ ctxs->reg[reg].arg < 0 ? "" : "+",
-+ (Int)ctxs->reg[reg].arg);
- break;
-
- case DW_CFA_GNU_negative_offset_extended:
-@@ -2852,8 +2866,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_CFAOff;
-- ctx->reg[ctx->reg_sp][reg].arg = (-off) * ctx->data_a_f;
-+ ctxs->reg[reg].tag = RR_CFAOff;
-+ ctxs->reg[reg].arg = (-off) * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_GNU_negative_offset_extended\n");
- break;
-@@ -2865,7 +2879,7 @@ static Int run_CF_instruction ( /*MOD*/U
- return 0; /* fail */
- if (restore_ctx == NULL)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg] = restore_ctx->reg[ctx->reg_sp][reg];
-+ ctxs->reg[reg] = restore_ctx->state[restore_ctx->state_sp].reg[reg];
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_restore_extended\n");
- break;
-@@ -2877,8 +2891,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_CFAValOff;
-- ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
-+ ctxs->reg[reg].tag = RR_CFAValOff;
-+ ctxs->reg[reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_val_offset\n");
- break;
-@@ -2890,8 +2904,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_CFAValOff;
-- ctx->reg[ctx->reg_sp][reg].arg = off * ctx->data_a_f;
-+ ctxs->reg[reg].tag = RR_CFAValOff;
-+ ctxs->reg[reg].arg = off * ctx->data_a_f;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_val_offset_sf\n");
- break;
-@@ -2901,9 +2915,9 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->cfa_is_regoff = True;
-- ctx->cfa_expr_ix = 0;
-- ctx->cfa_reg = reg;
-+ ctxs->cfa_is_regoff = True;
-+ ctxs->cfa_expr_ix = 0;
-+ ctxs->cfa_reg = reg;
- /* ->cfa_off unchanged */
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_def_cfa_reg: r%d\n", (Int)reg );
-@@ -2912,10 +2926,10 @@ static Int run_CF_instruction ( /*MOD*/U
- case DW_CFA_def_cfa_offset:
- off = read_leb128( &instr[i], &nleb, 0);
- i += nleb;
-- ctx->cfa_is_regoff = True;
-- ctx->cfa_expr_ix = 0;
-+ ctxs->cfa_is_regoff = True;
-+ ctxs->cfa_expr_ix = 0;
- /* ->reg is unchanged */
-- ctx->cfa_off = off;
-+ ctxs->cfa_off = off;
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_def_cfa_offset: %d\n", (Int)off);
- break;
-@@ -2923,12 +2937,12 @@ static Int run_CF_instruction ( /*MOD*/U
- case DW_CFA_def_cfa_offset_sf:
- off = read_leb128( &instr[i], &nleb, 1);
- i += nleb;
-- ctx->cfa_is_regoff = True;
-- ctx->cfa_expr_ix = 0;
-+ ctxs->cfa_is_regoff = True;
-+ ctxs->cfa_expr_ix = 0;
- /* ->reg is unchanged */
-- ctx->cfa_off = off * ctx->data_a_f;
-+ ctxs->cfa_off = off * ctx->data_a_f;
- if (di->ddump_frames)
-- VG_(printf)(" DW_CFA_def_cfa_offset_sf: %d\n", ctx->cfa_off);
-+ VG_(printf)(" DW_CFA_def_cfa_offset_sf: %d\n", ctxs->cfa_off);
- break;
-
- case DW_CFA_undefined:
-@@ -2936,8 +2950,8 @@ static Int run_CF_instruction ( /*MOD*/U
- i += nleb;
- if (reg < 0 || reg >= N_CFI_REGS)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_Undef;
-- ctx->reg[ctx->reg_sp][reg].arg = 0;
-+ ctxs->reg[reg].tag = RR_Undef;
-+ ctxs->reg[reg].arg = 0;
- if (di->ddump_frames)
- VG_(printf)(" rci:DW_CFA_undefined\n");
- break;
-@@ -2981,8 +2995,8 @@ static Int run_CF_instruction ( /*MOD*/U
- return 0; /* fail */
- /* Add an extra dereference */
- j = ML_(CfiExpr_Deref)( ctx->exprs, j );
-- ctx->reg[ctx->reg_sp][reg].tag = RR_ValExpr;
-- ctx->reg[ctx->reg_sp][reg].arg = j;
-+ ctxs->reg[reg].tag = RR_ValExpr;
-+ ctxs->reg[reg].arg = j;
- break;
-
- case DW_CFA_val_expression:
-@@ -3010,8 +3024,8 @@ static Int run_CF_instruction ( /*MOD*/U
- }
- if (j == -1)
- return 0; /* fail */
-- ctx->reg[ctx->reg_sp][reg].tag = RR_ValExpr;
-- ctx->reg[ctx->reg_sp][reg].arg = j;
-+ ctxs->reg[reg].tag = RR_ValExpr;
-+ ctxs->reg[reg].arg = j;
- break;
-
- case DW_CFA_def_cfa_expression:
-@@ -3027,10 +3041,10 @@ static Int run_CF_instruction ( /*MOD*/U
- di->ddump_frames);
- if (di->ddump_frames)
- VG_(printf)(")\n");
-- ctx->cfa_is_regoff = False;
-- ctx->cfa_reg = 0;
-- ctx->cfa_off = 0;
-- ctx->cfa_expr_ix = j;
-+ ctxs->cfa_is_regoff = False;
-+ ctxs->cfa_reg = 0;
-+ ctxs->cfa_off = 0;
-+ ctxs->cfa_expr_ix = j;
- break;
-
- case DW_CFA_GNU_window_save:
-@@ -3044,17 +3058,17 @@ static Int run_CF_instruction ( /*MOD*/U
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_remember_state\n");
- /* we just checked this at entry, so: */
-- vg_assert(ctx->reg_sp >= 0 && ctx->reg_sp < N_RR_STACK);
-- ctx->reg_sp++;
-- if (ctx->reg_sp == N_RR_STACK) {
-+ vg_assert(ctx->state_sp >= 0 && ctx->state_sp < N_RR_STACK);
-+ ctx->state_sp++;
-+ if (ctx->state_sp == N_RR_STACK) {
- /* stack overflow. We're hosed. */
- VG_(message)(Vg_DebugMsg, "DWARF2 CFI reader: N_RR_STACK is "
- "too low; increase and recompile.");
- i = 0; /* indicate failure */
- } else {
-- VG_(memcpy)(/*dst*/&ctx->reg[ctx->reg_sp],
-- /*src*/&ctx->reg[ctx->reg_sp - 1],
-- sizeof(ctx->reg[ctx->reg_sp]) );
-+ VG_(memcpy)(/*dst*/&ctx->state[ctx->state_sp],
-+ /*src*/&ctx->state[ctx->state_sp - 1],
-+ sizeof(ctx->state[ctx->state_sp]) );
- }
- break;
-
-@@ -3062,13 +3076,13 @@ static Int run_CF_instruction ( /*MOD*/U
- if (di->ddump_frames)
- VG_(printf)(" DW_CFA_restore_state\n");
- /* we just checked this at entry, so: */
-- vg_assert(ctx->reg_sp >= 0 && ctx->reg_sp < N_RR_STACK);
-- if (ctx->reg_sp == 0) {
-+ vg_assert(ctx->state_sp >= 0 && ctx->state_sp < N_RR_STACK);
-+ if (ctx->state_sp == 0) {
- /* stack overflow. Give up. */
- i = 0; /* indicate failure */
- } else {
- /* simply fall back to previous entry */
-- ctx->reg_sp--;
-+ ctx->state_sp--;
- }
- break;
-
diff --git a/valgrind-3.4.1-dwarf3.patch b/valgrind-3.4.1-dwarf3.patch
deleted file mode 100644
index cc3f360..0000000
--- a/valgrind-3.4.1-dwarf3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- valgrind/coregrind/m_debuginfo/readdwarf3.c.jj 2009-07-13 12:15:20.000000000 +0200
-+++ valgrind/coregrind/m_debuginfo/readdwarf3.c 2009-07-13 13:16:23.000000000 +0200
-@@ -1415,8 +1415,8 @@ void read_filename_table( /*MOD*/D3VarPa
- = get_Initial_Length( &is_dw64, &c,
- "read_filename_table: invalid initial-length field" );
- version = get_UShort( &c );
-- if (version != 2)
-- cc->barf("read_filename_table: Only DWARF version 2 line info "
-+ if (version != 2 && version != 3)
-+ cc->barf("read_filename_table: Only DWARF version 2 and 3 line info "
- "is currently supported.");
- header_length = (ULong)get_Dwarfish_UWord( &c, is_dw64 );
- minimum_instruction_length = get_UChar( &c );
---- valgrind/coregrind/m_debuginfo/readdwarf.c.jj 2009-07-13 12:15:20.000000000 +0200
-+++ valgrind/coregrind/m_debuginfo/readdwarf.c 2009-07-13 13:17:52.000000000 +0200
-@@ -512,9 +512,9 @@ void read_dwarf2_lineblock ( struct _Deb
- VG_(printf)(" DWARF Version: %d\n",
- (Int)info.li_version);
-
-- if (info.li_version != 2) {
-+ if (info.li_version != 2 && info.li_version != 3) {
- ML_(symerr)(di, True,
-- "Only DWARF version 2 line info "
-+ "Only DWARF version 2 and 3 line info "
- "is currently supported.");
- goto out;
- }
-@@ -1162,7 +1162,7 @@ void ML_(read_debuginfo_dwarf3)
-
- /* version should be 2 */
- ver = *((UShort*)( block_img + blklen_len ));
-- if ( ver != 2 ) {
-+ if ( ver != 2 && ver != 3 ) {
- ML_(symerr)( di, True,
- "Ignoring non-dwarf2 block in .debug_info" );
- continue;
-@@ -3575,8 +3575,8 @@ void ML_(read_callframe_info_dwarf3)
- VG_(printf)("cie.version = %d\n", (Int)cie_version);
- if (di->ddump_frames)
- VG_(printf)(" Version: %d\n", (Int)cie_version);
-- if (cie_version != 1) {
-- how = "unexpected CIE version (not 1)";
-+ if (cie_version != 1 && cie_version != 3) {
-+ how = "unexpected CIE version (not 1 nor 3)";
- goto bad;
- }
-
diff --git a/valgrind-3.4.1-futex.patch b/valgrind-3.4.1-futex.patch
deleted file mode 100644
index 4545750..0000000
--- a/valgrind-3.4.1-futex.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- valgrind/include/vki/vki-linux.h.jj 2009-07-28 11:14:49.000000000 +0200
-+++ valgrind/include/vki/vki-linux.h 2009-07-28 11:37:12.000000000 +0200
-@@ -1150,7 +1150,7 @@ struct vki_seminfo {
- #define VKI_MREMAP_FIXED 2
-
- //----------------------------------------------------------------------
--// From linux-2.6.10-rc3-mm1/include/linux/futex.h
-+// From linux-2.6.31-rc4/include/linux/futex.h
- //----------------------------------------------------------------------
-
- #define VKI_FUTEX_WAIT (0)
-@@ -1158,7 +1158,16 @@ struct vki_seminfo {
- #define VKI_FUTEX_FD (2)
- #define VKI_FUTEX_REQUEUE (3)
- #define VKI_FUTEX_CMP_REQUEUE (4)
-+#define VKI_FUTEX_WAKE_OP (5)
-+#define VKI_FUTEX_LOCK_PI (6)
-+#define VKI_FUTEX_UNLOCK_PI (7)
-+#define VKI_FUTEX_TRYLOCK_PI (8)
-+#define VKI_FUTEX_WAIT_BITSET (9)
-+#define VKI_FUTEX_WAKE_BITSET (10)
-+#define VKI_FUTEX_WAIT_REQUEUE_PI (11)
-+#define VKI_FUTEX_CMP_REQUEUE_PI (12)
- #define VKI_FUTEX_PRIVATE_FLAG (128)
-+#define VKI_FUTEX_CLOCK_REALTIME (256)
-
- struct vki_robust_list {
- struct vki_robust_list __user *next;
---- valgrind/coregrind/m_syswrap/syswrap-linux.c.jj 2009-07-28 11:14:50.000000000 +0200
-+++ valgrind/coregrind/m_syswrap/syswrap-linux.c 2009-07-28 12:00:09.000000000 +0200
-@@ -865,31 +865,43 @@ PRE(sys_futex)
- ARG6 - int val3 CMP_REQUEUE
- */
- PRINT("sys_futex ( %#lx, %ld, %ld, %#lx, %#lx )", ARG1,ARG2,ARG3,ARG4,ARG5);
-- switch(ARG2) {
-+ switch(ARG2 & ~(VKI_FUTEX_PRIVATE_FLAG|VKI_FUTEX_CLOCK_REALTIME)) {
- case VKI_FUTEX_CMP_REQUEUE:
-- case VKI_FUTEX_CMP_REQUEUE | VKI_FUTEX_PRIVATE_FLAG:
-+ case VKI_FUTEX_WAKE_OP:
-+ case VKI_FUTEX_CMP_REQUEUE_PI:
- PRE_REG_READ6(long, "futex",
- vki_u32 *, futex, int, op, int, val,
- struct timespec *, utime, vki_u32 *, uaddr2, int, val3);
- break;
- case VKI_FUTEX_REQUEUE:
-- case VKI_FUTEX_REQUEUE | VKI_FUTEX_PRIVATE_FLAG:
-+ case VKI_FUTEX_WAIT_REQUEUE_PI:
- PRE_REG_READ5(long, "futex",
- vki_u32 *, futex, int, op, int, val,
- struct timespec *, utime, vki_u32 *, uaddr2);
- break;
-+ case VKI_FUTEX_WAIT_BITSET:
-+ PRE_REG_READ6(long, "futex",
-+ vki_u32 *, futex, int, op, int, val,
-+ struct timespec *, utime, int, dummy, int, val3);
-+ break;
-+ case VKI_FUTEX_WAKE_BITSET:
-+ PRE_REG_READ6(long, "futex",
-+ vki_u32 *, futex, int, op, int, val,
-+ int, dummy, int, dummy2, int, val3);
-+ break;
- case VKI_FUTEX_WAIT:
-- case VKI_FUTEX_WAIT | VKI_FUTEX_PRIVATE_FLAG:
-+ case VKI_FUTEX_LOCK_PI:
- PRE_REG_READ4(long, "futex",
- vki_u32 *, futex, int, op, int, val,
- struct timespec *, utime);
- break;
- case VKI_FUTEX_WAKE:
-- case VKI_FUTEX_WAKE | VKI_FUTEX_PRIVATE_FLAG:
- case VKI_FUTEX_FD:
-+ case VKI_FUTEX_TRYLOCK_PI:
- PRE_REG_READ3(long, "futex",
- vki_u32 *, futex, int, op, int, val);
- break;
-+ case VKI_FUTEX_UNLOCK_PI:
- default:
- PRE_REG_READ2(long, "futex", vki_u32 *, futex, int, op);
- break;
-@@ -899,23 +911,27 @@ PRE(sys_futex)
-
- *flags |= SfMayBlock;
-
-- switch(ARG2) {
-+ switch(ARG2 & ~(VKI_FUTEX_PRIVATE_FLAG|VKI_FUTEX_CLOCK_REALTIME)) {
- case VKI_FUTEX_WAIT:
-- case VKI_FUTEX_WAIT | VKI_FUTEX_PRIVATE_FLAG:
-+ case VKI_FUTEX_LOCK_PI:
-+ case VKI_FUTEX_WAIT_BITSET:
-+ case VKI_FUTEX_WAIT_REQUEUE_PI:
- if (ARG4 != 0)
- PRE_MEM_READ( "futex(timeout)", ARG4, sizeof(struct vki_timespec) );
- break;
-
- case VKI_FUTEX_REQUEUE:
-- case VKI_FUTEX_REQUEUE | VKI_FUTEX_PRIVATE_FLAG:
- case VKI_FUTEX_CMP_REQUEUE:
-- case VKI_FUTEX_CMP_REQUEUE | VKI_FUTEX_PRIVATE_FLAG:
-+ case VKI_FUTEX_CMP_REQUEUE_PI:
-+ case VKI_FUTEX_WAKE_OP:
- PRE_MEM_READ( "futex(futex2)", ARG5, sizeof(Int) );
- break;
-
- case VKI_FUTEX_WAKE:
-- case VKI_FUTEX_WAKE | VKI_FUTEX_PRIVATE_FLAG:
- case VKI_FUTEX_FD:
-+ case VKI_FUTEX_WAKE_BITSET:
-+ case VKI_FUTEX_TRYLOCK_PI:
-+ case VKI_FUTEX_UNLOCK_PI:
- /* no additional pointers */
- break;
-
diff --git a/valgrind-3.4.1-glibc-2.10.1.patch b/valgrind-3.4.1-glibc-2.10.1.patch
deleted file mode 100644
index 393dc7c..0000000
--- a/valgrind-3.4.1-glibc-2.10.1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- valgrind-3.4.1/glibc-2.X.supp.in.jj 2009-03-01 17:04:51.000000000 -0500
-+++ valgrind-3.4.1/glibc-2.X.supp.in 2009-05-11 11:17:35.605396000 -0400
-@@ -168,9 +168,9 @@
- Memcheck:Param
- socketcall.sendto(msg)
- fun:__sendto_nocancel
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
- }
- {
- glibc24-64bit-padding-1c
-@@ -180,7 +180,7 @@
- fun:__nscd_get_map_ref
- fun:nscd_get*_r
- fun:*nscd*
-- obj:/*libc-@GLIBC_VERSION@.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
- }
-
-
-@@ -199,18 +199,18 @@
- Memcheck:Param
- socketcall.sendto(msg)
- fun:send
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
- }
- {
- X11-64bit-padding-4b
- Memcheck:Param
- socketcall.send(msg)
- fun:send
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-- obj:/*libc-@GLIBC_VERSION@.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
-+ obj:/*libc-@GLIBC_VERSION@*.so
- }
-
- ##----------------------------------------------------------------------##
diff --git a/valgrind-3.4.1-openat.patch b/valgrind-3.4.1-openat.patch
deleted file mode 100644
index 0a2d6a6..0000000
--- a/valgrind-3.4.1-openat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Testcase:
-#define _GNU_SOURCE
-#include <fcntl.h>
-#include <unistd.h>
-
-int
-main (void)
-{
- int dfd = open ("/tmp", O_RDONLY);
- int fd1 = openat (dfd, "abc", O_RDONLY);
- int fd2 = openat (0x12345678, "/tmp/abc", O_RDONLY);
- int fd3 = openat (AT_FDCWD, "abc", O_RDONLY);
- /* This is the only one that should warn. */
- int fd4 = openat (0x12345678, "abc", O_RDONLY);
- return 0;
-}
-
---- valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c.jj 2007-12-11 00:18:43.000000000 +0100
-+++ valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c 2008-03-03 11:35:15.000000000 +0100
-@@ -2455,10 +2455,15 @@ PRE(sys_openat)
- int, dfd, const char *, filename, int, flags);
- }
-
-- if (ARG1 != VKI_AT_FDCWD && !ML_(fd_allowed)(ARG1, "openat", tid, False))
-+ PRE_MEM_RASCIIZ( "openat(filename)", ARG2 );
-+
-+ /* For absolute filenames, dfd is ignored. If dfd is AT_FDCWD,
-+ filename is relative to cwd. */
-+ if (ML_(safe_to_deref)( (void*)ARG2, 1 )
-+ && *(Char *)ARG2 != '/'
-+ && ARG1 != VKI_AT_FDCWD
-+ && !ML_(fd_allowed)(ARG1, "openat", tid, False))
- SET_STATUS_Failure( VKI_EBADF );
-- else
-- PRE_MEM_RASCIIZ( "openat(filename)", ARG2 );
-
- /* Handle the case where the open is of /proc/self/cmdline or
- /proc/<pid>/cmdline, and just give it a copy of the fd for the
diff --git a/valgrind-3.4.1-x86_64-ldso-strlen.patch b/valgrind-3.4.1-x86_64-ldso-strlen.patch
deleted file mode 100644
index b1c1745..0000000
--- a/valgrind-3.4.1-x86_64-ldso-strlen.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- valgrind/coregrind/pub_core_trampoline.h.jj 2009-04-22 12:10:54.000000000 +0200
-+++ valgrind/coregrind/pub_core_trampoline.h 2009-04-22 14:50:39.000000000 +0200
-@@ -66,6 +66,7 @@ extern Char* VG_(x86_linux_REDIR_FOR_ind
- extern void VG_(amd64_linux_SUBST_FOR_rt_sigreturn);
- extern void VG_(amd64_linux_REDIR_FOR_vgettimeofday);
- extern void VG_(amd64_linux_REDIR_FOR_vtime);
-+extern UInt VG_(amd64_linux_REDIR_FOR_strlen)( void* );
- #endif
-
- #if defined(VGP_ppc32_linux)
---- valgrind/coregrind/m_redir.c.jj 2009-04-22 12:10:54.000000000 +0200
-+++ valgrind/coregrind/m_redir.c 2009-04-22 15:32:19.000000000 +0200
-@@ -879,6 +879,20 @@ void VG_(redir_initialise) ( void )
- (Addr)&VG_(amd64_linux_REDIR_FOR_vtime)
- );
-
-+ /* If we're using memcheck, use these intercepts right from
-+ the start, otherwise ld.so makes a lot of noise. */
-+ if (0==VG_(strcmp)("Memcheck", VG_(details).name)) {
-+
-+ static const HChar croakage[]
-+ = "Possible fix: install glibc's debuginfo package on this machine.";
-+
-+ /* this is mandatory - can't sanely continue without it */
-+ add_hardwired_spec(
-+ "ld-linux-x86-64.so.2", "strlen",
-+ (Addr)&VG_(amd64_linux_REDIR_FOR_strlen),
-+ croakage
-+ );
-+ }
- # elif defined(VGP_ppc32_linux)
- {
- static const HChar croakage[]
---- valgrind/coregrind/m_trampoline.S.jj 2009-04-22 12:10:54.000000000 +0200
-+++ valgrind/coregrind/m_trampoline.S 2009-04-22 15:18:37.000000000 +0200
-@@ -174,7 +174,29 @@ VG_(amd64_linux_REDIR_FOR_vtime):
- .LfnE3:
- .size VG_(amd64_linux_REDIR_FOR_vtime), .-.LfnB3
-
--/* A CIE for the above two functions, followed by their FDEs */
-+/* There's no particular reason that this needs to be handwritten
-+ assembly, but since that's what this file contains, here's a
-+ simple strlen implementation (written in C and compiled by gcc.)
-+*/
-+.global VG_(amd64_linux_REDIR_FOR_strlen)
-+.type VG_(amd64_linux_REDIR_FOR_strlen), @function
-+VG_(amd64_linux_REDIR_FOR_strlen):
-+.LfnB4:
-+ xorl %eax, %eax
-+ cmpb $0, (%rdi)
-+ movq %rdi, %rdx
-+ je .L41
-+.L40: addq $1, %rdx
-+ cmpb $0, (%rdx)
-+ jne .L40
-+ movq %rdx, %rax
-+ subq %rdi, %rax
-+.L41: ret
-+.LfnE4:
-+.size VG_(amd64_linux_REDIR_FOR_strlen), .-VG_(amd64_linux_REDIR_FOR_strlen)
-+
-+
-+/* A CIE for the above three functions, followed by their FDEs */
- .section .eh_frame,"a",@progbits
- .Lframe1:
- .long .LEcie1-.LScie1
-@@ -212,6 +234,15 @@ VG_(amd64_linux_REDIR_FOR_vtime):
- .uleb128 0x0
- .align 8
- .LEfde3:
-+.LSfde4:
-+ .long .LEfde4-.LASfde4
-+.LASfde4:
-+ .long .LASfde4-.Lframe1
-+ .long .LfnB4
-+ .long .LfnE4-.LfnB4
-+ .uleb128 0x0
-+ .align 8
-+.LEfde4:
- .previous
-
- .global VG_(trampoline_stuff_end)
diff --git a/valgrind-3.5.0-cachegrind-improvements.patch b/valgrind-3.5.0-cachegrind-improvements.patch
new file mode 100644
index 0000000..5fbb3cc
--- /dev/null
+++ b/valgrind-3.5.0-cachegrind-improvements.patch
@@ -0,0 +1,64 @@
+--- valgrind-3.4.0/cachegrind/cg_sim.c.jj 2007-01-08 02:43:10.000000000 -0500
++++ valgrind-3.4.0/cachegrind/cg_sim.c 2007-02-13 07:15:46.000000000 -0500
+@@ -42,27 +42,30 @@ typedef struct {
+ Int size; /* bytes */
+ Int assoc;
+ Int line_size; /* bytes */
+- Int sets;
+ Int sets_min_1;
+ Int line_size_bits;
+ Int tag_shift;
+- Char desc_line[128];
+ UWord* tags;
+-} cache_t2;
++ Char desc_line[128];
++} cache_t2
++#ifdef __GNUC__
++__attribute__ ((aligned (8 * sizeof (Int))))
++#endif
++;
+
+ /* By this point, the size/assoc/line_size has been checked. */
+ static void cachesim_initcache(cache_t config, cache_t2* c)
+ {
+- Int i;
++ Int sets;
+
+ c->size = config.size;
+ c->assoc = config.assoc;
+ c->line_size = config.line_size;
+
+- c->sets = (c->size / c->line_size) / c->assoc;
+- c->sets_min_1 = c->sets - 1;
++ sets = (c->size / c->line_size) / c->assoc;
++ c->sets_min_1 = sets - 1;
+ c->line_size_bits = VG_(log2)(c->line_size);
+- c->tag_shift = c->line_size_bits + VG_(log2)(c->sets);
++ c->tag_shift = c->line_size_bits + VG_(log2)(sets);
+
+ if (c->assoc == 1) {
+ VG_(sprintf)(c->desc_line, "%d B, %d B, direct-mapped",
+@@ -72,11 +75,8 @@ static void cachesim_initcache(cache_t c
+ c->size, c->line_size, c->assoc);
+ }
+
+- c->tags = VG_(malloc)("cg.sim.ci.1",
+- sizeof(UWord) * c->sets * c->assoc);
+-
+- for (i = 0; i < c->sets * c->assoc; i++)
+- c->tags[i] = 0;
++ c->tags = VG_(calloc)("cg.sim.ci.1",
++ sizeof(UWord), sets * c->assoc);
+ }
+
+ /* This is done as a macro rather than by passing in the cache_t2 as an
+@@ -138,8 +138,7 @@ void cachesim_##L##_doref(Addr a, UChar
+ return; \
+ \
+ /* Second case: word straddles two lines. */ \
+- /* Nb: this is a fast way of doing ((set1+1) % L.sets) */ \
+- } else if (((set1 + 1) & (L.sets-1)) == set2) { \
++ } else if (((set1 + 1) & (L.sets_min_1)) == set2) { \
+ set = &(L.tags[set1 * L.assoc]); \
+ if (tag == set[0]) { \
+ goto block2; \
diff --git a/valgrind-3.5.0-glibc-2.10.1.patch b/valgrind-3.5.0-glibc-2.10.1.patch
new file mode 100644
index 0000000..7837c4f
--- /dev/null
+++ b/valgrind-3.5.0-glibc-2.10.1.patch
@@ -0,0 +1,49 @@
+--- valgrind-3.5.0/glibc-2.X.supp.in.jj 2009-08-19 09:37:48.000000000 -0400
++++ valgrind-3.5.0/glibc-2.X.supp.in 2009-08-21 09:03:55.168206000 -0400
+@@ -168,9 +168,9 @@
+ Memcheck:Param
+ socketcall.sendto(msg)
+ fun:__sendto_nocancel
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+ glibc24-64bit-padding-1c
+@@ -180,7 +180,7 @@
+ fun:__nscd_get_map_ref
+ fun:nscd_get*_r
+ fun:*nscd*
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+
+
+@@ -199,18 +199,18 @@
+ Memcheck:Param
+ socketcall.sendto(msg)
+ fun:send
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+ X11-64bit-padding-4b
+ Memcheck:Param
+ socketcall.send(msg)
+ fun:send
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
+- obj:/*libc-@GLIBC_VERSION@.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
++ obj:/*libc-@GLIBC_VERSION@*.so
+ }
+
+ ##----------------------------------------------------------------------##
diff --git a/valgrind-3.5.0-openat.patch b/valgrind-3.5.0-openat.patch
new file mode 100644
index 0000000..0a2d6a6
--- /dev/null
+++ b/valgrind-3.5.0-openat.patch
@@ -0,0 +1,38 @@
+Testcase:
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include <unistd.h>
+
+int
+main (void)
+{
+ int dfd = open ("/tmp", O_RDONLY);
+ int fd1 = openat (dfd, "abc", O_RDONLY);
+ int fd2 = openat (0x12345678, "/tmp/abc", O_RDONLY);
+ int fd3 = openat (AT_FDCWD, "abc", O_RDONLY);
+ /* This is the only one that should warn. */
+ int fd4 = openat (0x12345678, "abc", O_RDONLY);
+ return 0;
+}
+
+--- valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c.jj 2007-12-11 00:18:43.000000000 +0100
++++ valgrind-3.3.0/coregrind/m_syswrap/syswrap-linux.c 2008-03-03 11:35:15.000000000 +0100
+@@ -2455,10 +2455,15 @@ PRE(sys_openat)
+ int, dfd, const char *, filename, int, flags);
+ }
+
+- if (ARG1 != VKI_AT_FDCWD && !ML_(fd_allowed)(ARG1, "openat", tid, False))
++ PRE_MEM_RASCIIZ( "openat(filename)", ARG2 );
++
++ /* For absolute filenames, dfd is ignored. If dfd is AT_FDCWD,
++ filename is relative to cwd. */
++ if (ML_(safe_to_deref)( (void*)ARG2, 1 )
++ && *(Char *)ARG2 != '/'
++ && ARG1 != VKI_AT_FDCWD
++ && !ML_(fd_allowed)(ARG1, "openat", tid, False))
+ SET_STATUS_Failure( VKI_EBADF );
+- else
+- PRE_MEM_RASCIIZ( "openat(filename)", ARG2 );
+
+ /* Handle the case where the open is of /proc/self/cmdline or
+ /proc/<pid>/cmdline, and just give it a copy of the fd for the
diff --git a/valgrind.spec b/valgrind.spec
index 732d9b6..7ea0243 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,17 +1,12 @@
Summary: Tool for finding memory management bugs in programs
Name: valgrind
-Version: 3.4.1
-Release: 7
+Version: 3.5.0
+Release: 1
Epoch: 1
Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
-Patch1: valgrind-3.4.1-cachegrind-improvements.patch
-Patch2: valgrind-3.4.1-openat.patch
-Patch3: valgrind-3.4.1-x86_64-ldso-strlen.patch
-Patch4: valgrind-3.4.1-glibc-2.10.1.patch
-Patch5: valgrind-3.4.1-dwarf3.patch
-Patch6: valgrind-3.4.1-dwarf-cfa-remember-state1.patch
-Patch7: valgrind-3.4.1-dwarf-cfa-remember-state2.patch
-Patch8: valgrind-3.4.1-futex.patch
+Patch1: valgrind-3.5.0-cachegrind-improvements.patch
+Patch2: valgrind-3.5.0-openat.patch
+Patch3: valgrind-3.5.0-glibc-2.10.1.patch
License: GPLv2
URL: http://www.valgrind.org/
Group: Development/Debuggers
@@ -68,11 +63,6 @@ or valgrind plugins.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%build
%ifarch x86_64 ppc64
@@ -112,6 +102,9 @@ for i in `find . -type f \( -name *-amd64-linux -o -name *-x86-linux -o -name *-
esac
done
+# XXX pth_cancel2 hangs on x86_64
+echo 'int main (void) { return 0; }' > none/tests/pth_cancel2.c
+
# test
make check || :
echo ===============TESTING===================
@@ -127,12 +120,17 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/valgrind/* docs.installed/
rm -f docs.installed/*.ps
%if "%{valsecarch}" != ""
+pushd $RPM_BUILD_ROOT%{_libdir}/valgrind/
+rm -f *-%{valsecarch}-* || :
+for i in *-%{valarch}-*; do
+ j=`echo $i | sed 's/-%{valarch}-/-%{valsecarch}-/'`
%ifarch ppc
-ln -sf ../../lib64/valgrind/%{valsecarch}-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux
+ ln -sf ../../lib64/valgrind/$j $j
%else
-rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux || :
-ln -sf ../../lib/valgrind/%{valsecarch}-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/%{valsecarch}-linux
+ ln -sf ../../lib/valgrind/$j $j
%endif
+done
+popd
%endif
rm -f $RPM_BUILD_ROOT%{_libdir}/valgrind/*.supp.in
@@ -142,27 +140,24 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc ACKNOWLEDGEMENTS COPYING NEWS README_*
+%doc COPYING NEWS README_*
%doc docs.installed/html docs.installed/*.pdf
%{_bindir}/*
%dir %{_libdir}/valgrind
-%dir %{_libdir}/valgrind/%{valarch}-linux
-%if "%{valsecarch}" != ""
-%{_libdir}/valgrind/%{valsecarch}-linux
-%endif
-%{_libdir}/valgrind/%{valarch}-linux/*[^a]
-%{_libdir}/valgrind/*.supp
-%{_mandir}/man1/valgrind*
+%{_libdir}/valgrind/*[^a]
+%{_mandir}/man1/*
%files devel
%defattr(-,root,root)
%{_includedir}/valgrind
%dir %{_libdir}/valgrind
-%dir %{_libdir}/valgrind/%{valarch}-linux
-%{_libdir}/valgrind/%{valarch}-linux/*.a
+%{_libdir}/valgrind/*.a
%{_libdir}/pkgconfig/*
%changelog
+* Fri Aug 21 2009 Jakub Jelinek <jakub@redhat.com> 3.5.0-1
+- update to 3.5.0
+
* Tue Jul 28 2009 Jakub Jelinek <jakub@redhat.com> 3.4.1-7
- handle futex ops newly added during last 4 years (#512121)