Changeset 53665 in vbox for trunk

Timestamp:

Jan 2, 2015 12:32:39 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: build on darwin. (r42)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• VBoxDTraceR0/VBoxDTraceR0A.asm (modified) (1 diff)
• include/VBoxDTraceTypes.h (modified) (1 diff)
• onnv/lib/libdtrace/common/dt_cc.c (modified) (1 diff)
• onnv/lib/libdtrace/common/dt_options.c (modified) (1 diff)
• onnv/uts/common/dtrace/dtrace.c (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0/VBoxDTraceR0A.asm

@@ -39 +39 @@
 
 GLOBALNAME dtrace_probe6
-    jmp     dtrace_probe
+    jmp     NAME(dtrace_probe)
 
 

trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h

@@ -70 +70 @@
 #undef PATH_MAX
 #define PATH_MAX                    RTPATH_MAX
+#undef NBBY
 #define NBBY                        (8)
 #define NCPU                        RTCPUSET_MAX_CPUS

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_cc.c

@@ -101 +101 @@
 # ifdef _MSC_VER
 #  include <io.h>
-#  define ftruncate64   _chsize
-#  define lseek64       lseek
 # else
 #  include <unistd.h>
+# endif
+# if defined(RT_OS_WINDOWS) || defined(RT_OS_DARWIN)
+#  ifdef _MSC_VER
+#   define ftruncate64  _chsize
+#  else
+#   define ftruncate64  ftruncate
+#  endif
+#  define lseek64       lseek
 # endif
 #endif /* VBOX */

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_options.c

@@ -46 +46 @@
 #  include <unistd.h>
 #  include <signal.h>
+#  if defined(RT_OS_DARWIN)
+#   define open64 open
+#  endif
 # else
 #  include <io.h>

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c

@@ -8780 +8780 @@
 dtrace_difo_chunksize(dtrace_difo_t *dp, dtrace_vstate_t *vstate)
 {
-        uint64_t sval;
+        uint64_t sval VBDTGCC(0);
         dtrace_key_t tupregs[DIF_DTR_NREGS + 2]; /* +2 for thread and id */
         const dif_instr_t *text = dp->dtdo_buf;
@@ -8794 +8794 @@
                 uint_t r1 = DIF_INSTR_R1(instr);
                 uint_t nkeys = 0;
-                uchar_t scope;
+                uchar_t scope VBDTGCC(0);
 
                 dtrace_key_t *key = tupregs;