Module Name: src
Committed By: darran
Date: Tue Mar 2 21:08:36 UTC 2010
Modified Files:
src/external/bsd/libelf/dist: _libelf.h
src/external/cddl/osnet/dist/lib/libdtrace/common: dtrace.h
mkerrtags.sh mknames.sh
src/external/cddl/osnet/sys/sys: sysmacros.h types.h
Log Message:
DTrace: Get DTrace to build on OS X platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libelf/dist/_libelf.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh \
src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/sys/sysmacros.h
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libelf/dist/_libelf.h
diff -u src/external/bsd/libelf/dist/_libelf.h:1.4 src/external/bsd/libelf/dist/_libelf.h:1.5
--- src/external/bsd/libelf/dist/_libelf.h:1.4 Sun Dec 20 23:23:46 2009
+++ src/external/bsd/libelf/dist/_libelf.h Tue Mar 2 21:08:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: _libelf.h,v 1.4 2009/12/20 23:23:46 thorpej Exp $ */
+/* $NetBSD: _libelf.h,v 1.5 2010/03/02 21:08:36 darran Exp $ */
/*-
* Copyright (c) 2006 Joseph Koshy
@@ -37,6 +37,10 @@
#define NULL ((void *) 0)
#endif
+#ifndef roundup2
+#define roundup2(x, m) (((x) + (m) - 1) & ~((m) - 1))
+#endif
+
/*
* Library-private data structures.
*/
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h:1.3 src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h:1.4
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h:1.3 Sun Feb 21 01:46:34 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h Tue Mar 2 21:08:36 2010
@@ -30,7 +30,6 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/dtrace.h>
-typedef processorid_t test_processor_id_t;
#include <stdarg.h>
#include <stdio.h>
#include <gelf.h>
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.2 src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.3
--- src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh:1.2 Sun Feb 21 00:49:55 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/mkerrtags.sh Tue Mar 2 21:08:36 2010
@@ -26,7 +26,7 @@
#
#ident "%Z%%M% %I% %E% SMI"
-BSDECHO=-e
+BSDECHO=
echo ${BSDECHO} "\
/*\n\
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.2 src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.3
--- src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh:1.2 Sun Feb 21 00:49:55 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/mknames.sh Tue Mar 2 21:08:36 2010
@@ -26,7 +26,7 @@
#
#ident "%Z%%M% %I% %E% SMI"
-BSDECHO=-e
+BSDECHO=
echo ${BSDECHO} "\
/*\n\
@@ -44,7 +44,7 @@
{\n\
switch (subr) {"
-nawk '
+awk '
/^#define[ ]*DIF_SUBR_/ && $2 != "DIF_SUBR_MAX" {
printf("\tcase %s: return (\"%s\");\n", $2, tolower(substr($2, 10)));
}'
Index: src/external/cddl/osnet/sys/sys/sysmacros.h
diff -u src/external/cddl/osnet/sys/sys/sysmacros.h:1.3 src/external/cddl/osnet/sys/sys/sysmacros.h:1.4
--- src/external/cddl/osnet/sys/sys/sysmacros.h:1.3 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/sys/sys/sysmacros.h Tue Mar 2 21:08:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmacros.h,v 1.3 2010/02/21 01:46:36 darran Exp $ */
+/* $NetBSD: sysmacros.h,v 1.4 2010/03/02 21:08:36 darran Exp $ */
/*
* CDDL HEADER START
@@ -44,7 +44,9 @@
/*
* Disk blocks (sectors) and bytes.
*/
+#ifndef dtob
#define dtob(DD) ((DD) << DEV_BSHIFT)
+#endif
#define btod(BB) (((BB) + DEV_BSIZE - 1) >> DEV_BSHIFT)
#define btodt(BB) ((BB) >> DEV_BSHIFT)
#define lbtod(BB) (((offset_t)(BB) + DEV_BSIZE - 1) >> DEV_BSHIFT)
@@ -140,16 +142,18 @@
/* major part of a device external from the kernel (same as emajor below) */
+#undef major
#define major(x) (major_t)((((unsigned)(x)) >> O_BITSMINOR) & O_MAXMAJ)
/* minor part of a device external from the kernel (same as eminor below) */
-
+#undef minor
#define minor(x) (minor_t)((x) & O_MAXMIN)
#endif /* _KERNEL */
/* create old device number */
+#undef makedev
#define makedev(x, y) (unsigned short)(((x) << O_BITSMINOR) | ((y) & O_MAXMIN))
/* make an new device number */
@@ -224,6 +228,7 @@
/*
* Macros for counting and rounding.
*/
+#undef howmany
#define howmany(x, y) (((x)+((y)-1))/(y))
#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
@@ -342,7 +347,7 @@
* because if a field crosses a byte boundary it's not likely to be meaningful
* without reassembly in its nonnative endianness.
*/
-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__APPLE__)
#if defined(_BIT_FIELDS_LTOH)
#define DECL_BITFIELD2(_a, _b) \
uint8_t _a, _b
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.7 src/external/cddl/osnet/sys/sys/types.h:1.8
--- src/external/cddl/osnet/sys/sys/types.h:1.7 Mon Mar 1 11:19:40 2010
+++ src/external/cddl/osnet/sys/sys/types.h Tue Mar 2 21:08:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.7 2010/03/01 11:19:40 darran Exp $ */
+/* $NetBSD: types.h,v 1.8 2010/03/02 21:08:36 darran Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -64,14 +64,8 @@
* This is a bag of dirty hacks to keep things compiling.
*/
-#include <sys/stdint.h>
-#ifndef _NETBSD_SOURCE
-#define _NETBSD_SOURCE /* XXX TBD fix this */
+#include <stdint.h>
#include_next <sys/types.h>
-#undef _NETBSD_SOURCE
-#else
-#include_next <sys/types.h>
-#endif
#include_next <sys/ccompile.h>
#ifndef _KERNEL
@@ -83,6 +77,12 @@
#define MAXNAMELEN 256
#define FMNAMESZ 8
+#ifdef __APPLE__
+typedef int64_t longlong_t;
+typedef uint64_t u_longlong_t;
+typedef unsigned long vsize_t;
+#endif
+
typedef unsigned int size32_t;
typedef unsigned int caddr32_t;
