Module Name: src
Committed By: martin
Date: Mon Dec 1 08:59:04 UTC 2014
Modified Files:
src/sys/arch/arm/include [netbsd-7]: profile.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 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 src/sys/arch/arm/include/profile.h:1.14.2.1
--- src/sys/arch/arm/include/profile.h:1.14 Sun May 11 02:02:14 2014
+++ src/sys/arch/arm/include/profile.h Mon Dec 1 08:59:04 2014
@@ -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 \
