diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rwxr-xr-x | opcodes/configure | 14 | ||||
| -rw-r--r-- | opcodes/configure.ac | 14 |
3 files changed, 26 insertions, 8 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 753be9f..5588e4b 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,11 @@ 2018-12-06 Andrew Burgess <andrew.burgess@embecosm.com> + * configure.ac (enable-cgen-maint): Support passing path to cgen + source tree. + * configure: Regenerate. + +2018-12-06 Andrew Burgess <andrew.burgess@embecosm.com> + * disassembler.c (disassemble_init_for_target): Add RISC-V initialisation. * riscv-dis.c (riscv_symbol_is_valid): New function. diff --git a/opcodes/configure b/opcodes/configure index 389e551..eb74324 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -12574,11 +12574,17 @@ if test "${enable_cgen_maint+set}" = set; then : yes) cgen_maint=yes ;; no) cgen_maint=no ;; *) - # argument is cgen install directory (not implemented yet). - # Having a `share' directory might be more appropriate for the .scm, - # .cpu, etc. files. + # Argument is a directory where cgen can be found. In some + # future world cgen could be installable, but right now this + # is not the case. Instead we assume the directory is a path + # to the cgen source tree. cgen_maint=yes - cgendir=${cgen_maint}/lib/cgen + if test -r ${enableval}/iformat.scm; then + # This looks like a cgen source tree. + cgendir=${enableval} + else + as_fn_error $? "${enableval} doesn't look like a cgen source tree" "$LINENO" 5 + fi ;; esac fi diff --git a/opcodes/configure.ac b/opcodes/configure.ac index 4c36983..7384684 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -109,11 +109,17 @@ AC_ARG_ENABLE(cgen-maint, yes) cgen_maint=yes ;; no) cgen_maint=no ;; *) - # argument is cgen install directory (not implemented yet). - # Having a `share' directory might be more appropriate for the .scm, - # .cpu, etc. files. + # Argument is a directory where cgen can be found. In some + # future world cgen could be installable, but right now this + # is not the case. Instead we assume the directory is a path + # to the cgen source tree. cgen_maint=yes - cgendir=${cgen_maint}/lib/cgen + if test -r ${enableval}/iformat.scm; then + # This looks like a cgen source tree. + cgendir=${enableval} + else + AC_MSG_ERROR(${enableval} doesn't look like a cgen source tree) + fi ;; esac])dnl AM_CONDITIONAL(CGEN_MAINT, test x${cgen_maint} = xyes) |