Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

[qemu.git] / linux-user / meson.build

diff --git a/linux-user/meson.build b/linux-user/meson.build
index 2b94e4ba24a218007af540ae99243a08bdde02d0..de4320af053cd45d5b659c22cfa8ed6fc8a09755 100644 (file)
--- a/linux-user/meson.build
+++ b/linux-user/meson.build
@@ -1,3 +1,12 @@
+if not have_linux_user
+   subdir_done()
+endif
+
+linux_user_ss = ss.source_set()
+
+common_user_inc += include_directories('include/host/' / host_arch)
+common_user_inc += include_directories('include')
+
 linux_user_ss.add(files(
   'elfload.c',
   'exit.c',
@@ -5,10 +14,10 @@ linux_user_ss.add(files(
   'linuxload.c',
   'main.c',
   'mmap.c',
-  'safe-syscall.S',
   'signal.c',
   'strace.c',
   'syscall.c',
+  'thunk.c',
   'uaccess.c',
   'uname.c',
 ))
@@ -16,6 +25,7 @@ linux_user_ss.add(rt)
 
 linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: files('flatload.c'))
 linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c'))
+linux_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: files('semihost.c'))
 
 
 syscall_nr_generators = {}
@@ -31,7 +41,8 @@ subdir('mips')
 subdir('ppc')
 subdir('s390x')
 subdir('sh4')
-subdir('sparc64')
 subdir('sparc')
 subdir('x86_64')
 subdir('xtensa')
+
+specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)