|
From: <sv...@va...> - 2009-04-15 03:57:28
|
Author: njn
Date: 2009-04-15 04:57:25 +0100 (Wed, 15 Apr 2009)
New Revision: 9541
Log:
Merge r9539 (fix for #189054) from the trunk.
Modified:
branches/DARWIN/coregrind/m_libcassert.c
Modified: branches/DARWIN/coregrind/m_libcassert.c
===================================================================
--- branches/DARWIN/coregrind/m_libcassert.c 2009-04-15 03:56:49 UTC (rev 9540)
+++ branches/DARWIN/coregrind/m_libcassert.c 2009-04-15 03:57:25 UTC (rev 9541)
@@ -47,8 +47,8 @@
#if defined(VGP_x86_linux) || defined(VGP_x86_darwin)
# 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),\
|