@@ -119,7 +119,7 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
-I$(SRC_PATH)/linux-user
obj-y += linux-user/
-obj-y += gdbstub.o thunk.o user-exec.o user-exec-stub.o
+obj-y += gdbstub.o thunk.o
endif #CONFIG_LINUX_USER
@@ -132,7 +132,7 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \
-I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR)
obj-y += bsd-user/
-obj-y += gdbstub.o user-exec.o user-exec-stub.o
+obj-y += gdbstub.o
endif #CONFIG_BSD_USER
similarity index 100%
rename from user-exec-stub.c
rename to accel/tcg/user-exec-stub.c
similarity index 100%
rename from user-exec.c
rename to accel/tcg/user-exec.c
@@ -1602,8 +1602,7 @@ Overall
M: Riku Voipio <riku.voipio@iki.fi>
S: Maintained
F: thunk.c
-F: user-exec.c
-F: user-exec-stub.c
+F: accel/tcg/user-exec*.c
BSD user
S: Orphan
@@ -2,3 +2,6 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o
obj-$(CONFIG_SOFTMMU) += cputlb.o
obj-y += cpu-exec.o cpu-exec-common.o translate-all.o
obj-y += translator.o
+
+obj-$(CONFIG_USER_ONLY) += user-exec.o
+obj-$(call lnot,$(CONFIG_SOFTMMU)) += user-exec-stub.o
Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- Makefile.target | 4 ++-- user-exec-stub.c => accel/tcg/user-exec-stub.c | 0 user-exec.c => accel/tcg/user-exec.c | 0 MAINTAINERS | 3 +-- accel/tcg/Makefile.objs | 3 +++ 5 files changed, 6 insertions(+), 4 deletions(-) rename user-exec-stub.c => accel/tcg/user-exec-stub.c (100%) rename user-exec.c => accel/tcg/user-exec.c (100%)