[RFC v2 3/6] linux-user/safe-syscall.inc.S: Move to common-user

Warner Losh posted 6 patches 4 years, 2 months ago
Maintainers: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Laurent Vivier <laurent@vivier.eu>
There is a newer version of this series
[RFC v2 3/6] linux-user/safe-syscall.inc.S: Move to common-user
Posted by Warner Losh 4 years, 2 months ago
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 <imp@bsdimp.com>
---
 {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
 meson.build                                                 | 1 +
 8 files changed, 1 insertion(+)
 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/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
diff --git a/meson.build b/meson.build
index 9702fdce6d..728d305403 100644
--- a/meson.build
+++ b/meson.build
@@ -2872,6 +2872,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'
-- 
2.33.0


Re: [RFC v2 3/6] linux-user/safe-syscall.inc.S: Move to common-user
Posted by Richard Henderson 4 years, 2 months ago
On 11/10/21 5:31 PM, Warner Losh wrote:
> 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<imp@bsdimp.com>
> ---
>   {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
>   meson.build                                                 | 1 +
>   8 files changed, 1 insertion(+)
>   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%)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~