On Tue, Nov 16, 2021 at 4:03 AM Richard Henderson <
richard.hender...@linaro.org> wrote:
> From: Warner Losh <i...@bsdimp.com>
>
> Move all the safe_syscall.inc.S files to common-user. They are almost
> identical between linux-user and bsd-user to re-use.
>
> Signed-off-by: Warner Losh <i...@bsdimp.com>
> Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
> Message-Id: <20211113045603.60391-4-...@bsdimp.com>
> Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
> ---
> meson.build | 1 +
> {linux-user => common-user}/host/aarch64/hostdep.h | 0
> {linux-user => common-user}/host/arm/hostdep.h | 0
> {linux-user => common-user}/host/i386/hostdep.h | 0
> {linux-user => common-user}/host/ppc64/hostdep.h | 0
> {linux-user => common-user}/host/riscv/hostdep.h | 0
> {linux-user => common-user}/host/s390x/hostdep.h | 0
> {linux-user => common-user}/host/x86_64/hostdep.h | 0
> {linux-user => common-user}/host/aarch64/safe-syscall.inc.S | 0
> {linux-user => common-user}/host/arm/safe-syscall.inc.S | 0
> {linux-user => common-user}/host/i386/safe-syscall.inc.S | 0
> {linux-user => common-user}/host/ppc64/safe-syscall.inc.S | 0
> {linux-user => common-user}/host/riscv/safe-syscall.inc.S | 0
> {linux-user => common-user}/host/s390x/safe-syscall.inc.S | 0
> {linux-user => common-user}/host/x86_64/safe-syscall.inc.S | 0
> 15 files changed, 1 insertion(+)
> rename {linux-user => common-user}/host/aarch64/hostdep.h (100%)
> rename {linux-user => common-user}/host/arm/hostdep.h (100%)
> rename {linux-user => common-user}/host/i386/hostdep.h (100%)
> rename {linux-user => common-user}/host/ppc64/hostdep.h (100%)
> rename {linux-user => common-user}/host/riscv/hostdep.h (100%)
> rename {linux-user => common-user}/host/s390x/hostdep.h (100%)
> rename {linux-user => common-user}/host/x86_64/hostdep.h (100%)
> rename {linux-user => common-user}/host/aarch64/safe-syscall.inc.S (100%)
> rename {linux-user => common-user}/host/arm/safe-syscall.inc.S (100%)
> rename {linux-user => common-user}/host/i386/safe-syscall.inc.S (100%)
> rename {linux-user => common-user}/host/ppc64/safe-syscall.inc.S (100%)
> rename {linux-user => common-user}/host/riscv/safe-syscall.inc.S (100%)
> rename {linux-user => common-user}/host/s390x/safe-syscall.inc.S (100%)
> rename {linux-user => common-user}/host/x86_64/safe-syscall.inc.S (100%)
>
> diff --git a/meson.build b/meson.build
> index ccc6cefc25..ec22cf05c1 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2878,6 +2878,7 @@ foreach target : target_dirs
> if 'CONFIG_LINUX_USER' in config_target
> base_dir = 'linux-user'
> target_inc += include_directories('linux-user/host/' /
> config_host['ARCH'])
> + target_inc += include_directories('common-user/host/' /
> config_host['ARCH'])
> endif
> if 'CONFIG_BSD_USER' in config_target
> base_dir = 'bsd-user'
>
I had to add this:
diff --git a/meson.build b/meson.build
index 0a88bff8d2..349e7a988f 100644
--- a/meson.build
+++ b/meson.build
@@ -2880,6 +2880,8 @@ foreach target : target_dirs
endif
if 'CONFIG_BSD_USER' in config_target
base_dir = 'bsd-user'
+ target_inc += include_directories('bsd-user/host/' /
config_host['ARCH'])
+ target_inc += include_directories('common-user/host/' /
config_host['ARCH'])
target_inc += include_directories('bsd-user/' / targetos)
dir = base_dir / abi
arch_srcs += files(dir / 'target_arch_cpu.c')
to get bsd-user compiling.
> diff --git a/linux-user/host/aarch64/hostdep.h
> b/common-user/host/aarch64/hostdep.h
> similarity index 100%
> rename from linux-user/host/aarch64/hostdep.h
> rename to common-user/host/aarch64/hostdep.h
> diff --git a/linux-user/host/arm/hostdep.h b/common-user/host/arm/hostdep.h
> similarity index 100%
> rename from linux-user/host/arm/hostdep.h
> rename to common-user/host/arm/hostdep.h
> diff --git a/linux-user/host/i386/hostdep.h
> b/common-user/host/i386/hostdep.h
> similarity index 100%
> rename from linux-user/host/i386/hostdep.h
> rename to common-user/host/i386/hostdep.h
> diff --git a/linux-user/host/ppc64/hostdep.h
> b/common-user/host/ppc64/hostdep.h
> similarity index 100%
> rename from linux-user/host/ppc64/hostdep.h
> rename to common-user/host/ppc64/hostdep.h
> diff --git a/linux-user/host/riscv/hostdep.h
> b/common-user/host/riscv/hostdep.h
> similarity index 100%
> rename from linux-user/host/riscv/hostdep.h
> rename to common-user/host/riscv/hostdep.h
> diff --git a/linux-user/host/s390x/hostdep.h
> b/common-user/host/s390x/hostdep.h
> similarity index 100%
> rename from linux-user/host/s390x/hostdep.h
> rename to common-user/host/s390x/hostdep.h
> diff --git a/linux-user/host/x86_64/hostdep.h
> b/common-user/host/x86_64/hostdep.h
> similarity index 100%
> rename from linux-user/host/x86_64/hostdep.h
> rename to common-user/host/x86_64/hostdep.h
> diff --git a/linux-user/host/aarch64/safe-syscall.inc.S
> b/common-user/host/aarch64/safe-syscall.inc.S
> similarity index 100%
> rename from linux-user/host/aarch64/safe-syscall.inc.S
> rename to common-user/host/aarch64/safe-syscall.inc.S
> diff --git a/linux-user/host/arm/safe-syscall.inc.S
> b/common-user/host/arm/safe-syscall.inc.S
> similarity index 100%
> rename from linux-user/host/arm/safe-syscall.inc.S
> rename to common-user/host/arm/safe-syscall.inc.S
> diff --git a/linux-user/host/i386/safe-syscall.inc.S
> b/common-user/host/i386/safe-syscall.inc.S
> similarity index 100%
> rename from linux-user/host/i386/safe-syscall.inc.S
> rename to common-user/host/i386/safe-syscall.inc.S
> diff --git a/linux-user/host/ppc64/safe-syscall.inc.S
> b/common-user/host/ppc64/safe-syscall.inc.S
> similarity index 100%
> rename from linux-user/host/ppc64/safe-syscall.inc.S
> rename to common-user/host/ppc64/safe-syscall.inc.S
> diff --git a/linux-user/host/riscv/safe-syscall.inc.S
> b/common-user/host/riscv/safe-syscall.inc.S
> similarity index 100%
> rename from linux-user/host/riscv/safe-syscall.inc.S
> rename to common-user/host/riscv/safe-syscall.inc.S
> diff --git a/linux-user/host/s390x/safe-syscall.inc.S
> b/common-user/host/s390x/safe-syscall.inc.S
> similarity index 100%
> rename from linux-user/host/s390x/safe-syscall.inc.S
> rename to common-user/host/s390x/safe-syscall.inc.S
> diff --git a/linux-user/host/x86_64/safe-syscall.inc.S
> b/common-user/host/x86_64/safe-syscall.inc.S
> similarity index 100%
> rename from linux-user/host/x86_64/safe-syscall.inc.S
> rename to common-user/host/x86_64/safe-syscall.inc.S
> --
> 2.25.1
>
>
