summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-06-13 01:52:01 -0400
committerMike Frysinger <vapier@gentoo.org>2021-06-15 23:27:14 -0400
commitbcaa61f7c89c2b44e231ee6999cc33b04e7dd202 (patch)
treecaaff31f701e7e9a14319251e1249af0ef49998d
parentbc10b672715c935163aaca4d05cbbefeefc31b92 (diff)
downloadbinutils-gdb-bcaa61f7c89c2b44e231ee6999cc33b04e7dd202.tar.gz
sim: move dv-sockser define to CPPFLAGS
This is the only define left in m4/ that is not in the common config.h, so move it to sim_hw_cflags so we can drop the arch-specific config.h.
-rw-r--r--sim/ChangeLog5
-rw-r--r--sim/aarch64/ChangeLog4
-rw-r--r--sim/aarch64/config.in3
-rwxr-xr-xsim/aarch64/configure6
-rw-r--r--sim/arm/ChangeLog4
-rw-r--r--sim/arm/config.in3
-rwxr-xr-xsim/arm/configure6
-rw-r--r--sim/avr/ChangeLog4
-rw-r--r--sim/avr/config.in3
-rwxr-xr-xsim/avr/configure6
-rw-r--r--sim/bfin/ChangeLog4
-rw-r--r--sim/bfin/config.in3
-rwxr-xr-xsim/bfin/configure6
-rw-r--r--sim/bpf/ChangeLog4
-rw-r--r--sim/bpf/config.in3
-rwxr-xr-xsim/bpf/configure6
-rw-r--r--sim/cr16/ChangeLog4
-rw-r--r--sim/cr16/config.in3
-rwxr-xr-xsim/cr16/configure6
-rw-r--r--sim/cris/ChangeLog4
-rw-r--r--sim/cris/config.in3
-rwxr-xr-xsim/cris/configure6
-rw-r--r--sim/d10v/ChangeLog4
-rw-r--r--sim/d10v/config.in3
-rwxr-xr-xsim/d10v/configure6
-rw-r--r--sim/erc32/ChangeLog4
-rw-r--r--sim/erc32/config.in3
-rwxr-xr-xsim/erc32/configure6
-rw-r--r--sim/example-synacor/ChangeLog4
-rw-r--r--sim/example-synacor/config.in3
-rwxr-xr-xsim/example-synacor/configure6
-rw-r--r--sim/frv/ChangeLog4
-rw-r--r--sim/frv/config.in3
-rwxr-xr-xsim/frv/configure6
-rw-r--r--sim/ft32/ChangeLog4
-rw-r--r--sim/ft32/config.in3
-rwxr-xr-xsim/ft32/configure6
-rw-r--r--sim/h8300/ChangeLog4
-rw-r--r--sim/h8300/config.in3
-rwxr-xr-xsim/h8300/configure6
-rw-r--r--sim/iq2000/ChangeLog4
-rw-r--r--sim/iq2000/config.in3
-rwxr-xr-xsim/iq2000/configure6
-rw-r--r--sim/lm32/ChangeLog4
-rw-r--r--sim/lm32/config.in3
-rwxr-xr-xsim/lm32/configure6
-rw-r--r--sim/m32c/ChangeLog4
-rw-r--r--sim/m32c/config.in3
-rwxr-xr-xsim/m32c/configure6
-rw-r--r--sim/m32r/ChangeLog4
-rw-r--r--sim/m32r/config.in3
-rwxr-xr-xsim/m32r/configure6
-rw-r--r--sim/m4/sim_ac_option_hardware.m43
-rw-r--r--sim/m68hc11/ChangeLog4
-rw-r--r--sim/m68hc11/config.in3
-rwxr-xr-xsim/m68hc11/configure6
-rw-r--r--sim/mcore/ChangeLog4
-rw-r--r--sim/mcore/config.in3
-rwxr-xr-xsim/mcore/configure6
-rw-r--r--sim/microblaze/ChangeLog4
-rw-r--r--sim/microblaze/config.in3
-rwxr-xr-xsim/microblaze/configure6
-rw-r--r--sim/mips/ChangeLog4
-rw-r--r--sim/mips/config.in3
-rwxr-xr-xsim/mips/configure6
-rw-r--r--sim/mn10300/ChangeLog4
-rw-r--r--sim/mn10300/config.in3
-rwxr-xr-xsim/mn10300/configure6
-rw-r--r--sim/moxie/ChangeLog4
-rw-r--r--sim/moxie/config.in3
-rwxr-xr-xsim/moxie/configure6
-rw-r--r--sim/msp430/ChangeLog4
-rw-r--r--sim/msp430/config.in3
-rwxr-xr-xsim/msp430/configure6
-rw-r--r--sim/or1k/ChangeLog4
-rw-r--r--sim/or1k/config.in3
-rwxr-xr-xsim/or1k/configure6
-rw-r--r--sim/pru/ChangeLog4
-rw-r--r--sim/pru/config.in3
-rwxr-xr-xsim/pru/configure6
-rw-r--r--sim/riscv/ChangeLog4
-rw-r--r--sim/riscv/config.in3
-rwxr-xr-xsim/riscv/configure6
-rw-r--r--sim/rl78/ChangeLog4
-rw-r--r--sim/rl78/config.in3
-rwxr-xr-xsim/rl78/configure6
-rw-r--r--sim/rx/ChangeLog4
-rw-r--r--sim/rx/config.in3
-rwxr-xr-xsim/rx/configure6
-rw-r--r--sim/sh/ChangeLog4
-rw-r--r--sim/sh/config.in3
-rwxr-xr-xsim/sh/configure6
-rw-r--r--sim/v850/ChangeLog4
-rw-r--r--sim/v850/config.in3
-rwxr-xr-xsim/v850/configure6
95 files changed, 161 insertions, 250 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 79e9656f36d..4f2f7da690e 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,5 +1,10 @@
2021-06-15 Mike Frysinger <vapier@gentoo.org>
+ * m4/sim_ac_option_hardware.m4: Delete AC_DEFINE_UNQUOTED call.
+ Add -DHAVE_DV_SOCKSER to sim_hw_cflags.
+
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
* Makefile.in: Regenerate.
2021-06-14 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index 20167487c07..d137c5c1ff1 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/aarch64/config.in b/sim/aarch64/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/aarch64/config.in
+++ b/sim/aarch64/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index 017c6c0068f..f34b15967b2 100755
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 0926ea9bae3..8f978fc125c 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/arm/config.in b/sim/arm/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/arm/config.in
+++ b/sim/arm/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/arm/configure b/sim/arm/configure
index 017c6c0068f..f34b15967b2 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 4d6e1b05b0b..ee70b6f8315 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/avr/config.in b/sim/avr/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/avr/config.in
+++ b/sim/avr/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/avr/configure b/sim/avr/configure
index 7cdfa3edcac..e273fb298b8 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 541eab6351f..205fe35d90d 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/bfin/config.in b/sim/bfin/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/bfin/config.in
+++ b/sim/bfin/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/bfin/configure b/sim/bfin/configure
index 1c9893303ae..c721f50a9f1 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -11302,11 +11302,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index fdbd0ee2d3b..d2b35ba623a 100644
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/bpf/config.in b/sim/bpf/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/bpf/config.in
+++ b/sim/bpf/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/bpf/configure b/sim/bpf/configure
index 55da6166cb8..0e2d157b653 100755
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -11472,11 +11472,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 6e5470f996f..74161b9c395 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/cr16/config.in b/sim/cr16/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/cr16/config.in
+++ b/sim/cr16/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/cr16/configure b/sim/cr16/configure
index 7cdfa3edcac..e273fb298b8 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 4cbd80816e2..7564c6b3637 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* traps.c: Include portability.h.
diff --git a/sim/cris/config.in b/sim/cris/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/cris/config.in
+++ b/sim/cris/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/cris/configure b/sim/cris/configure
index d830d68ffd1..bd09fa74c87 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -11361,11 +11361,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 2254eae0028..f638212b53c 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/d10v/config.in b/sim/d10v/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/d10v/config.in
+++ b/sim/d10v/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/d10v/configure b/sim/d10v/configure
index 017c6c0068f..f34b15967b2 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 0a82427cb5f..1c1023bd05b 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* interf.c (sim_open) [F_GETFL]: Only set termsave.
diff --git a/sim/erc32/config.in b/sim/erc32/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/erc32/config.in
+++ b/sim/erc32/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/erc32/configure b/sim/erc32/configure
index fe945ef5efe..0e6957edc88 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -11427,11 +11427,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog
index 88008b1a95b..d23265c520f 100644
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/example-synacor/config.in b/sim/example-synacor/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/example-synacor/config.in
+++ b/sim/example-synacor/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure
index 7cdfa3edcac..e273fb298b8 100755
--- a/sim/example-synacor/configure
+++ b/sim/example-synacor/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index c231ad1ed68..9ecca283d07 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/frv/config.in b/sim/frv/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/frv/config.in
+++ b/sim/frv/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/frv/configure b/sim/frv/configure
index 346e0bdfb1b..6fa3a413def 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -11432,11 +11432,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index a193dc376c3..87009e27f21 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/ft32/config.in b/sim/ft32/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/ft32/config.in
+++ b/sim/ft32/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/ft32/configure b/sim/ft32/configure
index 7cdfa3edcac..e273fb298b8 100755
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index d4e7cd09637..40846843ec1 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/h8300/config.in b/sim/h8300/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/h8300/config.in
+++ b/sim/h8300/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/h8300/configure b/sim/h8300/configure
index 590f5e7154a..eb58b35df6f 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index a19e06d9e80..a9f35a3222c 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/iq2000/config.in b/sim/iq2000/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/iq2000/config.in
+++ b/sim/iq2000/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 88eb6f6a85e..8be247453be 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -11411,11 +11411,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index d47e165b531..f77245d7c05 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* dv-lm32uart.c: Include sys/select.h.
diff --git a/sim/lm32/config.in b/sim/lm32/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/lm32/config.in
+++ b/sim/lm32/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/lm32/configure b/sim/lm32/configure
index 679488d42f0..f104d713356 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -11410,11 +11410,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 8d3e606b1fb..d72ed1458fc 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* mem.c: Delete HAVE_SYS_SELECT_H.
diff --git a/sim/m32c/config.in b/sim/m32c/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/m32c/config.in
+++ b/sim/m32c/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/m32c/configure b/sim/m32c/configure
index 15a737b061e..95ffabdb139 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -11286,11 +11286,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 1786c526e55..736fa36531a 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* traps-linux.c: Include portability.h.
diff --git a/sim/m32r/config.in b/sim/m32r/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/m32r/config.in
+++ b/sim/m32r/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/m32r/configure b/sim/m32r/configure
index d045b29cbee..a2252728584 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -11426,11 +11426,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/m4/sim_ac_option_hardware.m4 b/sim/m4/sim_ac_option_hardware.m4
index 75e331eb0b3..22fa993f6a3 100644
--- a/sim/m4/sim_ac_option_hardware.m4
+++ b/sim/m4/sim_ac_option_hardware.m4
@@ -55,8 +55,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
- AC_DEFINE_UNQUOTED(
- [HAVE_DV_SOCKSER], 1, [Define if dv-sockser is usable.])
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 65c1d215184..c464248ad1c 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/m68hc11/config.in b/sim/m68hc11/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/m68hc11/config.in
+++ b/sim/m68hc11/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 0236296afd3..b604a66228e 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -11235,11 +11235,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 8864c7a7ab9..c7024a7509c 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/mcore/config.in b/sim/mcore/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/mcore/config.in
+++ b/sim/mcore/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/mcore/configure b/sim/mcore/configure
index 017c6c0068f..f34b15967b2 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 892922f7ed3..cf0848499f5 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/microblaze/config.in b/sim/microblaze/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/microblaze/config.in
+++ b/sim/microblaze/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index 017c6c0068f..f34b15967b2 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 60c5e7a11eb..6bae476eac0 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/mips/config.in b/sim/mips/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/mips/config.in
+++ b/sim/mips/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/mips/configure b/sim/mips/configure
index 55ce9af3c4c..8b9bebc8173 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -11876,11 +11876,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 0083c1a433c..3919da7ca62 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete all to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/mn10300/config.in
+++ b/sim/mn10300/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 0ff47dd071f..37983fcc489 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -11315,11 +11315,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 6126b42ca00..4d08e6e9df7 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/moxie/config.in b/sim/moxie/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/moxie/config.in
+++ b/sim/moxie/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/moxie/configure b/sim/moxie/configure
index aa8c895efe8..deeb64b85fc 100755
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -11429,11 +11429,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index b00046fcd47..e4a16236111 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/msp430/config.in b/sim/msp430/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/msp430/config.in
+++ b/sim/msp430/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/msp430/configure b/sim/msp430/configure
index 7cdfa3edcac..e273fb298b8 100755
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index 2cba0f56e57..8efb43809f4 100644
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/or1k/config.in b/sim/or1k/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/or1k/config.in
+++ b/sim/or1k/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/or1k/configure b/sim/or1k/configure
index 362961efcee..efba0b10a13 100755
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -11472,11 +11472,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog
index 87bbac49bb7..56a8b760ee4 100644
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/pru/config.in b/sim/pru/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/pru/config.in
+++ b/sim/pru/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/pru/configure b/sim/pru/configure
index 7cdfa3edcac..e273fb298b8 100755
--- a/sim/pru/configure
+++ b/sim/pru/configure
@@ -11335,11 +11335,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index 9e856b2dce1..60f3452153b 100644
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_WARNINGS.
diff --git a/sim/riscv/config.in b/sim/riscv/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/riscv/config.in
+++ b/sim/riscv/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/riscv/configure b/sim/riscv/configure
index 62d524e556b..24d6db1ce6c 100755
--- a/sim/riscv/configure
+++ b/sim/riscv/configure
@@ -11429,11 +11429,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 500fe2676b3..ad4a965d060 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/rl78/config.in b/sim/rl78/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/rl78/config.in
+++ b/sim/rl78/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 15a737b061e..95ffabdb139 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -11286,11 +11286,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 35a9791a112..9137d63417c 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-13 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_EXTRA_CFLAGS): Set to @sim_cycle_accurate_flags@.
diff --git a/sim/rx/config.in b/sim/rx/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/rx/config.in
+++ b/sim/rx/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/rx/configure b/sim/rx/configure
index 151def506a7..e1befb3f814 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -11306,11 +11306,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index c44dbab7276..770f7a494f0 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/sh/config.in b/sim/sh/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/sh/config.in
+++ b/sim/sh/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/sh/configure b/sim/sh/configure
index 4d3f8cec90a..60405884a89 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -11332,11 +11332,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 0536ccb2e52..fa7048eedda 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-15 Mike Frysinger <vapier@gentoo.org>
+
+ * config.in, configure: Regenerate.
+
2021-06-12 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT.
diff --git a/sim/v850/config.in b/sim/v850/config.in
index c3a5c27da56..da7824eb77d 100644
--- a/sim/v850/config.in
+++ b/sim/v850/config.in
@@ -10,9 +10,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define if dv-sockser is usable. */
-#undef HAVE_DV_SOCKSER
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff --git a/sim/v850/configure b/sim/v850/configure
index 9e1dfa5f4dd..78d42f6a73e 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -11416,11 +11416,7 @@ else
# that you instatiate. Instead, other code will call into it directly.
# At some point, we should convert it over.
sim_hw_objs="$sim_hw_objs dv-sockser.o"
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DV_SOCKSER 1
-_ACEOF
-
+ sim_hw_cflags="$sim_hw_cflags -DHAVE_DV_SOCKSER"
;;
esac
if test x"$silent" != x"yes"; then