Module Name: src
Committed By: joerg
Date: Sun Jan 11 20:52:57 UTC 2015
Modified Files:
src/sys/arch/arm/include: profile.h
Log Message:
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.16 -r1.17 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.16 src/sys/arch/arm/include/profile.h:1.17
--- src/sys/arch/arm/include/profile.h:1.16 Fri Nov 28 15:37:02 2014
+++ src/sys/arch/arm/include/profile.h Sun Jan 11 20:52:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: profile.h,v 1.16 2014/11/28 15:37:02 skrll Exp $ */
+/* $NetBSD: profile.h,v 1.17 2015/01/11 20:52:57 joerg 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-r3, lr, pc}"); \
+ __asm("pop {r0-r3, 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-r3, lr, pc}"); \
+ __asm("pop {r0-r3, lr}"); \
+ __asm("pop {pc}"); \
__asm(".cfi_endproc"); \
__asm(".fnend"); \
__asm(".size " MCOUNT_ASM_NAME ", .-" MCOUNT_ASM_NAME);
