diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-09-11 18:33:25 -0300 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2017-09-17 06:52:19 -0700 |
| commit | 58410666688690ae2bd1acb2b31c0ba8661b83d1 (patch) | |
| tree | 41135cd9088829d1cad5b1adbe25df5d3338402d | |
| parent | da1849c1eba50aa372f87c7945d7b230eb2b2fb2 (diff) | |
accel/tcg: move user-exec to accel/tcg/
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170911213328.9701-3-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | Makefile.target | 4 | ||||
| -rw-r--r-- | accel/tcg/Makefile.objs | 3 | ||||
| -rw-r--r-- | accel/tcg/user-exec-stub.c (renamed from user-exec-stub.c) | 0 | ||||
| -rw-r--r-- | accel/tcg/user-exec.c (renamed from user-exec.c) | 0 |
5 files changed, 6 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2127bb241a..4bd1797330 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1603,8 +1603,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 diff --git a/Makefile.target b/Makefile.target index 7f42c45db8..520305b025 100644 --- a/Makefile.target +++ b/Makefile.target @@ -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 diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index 22642e6f75..f2422d0fb3 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -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 diff --git a/user-exec-stub.c b/accel/tcg/user-exec-stub.c index dbcf1ade9c..dbcf1ade9c 100644 --- a/user-exec-stub.c +++ b/accel/tcg/user-exec-stub.c diff --git a/user-exec.c b/accel/tcg/user-exec.c index 2a975eaf69..2a975eaf69 100644 --- a/user-exec.c +++ b/accel/tcg/user-exec.c |