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 13ad4ba8d97e04c307f4205aeaf79aa9a5a5fbf2..7669be90ded7b0f3a884f15a463ec6d715350f5f 100644 (file)
--- 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),\