From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 24 Sep 2018 06:18:50 +0000 (+0100)
Subject: add #define for SPIKE_SIMPLEV, re-run autoreconf
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d9731f3be77cde5d3cd89bd688801ea5c88b3bac;p=riscv-isa-sim.git

add #define for SPIKE_SIMPLEV, re-run autoreconf
---

diff --git a/config.h.in b/config.h.in
index 137f195..2981620 100644
--- a/config.h.in
+++ b/config.h.in
@@ -84,6 +84,9 @@
 /* Define if subproject MCPPBS_SPROJ_NORM is enabled */
 #undef SPIKE_MAIN_ENABLED
 
+/* Defined to 1 if SimpleV support is wanted */
+#undef SPIKE_SIMPLEV
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff --git a/configure b/configure
index 015f63e..4111fca 100755
--- a/configure
+++ b/configure
@@ -700,6 +700,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_stow
+enable_simplev
 enable_optional_subprojects
 with_isa
 with_fesvr
@@ -1347,6 +1348,7 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-stow           Enable stow-based install
+  --disable-simplev       Support for SimpleV (default enabled)
   --enable-optional-subprojects
                           Enable all optional subprojects
   --enable-commitlog      Enable commit log generation
@@ -4396,6 +4398,27 @@ CFLAGS="-Wall -Wno-unused -g -O2"
 CXXFLAGS="-Wall -Wno-unused -g -O2 -std=c++11"
 
 
+#-------------------------------------------------------------------------
+# Enable Simple-V
+#-------------------------------------------------------------------------
+
+simplev="no"
+
+# Check whether --enable-simplev was given.
+if test "${enable_simplev+set}" = set; then :
+  enableval=$enable_simplev; simplev=$enableval
+else
+  simplev=yes
+
+fi
+
+if test "x$simplev" = xyes; then
+
+$as_echo "#define SPIKE_SIMPLEV 1" >>confdefs.h
+
+fi
+AM_CONDITIONAL(HAS_SIMPLEV, test x$simplev = xyes)
+
 #-------------------------------------------------------------------------
 # MCPPBS subproject list
 #-------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index e361877..d80ab84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,22 @@ AC_HEADER_STDC
 AC_SUBST([CFLAGS],  ["-Wall -Wno-unused -g -O2"])
 AC_SUBST([CXXFLAGS],["-Wall -Wno-unused -g -O2 -std=c++11"])
 
+#-------------------------------------------------------------------------
+# Enable Simple-V
+#-------------------------------------------------------------------------
+
+simplev="no"
+
+AC_ARG_ENABLE([simplev],
+    [AC_HELP_STRING([--disable-simplev],[Support for SimpleV (default enabled)])],
+    [simplev=$enableval],
+    [simplev=yes]
+    )
+if test "x$simplev" = xyes; then
+    AC_DEFINE([SPIKE_SIMPLEV], [1], [Defined to 1 if SimpleV support is wanted])
+fi
+AM_CONDITIONAL([HAS_SIMPLEV], [test x$simplev = xyes])
+
 #-------------------------------------------------------------------------
 # MCPPBS subproject list
 #-------------------------------------------------------------------------