[src/trunk]: src/sys/arch/arm/include Fix __mcount in the !(__ARM_EABI__) cas...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee67f9dd9d5d
branches:  trunk
changeset: 804190:ee67f9dd9d5d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Nov 28 15:37:02 2014 +0000

description:
Fix __mcount in the !(__ARM_EABI__) case by popping the right number of
registers on exit.

diffstat:

 sys/arch/arm/include/profile.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r c1f1cca8f7ad -r ee67f9dd9d5d sys/arch/arm/include/profile.h
--- a/sys/arch/arm/include/profile.h    Fri Nov 28 15:29:48 2014 +0000
+++ b/sys/arch/arm/include/profile.h    Fri Nov 28 15:37:02 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: profile.h,v 1.15 2014/08/13 22:16:24 matt Exp $        */
+/*     $NetBSD: profile.h,v 1.16 2014/11/28 15:37:02 skrll Exp $       */
 
 /*
  * Copyright (c) 2001 Ben Harris
@@ -76,7 +76,7 @@
        /*                                                              \
         * Restore registers that were trashed during mcount            \
         */                                                             \
-       __asm("pop      {r0-r3, pc}");                                  \
+       __asm("pop      {r0-r3, lr, pc}");                              \
        __asm(".size    " MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
 #elif defined(__ARM_DWARF_EH__)
 #define        MCOUNT                                                          \