Module Name: src
Committed By: ozaki-r
Date: Wed Mar 5 06:12:00 UTC 2014
Modified Files:
src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c
src/external/cddl/osnet/dist/uts/common/sys: dtrace.h
Log Message:
Add defined(__arm__)
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/dist/uts/common/sys/dtrace.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/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.23 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.24
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.23 Fri Jun 21 16:22:46 2013
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Wed Mar 5 06:12:00 2014
@@ -16603,7 +16603,7 @@ static int dtrace_unload(void);
#include <dtrace_unload.c>
#include <dtrace_vtime.c>
#include <dtrace_hacks.c>
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
#include <dtrace_isa.c>
#endif
Index: src/external/cddl/osnet/dist/uts/common/sys/dtrace.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.8 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.9
--- src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.8 Sun Jul 17 20:54:33 2011
+++ src/external/cddl/osnet/dist/uts/common/sys/dtrace.h Wed Mar 5 06:12:00 2014
@@ -2286,7 +2286,7 @@ extern void dtrace_safe_synchronous_sign
extern int dtrace_mach_aframes(void);
-#if defined(__i386) || defined(__amd64)
+#if defined(__i386) || defined(__amd64) || defined(__arm__)
extern int dtrace_instr_size(uchar_t *instr);
extern int dtrace_instr_size_isa(uchar_t *, model_t, int *);
extern void dtrace_invop_add(int (*)(uintptr_t, uintptr_t *, uintptr_t));
