* [PATCH] cgen: split GUILE setting out
@ 2021-06-29 1:47 Mike Frysinger
2021-06-29 9:14 ` Andrew Burgess
2021-06-30 0:03 ` Mike Frysinger
0 siblings, 2 replies; 4+ messages in thread
From: Mike Frysinger @ 2021-06-29 1:47 UTC (permalink / raw)
To: gdb-patches
This makes it easier to override to point to an older version of guile.
The current cgen code doesn't work with guile-2, so need to point to an
older guile-1.8.
---
opcodes/Makefile.am | 3 ++-
opcodes/Makefile.in | 3 ++-
sim/common/Make-common.in | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index ddae8bd9052f..0e04b4c05c4a 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 23a52bcd69ac..42c15f00d30e 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/Make-common.in b/sim/common/Make-common.in
index c203b4e1c7bf..15042e59317b 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -545,7 +545,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
--
2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] cgen: split GUILE setting out
2021-06-29 1:47 [PATCH] cgen: split GUILE setting out Mike Frysinger
@ 2021-06-29 9:14 ` Andrew Burgess
2021-06-30 0:03 ` Mike Frysinger
1 sibling, 0 replies; 4+ messages in thread
From: Andrew Burgess @ 2021-06-29 9:14 UTC (permalink / raw)
To: Mike Frysinger; +Cc: gdb-patches
* Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org> [2021-06-28 21:47:37 -0400]:
> This makes it easier to override to point to an older version of guile.
> The current cgen code doesn't work with guile-2, so need to point to an
> older guile-1.8.
I have patches to make CGEN work with guile upto v3.x, at some point I
must finish them off and get them merged....
> ---
> opcodes/Makefile.am | 3 ++-
> opcodes/Makefile.in | 3 ++-
> sim/common/Make-common.in | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
This seems reasonable to me, but the opcodes/ changes need to at least
be CC'd to the binutils list I think.
Thanks,
Andrew
>
> diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
> index ddae8bd9052f..0e04b4c05c4a 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 23a52bcd69ac..42c15f00d30e 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/Make-common.in b/sim/common/Make-common.in
> index c203b4e1c7bf..15042e59317b 100644
> --- a/sim/common/Make-common.in
> +++ b/sim/common/Make-common.in
> @@ -545,7 +545,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
>
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] cgen: split GUILE setting out
2021-06-29 1:47 [PATCH] cgen: split GUILE setting out Mike Frysinger
2021-06-29 9:14 ` Andrew Burgess
@ 2021-06-30 0:03 ` Mike Frysinger
2021-07-01 11:08 ` Nick Clifton
1 sibling, 1 reply; 4+ messages in thread
From: Mike Frysinger @ 2021-06-30 0:03 UTC (permalink / raw)
To: binutils; +Cc: gdb-patches
This makes it easier to override to point to an older version of guile.
The current cgen code doesn't work with guile-2, so need to point to an
older guile-1.8.
---
opcodes/Makefile.am | 3 ++-
opcodes/Makefile.in | 3 ++-
sim/common/Make-common.in | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index ddae8bd9052f..0e04b4c05c4a 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 23a52bcd69ac..42c15f00d30e 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/Make-common.in b/sim/common/Make-common.in
index c203b4e1c7bf..15042e59317b 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -545,7 +545,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
--
2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] cgen: split GUILE setting out
2021-06-30 0:03 ` Mike Frysinger
@ 2021-07-01 11:08 ` Nick Clifton
0 siblings, 0 replies; 4+ messages in thread
From: Nick Clifton @ 2021-07-01 11:08 UTC (permalink / raw)
To: Mike Frysinger, binutils; +Cc: gdb-patches
Hi Mike,
> This makes it easier to override to point to an older version of guile.
> The current cgen code doesn't work with guile-2, so need to point to an
> older guile-1.8.
> ---
> opcodes/Makefile.am | 3 ++-
> opcodes/Makefile.in | 3 ++-
> sim/common/Make-common.in | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
Approved - please apply - with a ChangeLog entry.
Cheers
Nick
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-01 11:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-29 1:47 [PATCH] cgen: split GUILE setting out Mike Frysinger
2021-06-29 9:14 ` Andrew Burgess
2021-06-30 0:03 ` Mike Frysinger
2021-07-01 11:08 ` Nick Clifton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).