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.

3 files changed, 5 insertions, 8 deletions

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 60c5e7a..6bae476 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 c3a5c27..da7824e 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 55ce9af..8b9bebc 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