From 03de8f26e8286f6160a9fcd6b082893ed850e8fa Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 29 May 2021 17:17:40 -0400 Subject: [PATCH] sim: dv-sockser: enable for mingw targets too We have enough functionality from gnulib now to build sockser on all platforms. Non-blocking I/O is supported when F_GETFL/F_SETFL are unavailable, but we can address that in a follow up commit. This mirrors what is done in other places in the sim already. --- sim/common/dv-sockser.c | 8 ++++---- sim/configure | 12 ++---------- sim/m4/sim_ac_option_hardware.m4 | 15 +++++---------- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/sim/common/dv-sockser.c b/sim/common/dv-sockser.c index 99f280cd1a7..7950943d366 100644 --- a/sim/common/dv-sockser.c +++ b/sim/common/dv-sockser.c @@ -40,10 +40,6 @@ along with this program. If not, see . */ #include #include -#ifndef __CYGWIN32__ -#include -#endif - #include "sim-main.h" #include "sim-assert.h" #include "sim-options.h" @@ -198,6 +194,7 @@ dv_sockser_init (SIM_DESC sd) /* Handle writes to missing client -> SIGPIPE. ??? Need a central signal management module. */ +#ifdef SIGPIPE { RETSIGTYPE (*orig) (); orig = signal (SIGPIPE, SIG_IGN); @@ -205,6 +202,7 @@ dv_sockser_init (SIM_DESC sd) if (orig != SIG_DFL && orig != SIG_IGN) signal (SIGPIPE, orig); } +#endif return SIM_RC_OK; } @@ -276,6 +274,7 @@ connected_p (SIM_DESC sd) return 0; /* Set non-blocking i/o. */ +#ifdef F_GETFL flags = fcntl (sockser_fd, F_GETFL); flags |= O_NONBLOCK | O_NDELAY; if (fcntl (sockser_fd, F_SETFL, flags) == -1) @@ -285,6 +284,7 @@ connected_p (SIM_DESC sd) sockser_fd = -1; return 0; } +#endif return 1; } diff --git a/sim/configure b/sim/configure index 44b34e7bc60..8a38f2e980a 100755 --- a/sim/configure +++ b/sim/configure @@ -14439,16 +14439,8 @@ if test "$enable_sim_hardware" = no; then sim_hw_cflags="-DWITH_HW=0" elif test "$enable_sim_hardware" = yes; then sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac + sim_hw_sockser="dv-sockser.o" + sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" else as_fn_error $? "unknown argument \"$enable_sim_hardware\"" "$LINENO" 5 fi diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4 index ed53cd2f120..1d00d2ee489 100644 --- a/sim/m4/sim_ac_option_hardware.m4 +++ b/sim/m4/sim_ac_option_hardware.m4 @@ -26,16 +26,11 @@ if test "$enable_sim_hardware" = no; then sim_hw_cflags="-DWITH_HW=0" elif test "$enable_sim_hardware" = yes; then sim_hw_cflags="-DWITH_HW=1" - # mingw does not support sockser - case ${host} in - *mingw*) ;; - *) # TODO: We don't add dv-sockser to sim_hw as it is not a "real" device - # that you instatiate. Instead, other code will call into it directly. - # At some point, we should convert it over. - sim_hw_sockser="dv-sockser.o" - sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" - ;; - esac + dnl TODO: We don't add dv-sockser to sim_hw as it is not a "real" device + dnl that you instatiate. Instead, other code will call into it directly. + dnl At some point, we should convert it over. + sim_hw_sockser="dv-sockser.o" + sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER" else AC_MSG_ERROR([unknown argument "$enable_sim_hardware"]) fi -- 2.30.2