From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 7 Jul 2021 06:08:47 +0000 (-0400)
Subject: sim: frv: resolve syscalls dynamically
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=96537189c92734cad48c95de00d3cd167ad7092d;p=binutils-gdb.git

sim: frv: resolve syscalls dynamically

Avoid use of TARGET_<syscall> defines and rely on the callback layers
to resolve these dynamically so we can support multiple syscall layers
instead of assuming the newlib/libgloss numbers all the time.
---

diff --git a/sim/frv/traps.c b/sim/frv/traps.c
index 59f1a25f5f1..2d44adcf383 100644
--- a/sim/frv/traps.c
+++ b/sim/frv/traps.c
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define WANT_CPU_FRVBF
 
 #include "sim-main.h"
-#include "targ-vals.h"
 #include "cgen-engine.h"
 #include "cgen-par.h"
 #include "sim-fpu.h"
@@ -134,7 +133,7 @@ frv_itrap (SIM_CPU *current_cpu, PCADDR pc, USI base, SI offset)
 	s.arg2 = GET_H_GR (9);
 	s.arg3 = GET_H_GR (10);
 
-	if (s.func == TARGET_SYS_exit)
+	if (cb_target_to_host_syscall (cb, s.func) == CB_SYS_exit)
 	  {
 	    sim_engine_halt (sd, current_cpu, NULL, pc, sim_exited, s.arg1);
 	  }