From 611478a742c24431d9343d7a1d1a4cf8832274f9 Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Mon, 12 Oct 2015 20:15:12 +0000 Subject: [PATCH] Use local labels instead of global labels (ppc and mips specific code). git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15701 --- coregrind/m_libcassert.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/coregrind/m_libcassert.c b/coregrind/m_libcassert.c index 9dcc18e70c..c393d7b73b 100644 --- a/coregrind/m_libcassert.c +++ b/coregrind/m_libcassert.c @@ -87,8 +87,8 @@ { UInt cia, r1, lr; \ __asm__ __volatile__( \ "mflr 0;" /* r0 = lr */ \ - "bl m_libcassert_get_ip;" /* lr = pc */ \ - "m_libcassert_get_ip:\n" \ + "bl 0f;" /* lr = pc */ \ + "0:\n" \ "mflr %0;" /* %0 = pc */ \ "mtlr 0;" /* restore lr */ \ "mr %1,1;" /* %1 = r1 */ \ @@ -106,8 +106,8 @@ { ULong cia, r1, lr; \ __asm__ __volatile__( \ "mflr 0;" /* r0 = lr */ \ - "bl .m_libcassert_get_ip;" /* lr = pc */ \ - ".m_libcassert_get_ip:\n" \ + "bl 0f;" /* lr = pc */ \ + "0:\n" \ "mflr %0;" /* %0 = pc */ \ "mtlr 0;" /* restore lr */ \ "mr %1,1;" /* %1 = r1 */ \ @@ -180,8 +180,8 @@ # define GET_STARTREGS(srP) \ { UInt pc, sp, fp, ra, gp; \ asm("move $8, $31;" /* t0 = ra */ \ - "bal m_libcassert_get_ip;" /* ra = pc */ \ - "m_libcassert_get_ip:\n" \ + "bal 0f;" /* ra = pc */ \ + "0:\n" \ "move %0, $31;" \ "move $31, $8;" /* restore lr */ \ "move %1, $29;" \ @@ -203,10 +203,10 @@ } #elif defined(VGP_mips64_linux) # define GET_STARTREGS(srP) \ - { ULong pc, sp, fp, ra, gp; \ + { ULong pc, sp, fp, ra, gp; \ asm("move $8, $31;" /* t0 = ra */ \ - "bal m_libcassert_get_ip;" /* ra = pc */ \ - "m_libcassert_get_ip:\n" \ + "bal 0f;" /* ra = pc */ \ + "0:\n" \ "move %0, $31;" \ "move $31, $8;" /* restore lr */ \ "move %1, $29;" \ -- 2.47.2