From 25d6223cc9bcff9dabef5fcfe1c589fdfddce6d7 Mon Sep 17 00:00:00 2001
From: tehzz <tehzz@users.noreply.github.com>
Date: Sat, 9 May 2020 18:46:44 -0400
Subject: [PATCH] get darwin qemu-irix to compile

---
 Makefile.objs             | 1 +
 darwin-user/signal.c      | 2 --
 darwin-user/trace-events  | 2 +-
 target/mips/irix_helper.c | 4 ++++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index d8b44a2d3c..44f4c13e40 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -245,6 +245,7 @@ trace-events-subdirs += target/s390x
 trace-events-subdirs += target/ppc
 trace-events-subdirs += qom
 trace-events-subdirs += linux-user
+trace-events-subdirs += darwin-user
 trace-events-subdirs += qapi
 trace-events-subdirs += accel/tcg
 trace-events-subdirs += accel/kvm
diff --git a/darwin-user/signal.c b/darwin-user/signal.c
index a04717af54..fc44c967d2 100644
--- a/darwin-user/signal.c
+++ b/darwin-user/signal.c
@@ -594,7 +594,6 @@ static void QEMU_NORETURN dump_core_and_abort(CPUArchState *env, int target_sig)
     struct sigaction act;
 
     host_sig = target_to_host_signal(target_sig);
-    // TODO: why isn't this function defined anywhere? macro?
     trace_user_force_sig(env, target_sig, host_sig);
     gdb_signalled(env, target_sig);
 
@@ -647,7 +646,6 @@ int queue_signal(CPUArchState *env, int sig, int si_type,
     CPUState *cpu = ENV_GET_CPU(env);
     TaskState *ts = cpu->opaque;
 
-    /* is this a real function? */
     trace_user_queue_signal(env, sig);
 
     info->si_code = deposit32(info->si_code, 16, 16, si_type);
diff --git a/darwin-user/trace-events b/darwin-user/trace-events
index 68f36ac8fd..2857757f57 100644
--- a/darwin-user/trace-events
+++ b/darwin-user/trace-events
@@ -1,6 +1,6 @@
 # See docs/devel/tracing.txt for syntax documentation.
 
-# linux-user/signal.c
+# darwin-user/signal.c
 user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
 user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
 user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
diff --git a/target/mips/irix_helper.c b/target/mips/irix_helper.c
index c14f0924fc..1e12ebee5e 100644
--- a/target/mips/irix_helper.c
+++ b/target/mips/irix_helper.c
@@ -25,7 +25,11 @@
 
 #ifdef TARGET_ABI_IRIX
 /* argh, ugly! need TaskState here to access PRDA storage */
+#ifdef CONFIG_DARWIN_USER
+#include <darwin-user/qemu.h>
+#else
 #include <linux-user/qemu.h>
+#endif
 
 #define DEBUG(x)    //x