From b860e0d1a17d4d36f2a08a68bbe423bb95fb2c9a5d48bf4975ee1cf9da9f5bc6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 22 Jun 2011 18:54:28 +0000 Subject: [PATCH] - fix merge error OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=32 --- valgrind.changes | 5 +++++ vg_bug270794_r11697.patch | 15 +++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/valgrind.changes b/valgrind.changes index 96f0ef2..6f4487f 100644 --- a/valgrind.changes +++ b/valgrind.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 22 18:54:13 UTC 2011 - dmueller@suse.de + +- fix merge error + ------------------------------------------------------------------- Sat Jun 18 17:09:08 UTC 2011 - dmueller@suse.de diff --git a/vg_bug270794_r11697.patch b/vg_bug270794_r11697.patch index 1e8634a..8f14a70 100644 --- a/vg_bug270794_r11697.patch +++ b/vg_bug270794_r11697.patch @@ -111,19 +111,10 @@ Index: coregrind/m_machine.c Int r; /* This is a kludge. Really we ought to back-convert saved_act -@@ -845,6 +847,23 @@ Bool VG_(machine_get_hwcaps)( void ) +@@ -845,6 +847,14 @@ Bool VG_(machine_get_hwcaps)( void ) __asm__ __volatile__(".long 0xFC000034"); /*frsqrte 0,0*/ } -+ /* VSX support implies Power ISA 2.06 */ -+ have_VX = True; -+ if (VG_MINIMAL_SETJMP(env_unsup_insn)) { -+ have_VX = False; -+ } else { -+ __asm__ __volatile__(".long 0xf0000564"); /* xsabsdp XT,XB */ -+ } -+ -+ + /* VSX support implies Power ISA 2.06 */ + have_VX = True; + if (VG_MINIMAL_SETJMP(env_unsup_insn)) { @@ -135,7 +126,7 @@ Index: coregrind/m_machine.c /* determine dcbz/dcbzl sizes while we still have the signal * handlers registered */ find_ppc_dcbz_sz(&vai); -@@ -852,8 +871,9 @@ Bool VG_(machine_get_hwcaps)( void ) +@@ -852,8 +862,9 @@ Bool VG_(machine_get_hwcaps)( void ) VG_(sigaction)(VKI_SIGILL, &saved_sigill_act, NULL); VG_(sigaction)(VKI_SIGFPE, &saved_sigfpe_act, NULL); VG_(sigprocmask)(VKI_SIG_SETMASK, &saved_set, NULL); @@ -147,7 +138,7 @@ Index: coregrind/m_machine.c /* on ppc64, if we don't even have FP, just give up. */ if (!have_F) return False; -@@ -866,6 +886,7 @@ Bool VG_(machine_get_hwcaps)( void ) +@@ -866,6 +877,7 @@ Bool VG_(machine_get_hwcaps)( void ) if (have_V) vai.hwcaps |= VEX_HWCAPS_PPC64_V; if (have_FX) vai.hwcaps |= VEX_HWCAPS_PPC64_FX; if (have_GX) vai.hwcaps |= VEX_HWCAPS_PPC64_GX;