[src/netbsd-7]: src/sys/arch/arm/include Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/f35d588509f2
branches:  netbsd-7
changeset: 798638:f35d588509f2
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 01 08:59:04 2014 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #273):
        sys/arch/arm/include/profile.h: revision 1.16
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 89659fc91eb3 -r f35d588509f2 sys/arch/arm/include/profile.h
--- a/sys/arch/arm/include/profile.h    Fri Nov 28 10:08:37 2014 +0000
+++ b/sys/arch/arm/include/profile.h    Mon Dec 01 08:59:04 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: profile.h,v 1.14 2014/05/11 02:02:14 joerg Exp $       */
+/*     $NetBSD: profile.h,v 1.14.2.1 2014/12/01 08:59:04 martin 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                                                          \