Module Name: src
Committed By: snj
Date: Tue Jun 2 20:03:37 UTC 2015
Modified Files:
src/sys/arch/arm/include [netbsd-7]: profile.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 src/sys/arch/arm/include/profile.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/profile.h
diff -u src/sys/arch/arm/include/profile.h:1.14.2.1 src/sys/arch/arm/include/profile.h:1.14.2.2
--- src/sys/arch/arm/include/profile.h:1.14.2.1 Mon Dec 1 08:59:04 2014
+++ src/sys/arch/arm/include/profile.h Tue Jun 2 20:03:37 2015
@@ -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);
