Oops, fptrint_t still needs to be declared in <machine/profile.h> in the
!KERNEL case. The kludge to get it declared in libc/gmon/mcount.c wasn't sufficient because fptrint_t is used in <sys/gmon.h>.
This commit is contained in:
parent
1009171eb2
commit
930a642372
@ -36,20 +36,12 @@
|
||||
static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif
|
||||
static const char rcsid[] =
|
||||
"$Id: mcount.c,v 1.10 1998/03/09 04:42:19 jb Exp $";
|
||||
"$Id: mcount.c,v 1.11 1998/07/10 02:27:16 bde Exp $";
|
||||
#endif
|
||||
|
||||
#ifndef __NETBSD_SYSCALLS
|
||||
|
||||
#ifdef KERNEL
|
||||
#include <sys/param.h>
|
||||
#else
|
||||
/* Kludge to get fptrint_t declared. */
|
||||
#define KERNEL
|
||||
#include <sys/param.h>
|
||||
#undef KERNEL
|
||||
#endif
|
||||
|
||||
#include <sys/gmon.h>
|
||||
#ifdef KERNEL
|
||||
#include <sys/systm.h>
|
||||
|
@ -31,13 +31,14 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)profile.h 8.1 (Berkeley) 6/11/93
|
||||
* $Id: profile.h,v 1.14 1998/02/03 20:32:38 bde Exp $
|
||||
* $Id: profile.h,v 1.15 1998/07/10 02:27:15 bde Exp $
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_PROFILE_H_
|
||||
#define _MACHINE_PROFILE_H_
|
||||
|
||||
#ifdef KERNEL
|
||||
|
||||
/*
|
||||
* Config generates something to tell the compiler to align functions on 16
|
||||
* byte boundaries. A strict alignment is good for keeping the tables small.
|
||||
@ -101,6 +102,10 @@ mcount() \
|
||||
frompc = ((fptrint_t *)frompc)[1]; \
|
||||
_mcount(frompc, selfpc); \
|
||||
}
|
||||
|
||||
/* An unsigned integral type that can hold function pointers. */
|
||||
typedef u_int32_t fptrint_t;
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
/*
|
||||
|
@ -31,13 +31,14 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)profile.h 8.1 (Berkeley) 6/11/93
|
||||
* $Id: profile.h,v 1.14 1998/02/03 20:32:38 bde Exp $
|
||||
* $Id: profile.h,v 1.15 1998/07/10 02:27:15 bde Exp $
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_PROFILE_H_
|
||||
#define _MACHINE_PROFILE_H_
|
||||
|
||||
#ifdef KERNEL
|
||||
|
||||
/*
|
||||
* Config generates something to tell the compiler to align functions on 16
|
||||
* byte boundaries. A strict alignment is good for keeping the tables small.
|
||||
@ -101,6 +102,10 @@ mcount() \
|
||||
frompc = ((fptrint_t *)frompc)[1]; \
|
||||
_mcount(frompc, selfpc); \
|
||||
}
|
||||
|
||||
/* An unsigned integral type that can hold function pointers. */
|
||||
typedef u_int32_t fptrint_t;
|
||||
|
||||
#endif /* KERNEL */
|
||||
|
||||
/*
|
||||
|
Loading…
x
Reference in New Issue
Block a user