Disasm now translates xor x0,x0,x0 as a machine-generated bubble ("-").

[riscv-isa-sim.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 60abb71e59ee0b879f3620a6578b01c944042d76..ce84dc539e729ca799c38da3febfbd8f6663e8a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 m4_define( proj_name,         [RISC-V ISA Simulator])
 m4_define( proj_maintainer,   [Andrew Waterman])
-m4_define( proj_abbreviation, [riscv-sim-isa])
+m4_define( proj_abbreviation, [spike])
 
 #-------------------------------------------------------------------------
 # Project version information
@@ -36,6 +36,7 @@ m4_define( proj_version, [?])
 # Setup
 #-------------------------------------------------------------------------
 
+AC_LANG_CPLUSPLUS
 AC_INIT(proj_name,proj_version,proj_maintainer,proj_abbreviation)
 AC_CONFIG_SRCDIR([riscv/common.h])
 AC_CONFIG_AUX_DIR([scripts])
@@ -71,8 +72,8 @@ AC_HEADER_STDC
 # Default compiler flags
 #-------------------------------------------------------------------------
 
-AC_SUBST([CFLAGS],  ["-Wall -O2"])
-AC_SUBST([CXXFLAGS],["-Wall -O2"])
+AC_SUBST([CFLAGS],  ["-Wall -O2 -Wno-unused"])
+AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++11"])
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject list
@@ -81,7 +82,7 @@ AC_SUBST([CXXFLAGS],["-Wall -O2"])
 # The '*' suffix indicates an optional subproject. The '**' suffix
 # indicates an optional subproject which is also the name of a group.
 
-MCPPBS_SUBPROJECTS([ riscv, softfloat, softfloat_riscv ])
+MCPPBS_SUBPROJECTS([ riscv, hwacha, softfloat, spike ])
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject groups