Changeset 73510 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace

Timestamp:

Aug 5, 2018 2:18:50 PM (6 years ago)

Author:

vboxsync

Message:

VBoxDTrace: GCC 8.2.0 fixes

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv

Files:

• lib/libdtrace/common/dt_consume.c (modified) (1 diff)
• uts/common/dtrace/dtrace.c (modified) (4 diffs)

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

@@ -2268 +2268 @@
 
         if (pf == NULL)
-                pf = (dtrace_consume_probe_f *)dt_nullprobe;
+                pf = (dtrace_consume_probe_f *)(uintptr_t)dt_nullprobe;
 
         if (rf == NULL)
-                rf = (dtrace_consume_rec_f *)dt_nullrec;
+                rf = (dtrace_consume_rec_f *)(uintptr_t)dt_nullrec;
 
         if (buf->dtbd_data == NULL) {

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

@@ -317 +317 @@
         (void (*)(void *, const dtrace_probedesc_t *))dtrace_nullop,
         (void (*)(void *, struct modctl *))dtrace_nullop,
-        (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop,
+        (int (*)(void *, dtrace_id_t, void *))(uintptr_t)dtrace_enable_nullop,
         (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
         (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
@@ -7383 +7383 @@
 
         if (old->dtpv_pops.dtps_enable ==
-            (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop) {
+            (int (*)(void *, dtrace_id_t, void *))(uintptr_t)dtrace_enable_nullop) {
                 /*
                  * If DTrace itself is the provider, we're called with locks
@@ -7533 +7533 @@
 
         ASSERT(pvp->dtpv_pops.dtps_enable !=
-            (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop);
+            (int (*)(void *, dtrace_id_t, void *))(uintptr_t)dtrace_enable_nullop);
 
         mutex_enter(&dtrace_provider_lock);
@@ -7574 +7574 @@
          */
         ASSERT(prov->dtpv_pops.dtps_enable !=
-            (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop);
+            (int (*)(void *, dtrace_id_t, void *))(uintptr_t)dtrace_enable_nullop);
 
         mutex_enter(&dtrace_provider_lock);