----- Original Message ----- > From: "Philippe Mathieu-Daudé" <f4...@amsat.org> > To: "Paolo Bonzini" <pbonz...@redhat.com>, "Richard Henderson" > <r...@twiddle.net>, "Peter Crosthwaite" > <crosthwaite.pe...@gmail.com>, "Thomas Huth" <th...@redhat.com> > Cc: "Philippe Mathieu-Daudé" <f4...@amsat.org>, qemu-devel@nongnu.org > Sent: Monday, September 11, 2017 11:33:26 PM > Subject: [PATCH v2 3/5] tcg: move tcg-runtime to accel/tcg/ > > Suggested-by: Paolo Bonzini <pbonz...@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
To make this better, the "#ifndef CONFIG_SOFTMMU" part at the end of this should be moved to user-exec.c. Feel free to just post a sixth patch for it. Paolo > --- > Makefile.target | 2 +- > {tcg => accel/tcg}/tcg-runtime.h | 0 > {tcg => accel/tcg}/tcg-runtime.c | 0 > accel/tcg/Makefile.objs | 1 + > 4 files changed, 2 insertions(+), 1 deletion(-) > rename {tcg => accel/tcg}/tcg-runtime.h (100%) > rename {tcg => accel/tcg}/tcg-runtime.c (100%) > > diff --git a/Makefile.target b/Makefile.target > index 520305b025..6361f957fb 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -94,7 +94,7 @@ all: $(PROGS) stap > obj-y += exec.o > obj-y += accel/ > obj-$(CONFIG_TCG) += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o > -obj-$(CONFIG_TCG) += tcg/tcg-common.o tcg/tcg-runtime.o > +obj-$(CONFIG_TCG) += tcg/tcg-common.o > obj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o > obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o > obj-y += fpu/softfloat.o > diff --git a/tcg/tcg-runtime.h b/accel/tcg/tcg-runtime.h > similarity index 100% > rename from tcg/tcg-runtime.h > rename to accel/tcg/tcg-runtime.h > diff --git a/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c > similarity index 100% > rename from tcg/tcg-runtime.c > rename to accel/tcg/tcg-runtime.c > diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs > index f2422d0fb3..228cd84fa4 100644 > --- a/accel/tcg/Makefile.objs > +++ b/accel/tcg/Makefile.objs > @@ -1,5 +1,6 @@ > obj-$(CONFIG_SOFTMMU) += tcg-all.o > obj-$(CONFIG_SOFTMMU) += cputlb.o > +obj-y += tcg-runtime.o > obj-y += cpu-exec.o cpu-exec-common.o translate-all.o > obj-y += translator.o > > -- > 2.14.1 > >