From: Nicholas Nethercote <njn@valgrind.org>
Date: Wed, 15 Apr 2009 03:56:49 +0000 (+0000)
Subject: Merge r9539 (fix for #189054) from the trunk.
X-Git-Tag: svn/VALGRIND_3_4_1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f1e25f879f4196055afb745cbbb92ca70431072;p=thirdparty%2Fvalgrind.git

Merge r9539 (fix for #189054) from the trunk.



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

diff --git a/coregrind/m_libcassert.c b/coregrind/m_libcassert.c
index 13ad4ba8d9..7669be90de 100644
--- a/coregrind/m_libcassert.c
+++ b/coregrind/m_libcassert.c
@@ -47,8 +47,8 @@
 
 #if defined(VGP_x86_linux)
 #  define GET_REAL_PC_SP_AND_FP(pc, sp, fp)      \
-      asm("call m_libcassert_get_ip;" \
-          "m_libcassert_get_ip: popl %0;" \
+      asm("call 0f;" \
+          "0: popl %0;" \
           "movl %%esp, %1;" \
           "movl %%ebp, %2;" \
           : "=r" (pc),\