Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/include Fix __mcount in the !(__ARM_EABI__) cas...
details: https://anonhg.NetBSD.org/src/rev/ea6bc914ad7f
branches: trunk
changeset: 334048:ea6bc914ad7f
user: skrll <skrll%NetBSD.org@localhost>
date: Fri Nov 28 15:37:02 2014 +0000
description:
Fix __mcount in the !(__ARM_EABI__) case by popping the right number of
registers on exit.
diffstat:
sys/arch/arm/include/profile.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (18 lines):
diff -r 6ea5276b450e -r ea6bc914ad7f sys/arch/arm/include/profile.h
--- a/sys/arch/arm/include/profile.h Fri Nov 28 15:29:48 2014 +0000
+++ b/sys/arch/arm/include/profile.h Fri Nov 28 15:37:02 2014 +0000
@@ -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 \
Home |
Main Index |
Thread Index |
Old Index