Mon Jan 5 18:06:57 2009 UTC ()

Temporarily define MCOUNT as a dummy for _RUMPKERNEL to allow build
to proceed - the MD macros use processor instructions unavailable
to userspace and should/could be provided as interfaces.


(pooka)

diff -r1.7 -r1.8 src/common/lib/libc/gmon/mcount.c

--- src/common/lib/libc/gmon/mcount.c 2006/10/27 22:14:13	1.7
+++ src/common/lib/libc/gmon/mcount.c 2009/01/05 18:06:57	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mcount.c,v 1.7 2006/10/27 22:14:13 uwe Exp $	*/
+/*	$NetBSD: mcount.c,v 1.8 2009/01/05 18:06:57 pooka Exp $	*/
 /*
  * Copyright (c) 2003, 2004 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Nathan J. Williams for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -66,72 +66,82 @@
 /* If building a standalone libkern, don't include mcount. */
 #if (!defined(_KERNEL) || defined(GPROF)) && !defined(_STANDALONE)
 #ifdef _KERNEL_OPT
 #include "opt_multiprocessor.h"
 #endif
 #include <sys/cdefs.h>
 #if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS)
 #if 0
 static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: mcount.c,v 1.7 2006/10/27 22:14:13 uwe Exp $");
+__RCSID("$NetBSD: mcount.c,v 1.8 2009/01/05 18:06:57 pooka Exp $");
 #endif
 #endif
 #include <sys/param.h>
 #include <sys/gmon.h>
 #ifndef _KERNEL
 #include "reentrant.h"
 #endif
 #ifdef _REENTRANT
 extern thread_key_t _gmonkey;
 extern struct gmonparam _gmondummy;
 struct gmonparam *_m_gmon_alloc(void);
 #endif
 _MCOUNT_DECL __P((u_long, u_long))
 #ifdef _KERNEL
     __attribute__((__no_instrument_function__))
 #endif
     __used;
 /* 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
  * with _MCOUNT_DECL, does the actual work and is either inlined into a
  * C routine or called by an assembly stub.  In any case, this magic is
  * taken care of by the MCOUNT definition in <machine/profile.h>.
+ *
  * _mcount updates data structures that represent traversals of the
  * program's call graph edges.  frompc and selfpc are the return
  * address and function address that represents the given call graph edge.
+ *
  * Note: the original BSD code used the same variable (frompcindex) for
  * both frompcindex and frompc.  Any reasonable, modern compiler will
  * perform this optimization.
  */
 _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
 	u_long frompc, selfpc;
+{
 	u_short *frompcindex;
 	struct tostruct *top, *prevtop;
 	struct gmonparam *p;
 	long toindex;
-#ifdef _KERNEL
+#if defined(_KERNEL) && !defined(_RUMPKERNEL)
 	int s;
 #endif
 #if defined(_REENTRANT) && !defined(_KERNEL)
 	if (__isthreaded) {
 		p = thr_getspecific(_gmonkey);
 		if (p == NULL) {
 			/* Prevent recursive calls while allocating */
 			thr_setspecific(_gmonkey, &_gmondummy);
 			p = _m_gmon_alloc();
+		}
 	} else
 #endif