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.
diff --git a/sim/common/dv-sockser.c b/sim/common/dv-sockser.c
index 99f280c..7950943 100644
--- a/sim/common/dv-sockser.c
+++ b/sim/common/dv-sockser.c
@@ -40,10 +40,6 @@
#include <sys/select.h>
#include <sys/socket.h>
-#ifndef __CYGWIN32__
-#include <netinet/tcp.h>
-#endif
-
#include "sim-main.h"
#include "sim-assert.h"
#include "sim-options.h"
@@ -198,6 +194,7 @@
/* 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 @@
if (orig != SIG_DFL && orig != SIG_IGN)
signal (SIGPIPE, orig);
}
+#endif
return SIM_RC_OK;
}
@@ -276,6 +274,7 @@
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 @@
sockser_fd = -1;
return 0;
}
+#endif
return 1;
}
diff --git a/sim/configure b/sim/configure
index 44b34e7..8a38f2e 100755
--- a/sim/configure
+++ b/sim/configure
@@ -14439,16 +14439,8 @@
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 ed53cd2..1d00d2e 100644
--- a/sim/m4/sim_ac_option_hardware.m4
+++ b/sim/m4/sim_ac_option_hardware.m4
@@ -26,16 +26,11 @@
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
