From ee3b021d7bdcadeb26c65df315a56b6f810ddb5b Mon Sep 17 00:00:00 2001 From: riz Date: Fri, 2 Oct 2015 22:16:38 +0000 Subject: [PATCH] Restore some defines lost in last update, and don't include sys/cpuvar.h MKDTRACE=yes now builds for arm platforms again. --- external/cddl/osnet/dist/uts/common/sys/dtrace.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/external/cddl/osnet/dist/uts/common/sys/dtrace.h b/external/cddl/osnet/dist/uts/common/sys/dtrace.h index 1e84554b1eb8..de43896f7de2 100644 --- a/external/cddl/osnet/dist/uts/common/sys/dtrace.h +++ b/external/cddl/osnet/dist/uts/common/sys/dtrace.h @@ -57,7 +57,6 @@ extern "C" { #ifdef illumos #include #else -#include #include #include #include @@ -2450,6 +2449,18 @@ extern void dtrace_helpers_destroy(proc_t *); #define DTRACE_INVOP_POPM 2 #define DTRACE_INVOP_B 3 +#define DTRACE_INVOP_MOV_IP_SP 1 +#define DTRACE_INVOP_BX_LR 2 +#define DTRACE_INVOP_MOV_PC_LR 3 +#define DTRACE_INVOP_LDM 4 +#define DTRACE_INVOP_LDMIB 5 +#define DTRACE_INVOP_LDR_IMM 6 +#define DTRACE_INVOP_MOVW 7 +#define DTRACE_INVOP_MOV_IMM 8 +#define DTRACE_INVOP_CMP_IMM 9 +#define DTRACE_INVOP_B_LABEL 10 +#define DTRACE_INVOP_PUSH 11 + #elif defined(__aarch64__) #define INSN_SIZE 4