From 559e670353eb075f2a5947e926c799b11d26b6eb Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Jul 08 2013 11:13:00 +0000 Subject: Cleanup valgrind-3.8.1-sigill_diag.patch .orig file changes (#949687). --- diff --git a/valgrind-3.8.1-sigill_diag.patch b/valgrind-3.8.1-sigill_diag.patch index d6755e5..3f1006a 100644 --- a/valgrind-3.8.1-sigill_diag.patch +++ b/valgrind-3.8.1-sigill_diag.patch @@ -40,18 +40,6 @@ diff -ur valgrind-3.8.1.orig/coregrind/m_main.c valgrind-3.8.1/coregrind/m_main. if (VG_(clo_trace_notbelow) == -1) { if (VG_(clo_trace_notabove) == -1) { /* [] */ -diff -ur valgrind-3.8.1.orig/coregrind/m_main.c.orig valgrind-3.8.1/coregrind/m_main.c.orig ---- valgrind-3.8.1.orig/coregrind/m_main.c.orig 2012-11-04 21:57:03.719415834 +0100 -+++ valgrind-3.8.1/coregrind/m_main.c.orig 2012-11-04 21:56:19.950788253 +0100 -@@ -2537,7 +2537,7 @@ - - /* terminate gdbserver if ever it was started. We terminate it here so that it get - the output above if output was redirected to gdb */ -- VG_(gdbserver) (0); -+ VG_(gdbserver_exit) (tid, tids_schedretcode); - - /* Ok, finally exit in the os-specific way, according to the scheduler's - return code. In short, if the (last) thread exited by calling diff -ur valgrind-3.8.1.orig/coregrind/m_options.c valgrind-3.8.1/coregrind/m_options.c --- valgrind-3.8.1.orig/coregrind/m_options.c 2012-11-04 21:57:03.709415680 +0100 +++ valgrind-3.8.1/coregrind/m_options.c 2012-11-04 21:57:37.251896807 +0100 @@ -89,7 +77,6 @@ diff -ur valgrind-3.8.1.orig/coregrind/m_scheduler/scheduler.c valgrind-3.8.1/co #if defined(VGA_s390x) /* Now that the complaint is out we need to adjust the guest_IA. The -Only in valgrind-3.8.1/coregrind/m_scheduler: scheduler.c.orig diff -ur valgrind-3.8.1.orig/coregrind/m_translate.c valgrind-3.8.1/coregrind/m_translate.c --- valgrind-3.8.1.orig/coregrind/m_translate.c 2012-11-04 21:57:03.721415864 +0100 +++ valgrind-3.8.1/coregrind/m_translate.c 2012-11-04 21:57:37.261896960 +0100 @@ -101,7 +88,6 @@ diff -ur valgrind-3.8.1.orig/coregrind/m_translate.c valgrind-3.8.1/coregrind/m_ vta.addProfInc = VG_(clo_profile_flags) > 0 && kind != T_NoRedir; -Only in valgrind-3.8.1/coregrind: m_translate.c.orig diff -ur valgrind-3.8.1.orig/coregrind/pub_core_options.h valgrind-3.8.1/coregrind/pub_core_options.h --- valgrind-3.8.1.orig/coregrind/pub_core_options.h 2012-11-04 21:57:03.704415605 +0100 +++ valgrind-3.8.1/coregrind/pub_core_options.h 2012-11-04 21:57:37.300897526 +0100 @@ -147,7 +133,6 @@ diff -ur valgrind-3.8.1.orig/docs/xml/manual-core.xml valgrind-3.8.1/docs/xml/ma -Only in valgrind-3.8.1/docs/xml: manual-core.xml.orig diff -ur valgrind-3.8.1.orig/none/tests/cmdline1.stdout.exp valgrind-3.8.1/none/tests/cmdline1.stdout.exp --- valgrind-3.8.1.orig/none/tests/cmdline1.stdout.exp 2012-11-04 21:57:03.844417741 +0100 +++ valgrind-3.8.1/none/tests/cmdline1.stdout.exp 2012-11-04 21:57:37.385898730 +0100 @@ -183,7 +168,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_amd64_defs.h valgrind-3.8.1/VEX/priv /* Used by the optimiser to specialise calls to helpers. */ extern -Only in valgrind-3.8.1/VEX/priv: guest_amd64_defs.h.orig diff -ur valgrind-3.8.1.orig/VEX/priv/guest_amd64_toIR.c valgrind-3.8.1/VEX/priv/guest_amd64_toIR.c --- valgrind-3.8.1.orig/VEX/priv/guest_amd64_toIR.c 2012-11-04 21:57:03.784416825 +0100 +++ valgrind-3.8.1/VEX/priv/guest_amd64_toIR.c 2012-11-04 21:57:36.465885366 +0100 @@ -280,39 +264,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_amd64_toIR.c valgrind-3.8.1/VEX/priv for (i = x1; i < x2; i++) { vex_printf("\t\t"); ppIRStmt(irsb_IN->stmts[i]); -diff -ur valgrind-3.8.1.orig/VEX/priv/guest_amd64_toIR.c.orig valgrind-3.8.1/VEX/priv/guest_amd64_toIR.c.orig ---- valgrind-3.8.1.orig/VEX/priv/guest_amd64_toIR.c.orig 2012-11-04 21:57:03.788416887 +0100 -+++ valgrind-3.8.1/VEX/priv/guest_amd64_toIR.c.orig 2012-11-04 21:56:20.017789271 +0100 -@@ -20986,6 +20986,14 @@ - delta = dis_movx_E_G ( vbi, pfx, delta, 2, sz, True ); - return delta; - -+ case 0xC0: { /* XADD Gb,Eb */ -+ Bool decode_OK = False; -+ delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta ); -+ if (!decode_OK) -+ goto decode_failure; -+ return delta; -+ } -+ - case 0xC1: { /* XADD Gv,Ev */ - Bool decode_OK = False; - delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, sz, delta ); -@@ -30932,14 +30940,6 @@ - - /* =-=-=-=-=-=-=-=-=- XADD -=-=-=-=-=-=-=-=-=-= */ - -- case 0xC0: { /* XADD Gb,Eb */ -- Bool decode_OK = False; -- delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta ); -- if (!decode_OK) -- goto decode_failure; -- break; -- } -- - /* =-=-=-=-=-=-=-=-=- SGDT and SIDT =-=-=-=-=-=-=-=-=-=-= */ - - /* =-=-=-=-=-=-=-=-=- unimp2 =-=-=-=-=-=-=-=-=-=-= */ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_arm_defs.h valgrind-3.8.1/VEX/priv/guest_arm_defs.h --- valgrind-3.8.1.orig/VEX/priv/guest_arm_defs.h 2012-11-04 21:57:03.790416917 +0100 +++ valgrind-3.8.1/VEX/priv/guest_arm_defs.h 2012-11-04 21:57:36.588887153 +0100 @@ -326,7 +277,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_arm_defs.h valgrind-3.8.1/VEX/priv/g /* Used by the optimiser to specialise calls to helpers. */ extern -Only in valgrind-3.8.1/VEX/priv: guest_arm_defs.h.orig diff -ur valgrind-3.8.1.orig/VEX/priv/guest_arm_toIR.c valgrind-3.8.1/VEX/priv/guest_arm_toIR.c --- valgrind-3.8.1.orig/VEX/priv/guest_arm_toIR.c 2012-11-04 21:57:03.787416871 +0100 +++ valgrind-3.8.1/VEX/priv/guest_arm_toIR.c 2012-11-04 21:57:36.812890419 +0100 @@ -414,7 +364,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_arm_toIR.c valgrind-3.8.1/VEX/priv/g } return dres; -Only in valgrind-3.8.1/VEX/priv: guest_arm_toIR.c.orig diff -ur valgrind-3.8.1.orig/VEX/priv/guest_generic_bb_to_IR.c valgrind-3.8.1/VEX/priv/guest_generic_bb_to_IR.c --- valgrind-3.8.1.orig/VEX/priv/guest_generic_bb_to_IR.c 2012-11-04 21:57:03.790416917 +0100 +++ valgrind-3.8.1/VEX/priv/guest_generic_bb_to_IR.c 2012-11-04 21:57:36.918891974 +0100 @@ -526,7 +475,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_mips_toIR.c valgrind-3.8.1/VEX/priv/ return dres; } -Only in valgrind-3.8.1/VEX/priv: guest_mips_toIR.c.orig diff -ur valgrind-3.8.1.orig/VEX/priv/guest_ppc_defs.h valgrind-3.8.1/VEX/priv/guest_ppc_defs.h --- valgrind-3.8.1.orig/VEX/priv/guest_ppc_defs.h 2012-11-04 21:57:03.782416795 +0100 +++ valgrind-3.8.1/VEX/priv/guest_ppc_defs.h 2012-11-04 21:57:37.030893654 +0100 @@ -540,7 +488,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_ppc_defs.h valgrind-3.8.1/VEX/priv/g /* Used by the optimiser to specialise calls to helpers. */ extern -Only in valgrind-3.8.1/VEX/priv: guest_ppc_defs.h.orig diff -ur valgrind-3.8.1.orig/VEX/priv/guest_ppc_toIR.c valgrind-3.8.1/VEX/priv/guest_ppc_toIR.c --- valgrind-3.8.1.orig/VEX/priv/guest_ppc_toIR.c 2012-11-04 21:57:03.784416825 +0100 +++ valgrind-3.8.1/VEX/priv/guest_ppc_toIR.c 2012-11-04 21:57:37.034893677 +0100 @@ -590,84 +537,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_ppc_toIR.c valgrind-3.8.1/VEX/priv/g return dres; } -diff -ur valgrind-3.8.1.orig/VEX/priv/guest_ppc_toIR.c.orig valgrind-3.8.1/VEX/priv/guest_ppc_toIR.c.orig ---- valgrind-3.8.1.orig/VEX/priv/guest_ppc_toIR.c.orig 2012-11-04 21:57:03.786416855 +0100 -+++ valgrind-3.8.1/VEX/priv/guest_ppc_toIR.c.orig 2012-11-04 21:56:20.081790240 +0100 -@@ -16629,6 +16629,7 @@ - - /* 64bit Integer Rotate Instructions */ - case 0x1E: // rldcl, rldcr, rldic, rldicl, rldicr, rldimi -+ if (!mode64) goto decode_failure; - if (dis_int_rot( theInstr )) goto decode_success; - goto decode_failure; - -@@ -16663,7 +16664,12 @@ - goto decode_failure; - - /* Trap Instructions */ -- case 0x02: case 0x03: // tdi, twi -+ case 0x02: // tdi -+ if (!mode64) goto decode_failure; -+ if (dis_trapi(theInstr, &dres)) goto decode_success; -+ goto decode_failure; -+ -+ case 0x03: // twi - if (dis_trapi(theInstr, &dres)) goto decode_success; - goto decode_failure; - -@@ -17264,7 +17270,12 @@ - goto decode_failure; - - /* 64bit Integer Parity Instructions */ -- case 0xba: case 0x9a: // prtyd, prtyw -+ case 0xba: // prtyd -+ if (!mode64) goto decode_failure; -+ if (dis_int_parity( theInstr )) goto decode_success; -+ goto decode_failure; -+ -+ case 0x9a: // prtyw - if (dis_int_parity( theInstr )) goto decode_success; - goto decode_failure; - -@@ -17309,9 +17320,13 @@ - goto decode_failure; - - /* Integer Load and Store with Byte Reverse Instructions */ -- case 0x316: case 0x216: case 0x396: // lhbrx, lwbrx, sthbrx -- case 0x296: case 0x214: // stwbrx, ldbrx -- case 0x294: // stdbrx -+ case 0x214: case 0x294: // ldbrx, stdbrx -+ if (!mode64) goto decode_failure; -+ if (dis_int_ldst_rev( theInstr )) goto decode_success; -+ goto decode_failure; -+ -+ case 0x216: case 0x316: case 0x296: // lwbrx, lhbrx, stwbrx -+ case 0x396: // sthbrx - if (dis_int_ldst_rev( theInstr )) goto decode_success; - goto decode_failure; - -@@ -17361,7 +17376,12 @@ - //zz goto decode_failure; - - /* Trap Instructions */ -- case 0x004: case 0x044: // tw, td -+ case 0x004: // tw -+ if (dis_trap(theInstr, &dres)) goto decode_success; -+ goto decode_failure; -+ -+ case 0x044: // td -+ if (!mode64) goto decode_failure; - if (dis_trap(theInstr, &dres)) goto decode_success; - goto decode_failure; - -@@ -17455,6 +17475,7 @@ - goto decode_failure; - - case 0x0FC: // bpermd -+ if (!mode64) goto decode_failure; - if (dis_int_logic( theInstr )) goto decode_success; - goto decode_failure; - diff -ur valgrind-3.8.1.orig/VEX/priv/guest_s390_defs.h valgrind-3.8.1/VEX/priv/guest_s390_defs.h --- valgrind-3.8.1.orig/VEX/priv/guest_s390_defs.h 2012-11-04 21:57:03.782416795 +0100 +++ valgrind-3.8.1/VEX/priv/guest_s390_defs.h 2012-11-04 21:57:37.098894575 +0100 @@ -681,7 +550,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_s390_defs.h valgrind-3.8.1/VEX/priv/ /* Used by the optimiser to specialise calls to helpers. */ IRExpr* guest_s390x_spechelper ( HChar *function_name, -Only in valgrind-3.8.1/VEX/priv: guest_s390_defs.h.orig diff -ur valgrind-3.8.1.orig/VEX/priv/guest_s390_toIR.c valgrind-3.8.1/VEX/priv/guest_s390_toIR.c --- valgrind-3.8.1.orig/VEX/priv/guest_s390_toIR.c 2012-11-04 21:57:03.789416902 +0100 +++ valgrind-3.8.1/VEX/priv/guest_s390_toIR.c 2012-11-04 21:57:37.102894640 +0100 @@ -773,7 +641,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_s390_toIR.c valgrind-3.8.1/VEX/priv/ return disInstr_S390_WRK(guest_code + delta); } -Only in valgrind-3.8.1/VEX/priv: guest_s390_toIR.c.orig diff -ur valgrind-3.8.1.orig/VEX/priv/guest_x86_defs.h valgrind-3.8.1/VEX/priv/guest_x86_defs.h --- valgrind-3.8.1.orig/VEX/priv/guest_x86_defs.h 2012-11-04 21:57:03.782416795 +0100 +++ valgrind-3.8.1/VEX/priv/guest_x86_defs.h 2012-11-04 21:57:37.169895603 +0100 @@ -787,7 +654,6 @@ diff -ur valgrind-3.8.1.orig/VEX/priv/guest_x86_defs.h valgrind-3.8.1/VEX/priv/g /* Used by the optimiser to specialise calls to helpers. */ extern -Only in valgrind-3.8.1/VEX/priv: guest_x86_defs.h.orig diff -ur valgrind-3.8.1.orig/VEX/priv/guest_x86_toIR.c valgrind-3.8.1/VEX/priv/guest_x86_toIR.c --- valgrind-3.8.1.orig/VEX/priv/guest_x86_toIR.c 2012-11-04 21:57:03.790416917 +0100 +++ valgrind-3.8.1/VEX/priv/guest_x86_toIR.c 2012-11-04 21:57:37.176895720 +0100 @@ -875,4 +741,3 @@ diff -ur valgrind-3.8.1.orig/VEX/pub/libvex.h valgrind-3.8.1/VEX/pub/libvex.h /* IN: profiling: add a 64 bit profiler counter increment to the translation? */ Bool addProfInc; -Only in valgrind-3.8.1/VEX/pub: libvex.h.orig diff --git a/valgrind.spec b/valgrind.spec index 25f6ea3..30e80fa 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -465,6 +465,7 @@ echo ===============END TESTING=============== %changelog * Mon Jul 08 2013 Mark Wielaard - Add valgrind-3.8.1-dwarf-anon-enum.patch +- Cleanup valgrind-3.8.1-sigill_diag.patch .orig file changes (#949687). * Tue May 28 2013 Michael Schwendt - 1:3.8.1-16 - Provide virtual -static package in -devel subpackage (#609624).