summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2003-08-21 05:08:16 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2003-08-21 05:08:16 +0000
commit0193ab3542d06aeb3bcb89e1a8b7fcc17cf87fa9 (patch)
tree149ce105b5e49b35033e9b33f01f6a843a52bf00 /sys/arch
parent6e93737b98effb9905cfa5f49e6f20c66a36fbf7 (diff)
fix symbol name error in mcount functionality in a.out->ELF transition.
This changes the real definition to __mcount, but with a weak mcount for compat. On the next major bump the weak alias should be removed. Without this diff the compiler symbol mcount conflicts with the user mcount() function.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/include/profile.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/i386/include/profile.h b/sys/arch/i386/include/profile.h
index 55fa3628456..6af9f37b5e6 100644
--- a/sys/arch/i386/include/profile.h
+++ b/sys/arch/i386/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.8 2003/06/02 23:27:47 millert Exp $ */
+/* $OpenBSD: profile.h,v 1.9 2003/08/21 05:08:15 drahn Exp $ */
/* $NetBSD: profile.h,v 1.6 1995/03/28 18:17:08 jtc Exp $ */
/*
@@ -35,7 +35,8 @@
#define _MCOUNT_DECL static __inline void _mcount
#define MCOUNT \
-extern void mcount(void) __asm("mcount"); \
+extern void mcount(void) __asm("__mcount"); \
+__weak_alias(mcount,__mcount); \
void \
mcount() \
{ \