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

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

details:   https://anonhg.NetBSD.org/src/rev/485aca5dba38
branches:  netbsd-7
changeset: 799397:485aca5dba38
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Jun 02 20:03:37 2015 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #813):
        sys/arch/arm/include/profile.h: revision 1.17 via patch
ARM has deprecated using both PC and LR in the register list of pop with
ARMv6T2, so split the instructions up.

diffstat:

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

diffs (39 lines):

diff -r 44de220420b1 -r 485aca5dba38 sys/arch/arm/include/profile.h
--- a/sys/arch/arm/include/profile.h    Tue Jun 02 19:49:38 2015 +0000
+++ b/sys/arch/arm/include/profile.h    Tue Jun 02 20:03:37 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: profile.h,v 1.14.2.1 2014/12/01 08:59:04 martin Exp $  */
+/*     $NetBSD: profile.h,v 1.14.2.2 2015/06/02 20:03:37 snj Exp $     */
 
 /*
  * Copyright (c) 2001 Ben Harris
@@ -76,7 +76,8 @@
        /*                                                              \
         * Restore registers that were trashed during mcount            \
         */                                                             \
-       __asm("pop      {r0-r3, lr, pc}");                              \
+       __asm("pop      {r0-r3, lr}");                                  \
+       __asm("pop      {pc}");                                         \
        __asm(".size    " MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
 #elif defined(__ARM_DWARF_EH__)
 #define        MCOUNT                                                          \
@@ -116,7 +117,8 @@
        /*                                                              \
         * Restore registers that were trashed during mcount            \
         */                                                             \
-       __asm("pop      {r0-r4, lr, pc}");                              \
+       __asm("pop      {r0-r4, lr}");                                  \
+       __asm("pop      {pc}");                                         \
        __asm(".cfi_endproc");                                          \
        __asm(".size    " MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
 #else
@@ -159,7 +161,8 @@
        /*                                                              \
         * Restore registers that were trashed during mcount            \
         */                                                             \
-       __asm("pop      {r0-r4, lr, pc}");                              \
+       __asm("pop      {r0-r4, lr}");                                  \
+       __asm("pop      {pc}");                                         \
        __asm(".cfi_endproc");                                          \
        __asm(".fnend");                                                \
        __asm(".size    " MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);