Fix sim build failure

On x86-64 Fedora 32, the sim was failing to build.
sim_events_schedule was passing a 'dummy' argument to
sim_events_schedule_vtracef, which caused an error because the format
parameter was NULL.  However, removing this dummy argument caused an
error because too few arguments were being passed -- catch 22.

This patch fixes the build problem by using sim_events_schedule_tracef
instead.

sim/common/ChangeLog
2021-04-22  Tom Tromey  <tom@tromey.com>

	* sim-events.c (sim_events_schedule): Use
	sim_events_schedule_tracef.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c6a0b83d01185d5a96bcfd505ba80a85709af114..119bbdab67f17049c67c5b0329d372d37ae48625 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-22  Tom Tromey  <tom@tromey.com>
+
+       * sim-events.c (sim_events_schedule): Use
+       sim_events_schedule_tracef.
+
 2021-04-22  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * callback.c (os_printf_filtered, os_vprintf_filtered,

diff --git a/sim/common/sim-events.c b/sim/common/sim-events.c
index 207c8674d168ce94ccefa0175d68fd9682282f1a..60e4c55a874cef4fe52a167d175d4a30f44cc9be 100644 (file)
--- a/sim/common/sim-events.c
+++ b/sim/common/sim-events.c
@@ -469,10 +469,7 @@ sim_events_schedule (SIM_DESC sd,
                     sim_event_handler *handler,
                     void *data)
 {
-  va_list dummy;
-  memset (&dummy, 0, sizeof dummy);
-  return sim_events_schedule_vtracef (sd, delta_time, handler, data,
-                                     NULL, dummy);
+  return sim_events_schedule_tracef (sd, delta_time, handler, data, NULL);
 }
 #endif