From 8ea881d9e3cbaf4667f24db3fa8741392ee54437 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 29 May 2021 14:13:37 -0400 Subject: [PATCH] sim: mips: fix build w/out dv-sockser Make sure we don't fail to build when dv-socker is unavailable. --- sim/mips/ChangeLog | 6 ++++-- sim/mips/interp.c | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 0d687a9313c..f8853911b97 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,12 +1,14 @@ +2021-05-29 Mike Frysinger + + * interp.c [!HAVE_DV_SOCKSER] (sockser_addr): Define to NULL. + 2021-05-22 Faraz Shahbazker -sim/mips/ChangeLog: * interp.c (sim_open): Add shadow mappings from 32-bit address space to 64-bit sign-extended address space. 2021-05-22 Faraz Shahbazker -sim/mips/ChangeLog: * interp.c (sim_create_inferior): Only truncate sign extension bits for 32-bit target models. diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 00c1b632889..93bbc5c846c 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -543,8 +543,12 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, { /* FIXME: poking at dv-sockser internals, use tcp backend if --sockser_addr option was given.*/ +#ifdef HAVE_DV_SOCKSER extern char* sockser_addr; - if(sockser_addr == NULL) +#else +# define sockser_addr NULL +#endif + if (sockser_addr == NULL) sim_hw_parse (sd, "/tx3904sio@0xfffff300/backend stdio"); else sim_hw_parse (sd, "/tx3904sio@0xfffff300/backend tcp"); -- 2.30.2