diff options
| author | Alan Modra <amodra@gmail.com> | 2023-08-10 11:12:39 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-08-19 12:41:32 +0930 |
| commit | e7ad52cde6c8bb7e592ce60cdfe508cd00c3db11 (patch) | |
| tree | accce7c87b4d25aacf910826197cf1cb26f1e4f6 /opcodes | |
| parent | 0e1b3420fbb2a3022a1ceac49ce37af3e59d0856 (diff) | |
| download | binutils-e7ad52cde6c8bb7e592ce60cdfe508cd00c3db11.zip binutils-e7ad52cde6c8bb7e592ce60cdfe508cd00c3db11.tar.gz binutils-e7ad52cde6c8bb7e592ce60cdfe508cd00c3db11.tar.bz2 | |
sim --enable-cgen-maint
I had reason yesterday to want to regenerate configury files which I
do with --enable-maintainer-mode, and added --enable-cgen-maint
accidentally. The first problem I hit is that sim looks for cgen in a
different directory by default than opcodes, and I had my source
layout set up for opcodes rather than sim. Fix that by making both
use ../cgen first, then ../../cgen relative to sim/ and opcodes/. The
next problem was that various sim local.mk files expected generated
sources in the build dir rather than the source dir. Fix that by
adding $(srcdir) to paths. Finally, the generated iq2000 files had a
compile error, fixed by the cpu/iq2000.cpu patch.
cpu/
* iq2000.cpu (syscall): Add pc arg.
opcodes/
* configure.ac (cgendir): Default to ../../cgen, but use ../cgen
if found there.
* configure: Regenerate.
sim/m4/
* sim_ac_option_cgen_maint.m4 (cgendir): Look in ../cgen too.
sim/
* cris/local.mk: Add $(srcdir) to paths for regenerated source.
* frv/local.mk: Likewise.
* iq2000/local.mk: Likewise.
* lm32/local.mk: Likewise.
* m32r/local.mk: Likewise.
* or1k/local.mk: Likewise.
* Makefile.in: Regenerate.
* configure: Regenerate.
Diffstat (limited to 'opcodes')
| -rwxr-xr-x | opcodes/configure | 5 | ||||
| -rw-r--r-- | opcodes/configure.ac | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/opcodes/configure b/opcodes/configure index 69a1feb..a65b0a2 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -12251,7 +12251,10 @@ $as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h fi cgen_maint=no -cgendir='$(srcdir)/../cgen' +cgendir='$(srcdir)/../../cgen' +if test -r ${srcdir}/../cgen/iformat.scm; then + cgendir='$(srcdir)/../cgen' +fi # Check whether --enable-cgen-maint was given. if test "${enable_cgen_maint+set}" = set; then : diff --git a/opcodes/configure.ac b/opcodes/configure.ac index ac4921f..cae2a67 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -112,7 +112,10 @@ if test $bfd_cv_func_sigsetjmp = yes; then fi cgen_maint=no -cgendir='$(srcdir)/../cgen' +cgendir='$(srcdir)/../../cgen' +if test -r ${srcdir}/../cgen/iformat.scm; then + cgendir='$(srcdir)/../cgen' +fi AC_ARG_ENABLE(cgen-maint, [ --enable-cgen-maint[=dir] build cgen generated files], |