Message ID | 20180510092935.29088-1-laurent@vivier.eu |
---|---|
State | New |
Headers | show |
Series | linux-user: move thunk.c to linux-user/ | expand |
On 10 May 2018 at 10:29, Laurent Vivier <laurent@vivier.eu> wrote: > thunk.c is part of linux-user and only used by it, > so move it to the linux-user directory. > > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > --- > Makefile.target | 2 +- > linux-user/Makefile.objs | 2 +- > thunk.c => linux-user/thunk.c | 0 > 3 files changed, 2 insertions(+), 2 deletions(-) > rename thunk.c => linux-user/thunk.c (100%) bsd-user doesn't use it now, but I have a feeling maybe the currently-out-of-tree improvements do? thanks -- PMM
Le 10/05/2018 à 11:35, Peter Maydell a écrit : > On 10 May 2018 at 10:29, Laurent Vivier <laurent@vivier.eu> wrote: >> thunk.c is part of linux-user and only used by it, >> so move it to the linux-user directory. >> >> Signed-off-by: Laurent Vivier <laurent@vivier.eu> >> --- >> Makefile.target | 2 +- >> linux-user/Makefile.objs | 2 +- >> thunk.c => linux-user/thunk.c | 0 >> 3 files changed, 2 insertions(+), 2 deletions(-) >> rename thunk.c => linux-user/thunk.c (100%) > > bsd-user doesn't use it now, but I have a feeling maybe > the currently-out-of-tree improvements do? Yes, you're right, I've found it in https://github.com/seanbruno/qemu-bsd-user/blob/bsd-user/bsd-user/bsd-ioctl.c Thanks, Laurent
diff --git a/Makefile.target b/Makefile.target index d0ec77a307..98f25c91c7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -112,7 +112,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 +obj-y += gdbstub.o endif #CONFIG_LINUX_USER diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs index 59a5c17354..1fc1dd2762 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs @@ -1,7 +1,7 @@ obj-y = main.o syscall.o strace.o mmap.o signal.o \ elfload.o linuxload.o uaccess.o uname.o \ safe-syscall.o $(TARGET_ABI_DIR)/signal.o \ - $(TARGET_ABI_DIR)/cpu_loop.o + $(TARGET_ABI_DIR)/cpu_loop.o thunk.o obj-$(TARGET_HAS_BFLT) += flatload.o obj-$(TARGET_I386) += vm86.o diff --git a/thunk.c b/linux-user/thunk.c similarity index 100% rename from thunk.c rename to linux-user/thunk.c
thunk.c is part of linux-user and only used by it, so move it to the linux-user directory. Signed-off-by: Laurent Vivier <laurent@vivier.eu> --- Makefile.target | 2 +- linux-user/Makefile.objs | 2 +- thunk.c => linux-user/thunk.c | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename thunk.c => linux-user/thunk.c (100%)