From: Nicholas Nethercote <njn@valgrind.org>
Date: Wed, 15 Apr 2009 03:49:44 +0000 (+0000)
Subject: Merge a small part of r9357 from the trunk, to fix bug #179731.
X-Git-Tag: svn/VALGRIND_3_4_1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b93e9d3e93c58c1d0e9a55b14721264f3f16fce;p=thirdparty%2Fvalgrind.git

Merge a small part of r9357 from the trunk, to fix bug #179731.



git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_4_BRANCH@9538
---

diff --git a/none/tests/x86/jcxz.c b/none/tests/x86/jcxz.c
index 945dbdf7b7..9490dc935e 100644
--- a/none/tests/x86/jcxz.c
+++ b/none/tests/x86/jcxz.c
@@ -11,12 +11,12 @@ UInt test_jcxz ( UInt arg )
    __asm__ __volatile__(
       "movl %0,%%ecx\n\t"
       "movl $0,%%eax\n"
-      ".Lxyzzy1:\n\t"
-      "jcxz .Lfoobar1\n\t"
+      "0:\n\t"
+      "jcxz 1f\n\t"
       "addl $1, %%eax\n\t"
       "subl $1, %%ecx\n\t"
-      "jmp .Lxyzzy1\n"
-      ".Lfoobar1:\n\t"
+      "jmp 0b\n"
+      "1:\n\t"
       "movl %%eax, %1"
       : /*out*/ : /*in*/ "m"(block[0]),
                          "m"(block[1]) : /*trash*/ "eax","ecx","cc","memory"
@@ -32,12 +32,12 @@ UInt test_jecxz ( UInt arg )
    __asm__ __volatile__(
       "movl %0,%%ecx\n\t"
       "movl $0,%%eax\n"
-      ".Lxyzzy2:\n\t"
-      "jecxz .Lfoobar2\n\t"
+      "0:\n\t"
+      "jecxz 1f\n\t"
       "addl $1, %%eax\n\t"
       "subl $1, %%ecx\n\t"
-      "jmp .Lxyzzy2\n"
-      ".Lfoobar2:\n\t"
+      "jmp 0b\n"
+      "1:\n\t"
       "movl %%eax, %1"
       : /*out*/ : /*in*/ "m"(block[0]),
                          "m"(block[1]) : /*trash*/ "eax","ecx","cc","memory"