summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/common/ChangeLog5
-rw-r--r--sim/common/sim-syscall.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index e59ee0148a5..01ee122b019 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-18 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * sim-syscall.c (sim_syscall_multi): Don't update sc->errcode at
+ this point, it should have already been set in cb_syscall.
+
2018-10-05 Stafford Horne <shorne@gmail.com>
* cgen-ops.h (ADDCFDI): New function, add carry flag DI variant.
diff --git a/sim/common/sim-syscall.c b/sim/common/sim-syscall.c
index 7923160cb7f..34d2f0ec115 100644
--- a/sim/common/sim-syscall.c
+++ b/sim/common/sim-syscall.c
@@ -97,11 +97,6 @@ sim_syscall_multi (SIM_CPU *cpu, int func, long arg1, long arg2, long arg3,
if (cb_target_to_host_syscall (cb, func) == CB_SYS_exit)
sim_engine_halt (sd, cpu, NULL, sim_pc_get (cpu), sim_exited, arg1);
- else if (sc.result == -1)
- {
- cb->last_errno = errno;
- sc.errcode = cb->get_errno (cb);
- }
*result = sc.result;
*result2 = sc.result2;