[valgrind] Fix up inline asm in helgrind tests.
Jakub Jelinek
jakub at fedoraproject.org
Fri Nov 12 16:49:38 UTC 2010
commit 858859c58b9d9c94a7584471533a5eedf19f40fa
Author: Jakub Jelinek <jakub at redhat.com>
Date: Fri Nov 12 17:49:25 2010 +0100
Fix up inline asm in helgrind tests.
valgrind-3.6.0-helgrind-tests.patch | 60 +++++++++++++++++++++++++++++++++++
valgrind.spec | 2 +
2 files changed, 62 insertions(+), 0 deletions(-)
---
diff --git a/valgrind-3.6.0-helgrind-tests.patch b/valgrind-3.6.0-helgrind-tests.patch
new file mode 100644
index 0000000..2f4d3aa
--- /dev/null
+++ b/valgrind-3.6.0-helgrind-tests.patch
@@ -0,0 +1,60 @@
+--- valgrind/helgrind/tests/tc07_hbl1.c.jj 2010-11-11 17:58:01.000000000 +0100
++++ valgrind/helgrind/tests/tc07_hbl1.c 2010-11-12 17:46:11.144455060 +0100
+@@ -48,23 +48,23 @@
+ || defined(PLAT_ppc32_aix5) || defined(PLAT_ppc64_aix5)
+ # define INC(_lval,_lqual) \
+ __asm__ __volatile__( \
+- "L1xyzzy1" _lqual ":\n" \
++ "1:\n" \
+ " lwarx 15,0,%0\n" \
+ " addi 15,15,1\n" \
+ " stwcx. 15,0,%0\n" \
+- " bne- L1xyzzy1" _lqual \
++ " bne- 1b\n" \
+ : /*out*/ : /*in*/ "b"(&(_lval)) \
+ : /*trash*/ "r15", "cr0", "memory" \
+ )
+ #elif defined(PLAT_arm_linux)
+ # define INC(_lval,_lqual) \
+ __asm__ __volatile__( \
+- "L1xyzzy1" _lqual ":\n" \
++ "1:\n" \
+ " ldrex r8, [%0, #0]\n" \
+ " add r8, r8, #1\n" \
+ " strex r9, r8, [%0, #0]\n" \
+ " cmp r9, #0\n" \
+- " bne L1xyzzy1" _lqual \
++ " bne 1b\n" \
+ : /*out*/ : /*in*/ "r"(&(_lval)) \
+ : /*trash*/ "r8", "r9", "cc", "memory" \
+ );
+--- valgrind/helgrind/tests/tc08_hbl2.c.jj 2010-11-11 17:58:01.000000000 +0100
++++ valgrind/helgrind/tests/tc08_hbl2.c 2010-11-12 17:47:05.295830288 +0100
+@@ -65,23 +65,23 @@
+ || defined(PLAT_ppc32_aix5) || defined(PLAT_ppc64_aix5)
+ # define INC(_lval,_lqual) \
+ __asm__ __volatile__( \
+- "L1xyzzy1" _lqual ":\n" \
++ "1:\n" \
+ " lwarx 15,0,%0\n" \
+ " addi 15,15,1\n" \
+ " stwcx. 15,0,%0\n" \
+- " bne- L1xyzzy1" _lqual \
++ " bne- 1b\n" \
+ : /*out*/ : /*in*/ "b"(&(_lval)) \
+ : /*trash*/ "r15", "cr0", "memory" \
+ )
+ #elif defined(PLAT_arm_linux)
+ # define INC(_lval,_lqual) \
+ __asm__ __volatile__( \
+- "L1xyzzy1" _lqual ":\n" \
++ "1:\n" \
+ " ldrex r8, [%0, #0]\n" \
+ " add r8, r8, #1\n" \
+ " strex r9, r8, [%0, #0]\n" \
+ " cmp r9, #0\n" \
+- " bne L1xyzzy1" _lqual \
++ " bne 1b\n" \
+ : /*out*/ : /*in*/ "r"(&(_lval)) \
+ : /*trash*/ "r8", "r9", "cc", "memory" \
+ );
diff --git a/valgrind.spec b/valgrind.spec
index 2c91e37..53acc76 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -19,6 +19,7 @@ Patch12: valgrind-3.6.0-s390x-3.patch
Patch13: valgrind-3.6.0-s390x-4.patch
Patch14: valgrind-3.6.0-strcasecmp.patch
Patch15: valgrind-3.6.0-xlc_dbl_u32-test-patch
+Patch16: valgrind-3.6.0-helgrind-tests.patch
License: GPLv2
URL: http://www.valgrind.org/
Group: Development/Debuggers
@@ -108,6 +109,7 @@ for details.
%patch13 -p1
%patch14 -p1
%patch15 -p1
+%patch16 -p1
chmod 755 none/tests/s390x/filter_stderr
More information about the scm-commits
mailing list