pool/valgrind
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix merge error

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools/valgrind?expand=0&rev=32
This commit is contained in:
Dirk Mueller 2011-06-22 18:54:28 +00:00 committed by Git OBS Bridge
parent c99e09d69a
commit b860e0d1a1
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
valgrind.changes
View File

@ -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 Sat Jun 18 17:09:08 UTC 2011 - dmueller@suse.de

15
vg_bug270794_r11697.patch
View File

@ -111,19 +111,10 @@ Index: coregrind/m_machine.c
Int r; Int r;
/* This is a kludge. Really we ought to back-convert saved_act /* 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*/ __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 */ + /* VSX support implies Power ISA 2.06 */
+ have_VX = True; + have_VX = True;
+ if (VG_MINIMAL_SETJMP(env_unsup_insn)) { + 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 /* determine dcbz/dcbzl sizes while we still have the signal
* handlers registered */ * handlers registered */
find_ppc_dcbz_sz(&vai); 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_SIGILL, &saved_sigill_act, NULL);
VG_(sigaction)(VKI_SIGFPE, &saved_sigfpe_act, NULL); VG_(sigaction)(VKI_SIGFPE, &saved_sigfpe_act, NULL);
VG_(sigprocmask)(VKI_SIG_SETMASK, &saved_set, 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. */ /* on ppc64, if we don't even have FP, just give up. */
if (!have_F) if (!have_F)
return False; 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_V) vai.hwcaps |= VEX_HWCAPS_PPC64_V;
if (have_FX) vai.hwcaps |= VEX_HWCAPS_PPC64_FX; if (have_FX) vai.hwcaps |= VEX_HWCAPS_PPC64_FX;
if (have_GX) vai.hwcaps |= VEX_HWCAPS_PPC64_GX; if (have_GX) vai.hwcaps |= VEX_HWCAPS_PPC64_GX;