X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configure.ac;h=dbf50c94cb5e52879c1cbb75d29e550f919cf589;hb=8c19757cf59d6f10fa5c79edf856ad2c79f92cc8;hp=42aa63458da5f911ae6a50e6c73765c77117eabb;hpb=77452a26e7d95d29dbaa797595ae683f03a3345b;p=riscv-isa-sim.git

diff --git a/configure.ac b/configure.ac
index 42aa634..dbf50c9 100644
--- 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-isa-run])
+m4_define( proj_abbreviation, [spike])
 
 #-------------------------------------------------------------------------
 # Project version information
@@ -37,6 +37,7 @@ m4_define( proj_version, [?])
 #-------------------------------------------------------------------------
 
 AC_INIT(proj_name,proj_version,proj_maintainer,proj_abbreviation)
+AC_LANG_CPLUSPLUS
 AC_CONFIG_SRCDIR([riscv/common.h])
 AC_CONFIG_AUX_DIR([scripts])
 AC_CANONICAL_BUILD
@@ -51,6 +52,8 @@ AC_PROG_CXX
 AC_CHECK_TOOL([AR],[ar])
 AC_CHECK_TOOL([RANLIB],[ranlib])
 
+AC_C_BIGENDIAN(AC_MSG_ERROR([Spike requires a little-endian host]))
+
 #-------------------------------------------------------------------------
 # MCPPBS specific program checks
 #-------------------------------------------------------------------------
@@ -59,7 +62,6 @@ AC_CHECK_TOOL([RANLIB],[ranlib])
 # via the makefile.
 
 MCPPBS_PROG_INSTALL
-MCPPBS_PROG_RUN
 
 #-------------------------------------------------------------------------
 # Checks for header files
@@ -71,8 +73,8 @@ AC_HEADER_STDC
 # Default compiler flags
 #-------------------------------------------------------------------------
 
-AC_SUBST([CFLAGS],  ["-Wall -O2"])
-AC_SUBST([CXXFLAGS],["-Wall -O2 -Wno-pmf-conversions"])
+AC_SUBST([CFLAGS],  ["-Wall -Wno-unused -g -O2"])
+AC_SUBST([CXXFLAGS],["-Wall -Wno-unused -g -O2 -std=c++11"])
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject list
@@ -81,7 +83,7 @@ AC_SUBST([CXXFLAGS],["-Wall -O2 -Wno-pmf-conversions"])
 # 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, dummy_rocc, softfloat, spike_main ])
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject groups
@@ -100,4 +102,9 @@ MCPPBS_SUBPROJECTS([ riscv, softfloat, softfloat_riscv ])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([riscv-spike.pc])
+AC_CONFIG_FILES([riscv-riscv.pc])
+AC_CONFIG_FILES([riscv-softfloat.pc])
+AC_CONFIG_FILES([riscv-dummy_rocc.pc])
+AC_CONFIG_FILES([riscv-spike_main.pc])
 AC_OUTPUT