diff options
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/Makefile.am | 3 | ||||
| -rw-r--r-- | opcodes/Makefile.in | 3 | ||||
| -rw-r--r-- | sim/common/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 3 |
5 files changed, 17 insertions, 3 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 1205dbfa95f..b3d73dcd4ae 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,5 +1,11 @@ 2021-07-01 Mike Frysinger <vapier@gentoo.org> + * Makefile.am (GUILE): New variable. + (CGEN): Use $(GUILE). + * Makefile.in: Regenerate. + +2021-07-01 Mike Frysinger <vapier@gentoo.org> + * mep-asm.c (macros): Mark static & const. (lookup_macro): Change return & m to const. (expand_macro): Change mac to const. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index ddae8bd9052..0e04b4c05c4 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -363,7 +363,8 @@ CLEANFILES = \ CGENDIR = @cgendir@ CPUDIR = $(srcdir)/../cpu -CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s" +GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` +CGEN = "$(GUILE) -l ${cgendir}/guile.scm -s" CGENFLAGS = -v CGENDEPS = \ diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 23a52bcd69a..42c15f00d30 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -722,7 +722,8 @@ CLEANFILES = \ CGENDIR = @cgendir@ CPUDIR = $(srcdir)/../cpu -CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s" +GUILE = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` +CGEN = "$(GUILE) -l ${cgendir}/guile.scm -s" CGENFLAGS = -v CGENDEPS = \ $(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm \ diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 5b167eb89ae..37d4dc99e92 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2021-07-01 Mike Frysinger <vapier@gentoo.org> + + * Make-common.in (GUILE): New variable. + (CGEN): Use $(GUILE). + 2021-06-30 Mike Frysinger <vapier@gentoo.org> * Make-common.in (SIM_SCACHE): Delete. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index e7c1cce46f4..a02f529b385 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -542,7 +542,8 @@ Makefile: Makefile.in $(srccom)/Make-common.in $(config.status) # CGEN support -CGEN = "`if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` -l $(CGENDIR)/guile.scm -s" +GUILE = `if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` +CGEN = "$(GUILE) -l $(CGENDIR)/guile.scm -s" CGENFLAGS = -v CGEN_CPU_DIR = $(CGENDIR)/cpu |