Hello community,
here is the log from the commit of package valgrind for openSUSE:Factory
checked in at Thu Jun 23 11:40:00 CEST 2011.
--------
--- valgrind/valgrind.changes 2011-06-18 19:10:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/valgrind/valgrind.changes 2011-06-22
20:54:27.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jun 22 18:54:13 UTC 2011 - dmuel...@suse.de
+
+- fix merge error
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ valgrind.spec ++++++
--- /var/tmp/diff_new_pack.UXwBTH/_old 2011-06-23 11:39:40.000000000 +0200
+++ /var/tmp/diff_new_pack.UXwBTH/_new 2011-06-23 11:39:40.000000000 +0200
@@ -28,7 +28,7 @@
Summary: Memory Management Debugger
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 3.6.1
-Release: 5
+Release: 7
Source0: %{name}-%{version}.tar.bz2
# svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_5_0
svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_5_BRANCH > 3_5_BRANCH.diff
# svn di svn://svn.valgrind.org/vex/tags/VEX_3_5_0
svn://svn.valgrind.org/vex/branches/VEX_3_5_BRANCH > VEX_3_5_BRANCH.diff
++++++ vg_bug270794_r11697.patch ++++++
--- /var/tmp/diff_new_pack.UXwBTH/_old 2011-06-23 11:39:41.000000000 +0200
+++ /var/tmp/diff_new_pack.UXwBTH/_new 2011-06-23 11:39:41.000000000 +0200
@@ -111,7 +111,7 @@
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*/
}
@@ -123,19 +123,10 @@
+ __asm__ __volatile__(".long 0xf0000564"); /* xsabsdp XT,XB */
+ }
+
-+
-+ /* 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 */
-+ }
-+
/* 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 @@
/* 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;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
