[src/trunk]: src/common/lib/libc/gmon Put back the rump-disabling of mcount f...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cb4bb98f9169
branches:  trunk
changeset: 342854:cb4bb98f9169
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Jan 11 01:57:12 2016 +0000

description:
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.

diffstat:

 common/lib/libc/gmon/mcount.c |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 7188f68724d3 -r cb4bb98f9169 common/lib/libc/gmon/mcount.c
--- a/common/lib/libc/gmon/mcount.c     Mon Jan 11 01:45:27 2016 +0000
+++ b/common/lib/libc/gmon/mcount.c     Mon Jan 11 01:57:12 2016 +0000
@@ -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 @@
     __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