Module Name: src
Committed By: skrll
Date: Fri Nov 28 15:37:02 UTC 2014
Modified Files:
src/sys/arch/arm/include: profile.h
Log Message:
Fix __mconunt in the !(__ARM_EABI__) case by opoing the right number of
registers on exit.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 src/sys/arch/arm/include/profile.h:1.16
--- src/sys/arch/arm/include/profile.h:1.15 Wed Aug 13 22:16:24 2014
+++ src/sys/arch/arm/include/profile.h Fri Nov 28 15:37:02 2014
@@ -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 \
