Module Name: src
Committed By: christos
Date: Mon Jan 11 01:57:12 UTC 2016
Modified Files:
src/common/lib/libc/gmon: mcount.c
Log Message:
Put back the rump-disabling of mcount for librump. Otherwise the world
breaks because the mcount assembly code is written to call __mcount via
the PLT.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/common/lib/libc/gmon/mcount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/gmon/mcount.c
diff -u src/common/lib/libc/gmon/mcount.c:1.11 src/common/lib/libc/gmon/mcount.c:1.12
--- src/common/lib/libc/gmon/mcount.c:1.11 Sun Jan 10 04:04:32 2016
+++ src/common/lib/libc/gmon/mcount.c Sun Jan 10 20:57:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mcount.c,v 1.11 2016/01/10 09:04:32 ryo Exp $ */
+/* $NetBSD: mcount.c,v 1.12 2016/01/11 01:57:12 christos Exp $ */
/*
* Copyright (c) 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
#if 0
static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: mcount.c,v 1.11 2016/01/10 09:04:32 ryo Exp $");
+__RCSID("$NetBSD: mcount.c,v 1.12 2016/01/11 01:57:12 christos Exp $");
#endif
#endif
@@ -106,6 +106,16 @@ _MCOUNT_DECL(u_long, u_long)
__used;
#endif
+/* XXX: make these interfaces */
+#ifdef _RUMPKERNEL
+#undef MCOUNT_ENTER
+#define MCOUNT_ENTER
+#undef MCOUNT_EXIT
+#define MCOUNT_EXIT
+#undef MCOUNT
+#define MCOUNT
+#endif
+
/*
* mcount is called on entry to each function compiled with the profiling
* switch set. _mcount(), which is declared in a machine-dependent way
