projects
/
riscv-isa-sim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better error message when doing DMI operations and we're busy
[riscv-isa-sim.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 94d9980b2d8fd7d0e14b01e7c433e58ba96b9e0e..ea64de74830fdd22615463e93634ecd2a146b0eb 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_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
#-------------------------------------------------------------------------
# Project version information
@@
-37,6
+37,7
@@
m4_define( proj_version, [?])
#-------------------------------------------------------------------------
AC_INIT(proj_name,proj_version,proj_maintainer,proj_abbreviation)
#-------------------------------------------------------------------------
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
AC_CONFIG_SRCDIR([riscv/common.h])
AC_CONFIG_AUX_DIR([scripts])
AC_CANONICAL_BUILD
@@
-50,6
+51,10
@@
AC_PROG_CC
AC_PROG_CXX
AC_CHECK_TOOL([AR],[ar])
AC_CHECK_TOOL([RANLIB],[ranlib])
AC_PROG_CXX
AC_CHECK_TOOL([AR],[ar])
AC_CHECK_TOOL([RANLIB],[ranlib])
+AC_PATH_PROG([DTC],[dtc])
+AC_DEFINE_UNQUOTED(DTC, ["$DTC"], [Path to the device-tree-compiler])
+
+AC_C_BIGENDIAN(AC_MSG_ERROR([Spike requires a little-endian host]))
#-------------------------------------------------------------------------
# MCPPBS specific program checks
#-------------------------------------------------------------------------
# MCPPBS specific program checks
@@
-59,7
+64,6
@@
AC_CHECK_TOOL([RANLIB],[ranlib])
# via the makefile.
MCPPBS_PROG_INSTALL
# via the makefile.
MCPPBS_PROG_INSTALL
-MCPPBS_PROG_RUN
#-------------------------------------------------------------------------
# Checks for header files
#-------------------------------------------------------------------------
# Checks for header files
@@
-71,8
+75,8
@@
AC_HEADER_STDC
# Default compiler flags
#-------------------------------------------------------------------------
# Default compiler flags
#-------------------------------------------------------------------------
-AC_SUBST([CFLAGS], ["-Wall -
O2 -Wno-unused
"])
-AC_SUBST([CXXFLAGS],["-Wall -
O2 -std=c++0x -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
#-------------------------------------------------------------------------
# MCPPBS subproject list
@@
-81,7
+85,7
@@
AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++0x -Wno-pmf-conversions"])
# The '*' suffix indicates an optional subproject. The '**' suffix
# indicates an optional subproject which is also the name of a group.
# 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
#-------------------------------------------------------------------------
# MCPPBS subproject groups
@@
-100,4
+104,9
@@
MCPPBS_SUBPROJECTS([ riscv, softfloat, softfloat_riscv ])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile])
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
AC_OUTPUT