projects
/
riscv-isa-sim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update bits to latest spec.
[riscv-isa-sim.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 89d4dcf2a56c14b9426680f085332105231b96bc..dbf50c94cb5e52879c1cbb75d29e550f919cf589 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-36,8
+36,8
@@
m4_define( proj_version, [?])
# Setup
#-------------------------------------------------------------------------
# Setup
#-------------------------------------------------------------------------
-AC_LANG_CPLUSPLUS
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
@@
-52,6
+52,8
@@
AC_PROG_CXX
AC_CHECK_TOOL([AR],[ar])
AC_CHECK_TOOL([RANLIB],[ranlib])
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
#-------------------------------------------------------------------------
#-------------------------------------------------------------------------
# MCPPBS specific program checks
#-------------------------------------------------------------------------
@@
-60,7
+62,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
@@
-72,8
+73,8
@@
AC_HEADER_STDC
# Default compiler flags
#-------------------------------------------------------------------------
# Default compiler flags
#-------------------------------------------------------------------------
-AC_SUBST([CFLAGS], ["-Wall -Wno-unused -O2"])
-AC_SUBST([CXXFLAGS],["-Wall -Wno-unused -O2 -std=c++11"])
+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
@@
-82,7
+83,7
@@
AC_SUBST([CXXFLAGS],["-Wall -Wno-unused -O2 -std=c++11"])
# 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,
hwacha, dummy_rocc, softfloat, spike
])
+MCPPBS_SUBPROJECTS([ riscv,
dummy_rocc, softfloat, spike_main
])
#-------------------------------------------------------------------------
# MCPPBS subproject groups
#-------------------------------------------------------------------------
# MCPPBS subproject groups
@@
-101,4
+102,9
@@
MCPPBS_SUBPROJECTS([ riscv, hwacha, dummy_rocc, softfloat, spike ])
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