user: move common-user includes to a subdirectory of {bsd,linux}-user/

Avoid polluting the compilation of common-user/ with local include files; making an include file available to common-user/ should be a deliberate decision in order to keep a clear interface that can be used by both bsd-user/ and linux-user/. Reviewed-by: Richard Henderson <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
rnax · Jan 12, 2022 · 05a2487 · 05a2487
1 parent a3a576b
commit 05a2487
Show file tree

Hide file tree

Showing 19 changed files with 3 additions and 3 deletions.
diff --git a/bsd-user/special-errno.h → bsd-user/include/special-errno.h b/bsd-user/special-errno.h → bsd-user/include/special-errno.h
diff --git a/bsd-user/meson.build b/bsd-user/meson.build
@@ -4,7 +4,7 @@ endif
 
 bsd_user_ss = ss.source_set()
 
-common_user_inc += include_directories('.')
+common_user_inc += include_directories('include')
 
 bsd_user_ss.add(files(
   'bsdload.c',

diff --git a/linux-user/host/aarch64/host-signal.h → ...x-user/include/host/aarch64/host-signal.h b/linux-user/host/aarch64/host-signal.h → ...x-user/include/host/aarch64/host-signal.h
diff --git a/linux-user/host/alpha/host-signal.h → linux-user/include/host/alpha/host-signal.h b/linux-user/host/alpha/host-signal.h → linux-user/include/host/alpha/host-signal.h
diff --git a/linux-user/host/arm/host-signal.h → linux-user/include/host/arm/host-signal.h b/linux-user/host/arm/host-signal.h → linux-user/include/host/arm/host-signal.h
diff --git a/linux-user/host/i386/host-signal.h → linux-user/include/host/i386/host-signal.h b/linux-user/host/i386/host-signal.h → linux-user/include/host/i386/host-signal.h
diff --git a/linux-user/host/loongarch64/host-signal.h → ...er/include/host/loongarch64/host-signal.h b/linux-user/host/loongarch64/host-signal.h → ...er/include/host/loongarch64/host-signal.h
diff --git a/linux-user/host/mips/host-signal.h → linux-user/include/host/mips/host-signal.h b/linux-user/host/mips/host-signal.h → linux-user/include/host/mips/host-signal.h
diff --git a/linux-user/host/ppc/host-signal.h → linux-user/include/host/ppc/host-signal.h b/linux-user/host/ppc/host-signal.h → linux-user/include/host/ppc/host-signal.h
diff --git a/linux-user/host/ppc64/host-signal.h → linux-user/include/host/ppc64/host-signal.h b/linux-user/host/ppc64/host-signal.h → linux-user/include/host/ppc64/host-signal.h
diff --git a/linux-user/host/riscv/host-signal.h → linux-user/include/host/riscv/host-signal.h b/linux-user/host/riscv/host-signal.h → linux-user/include/host/riscv/host-signal.h
diff --git a/linux-user/host/s390/host-signal.h → linux-user/include/host/s390/host-signal.h b/linux-user/host/s390/host-signal.h → linux-user/include/host/s390/host-signal.h
diff --git a/linux-user/host/s390x/host-signal.h → linux-user/include/host/s390x/host-signal.h b/linux-user/host/s390x/host-signal.h → linux-user/include/host/s390x/host-signal.h
diff --git a/linux-user/host/sparc/host-signal.h → linux-user/include/host/sparc/host-signal.h b/linux-user/host/sparc/host-signal.h → linux-user/include/host/sparc/host-signal.h
diff --git a/linux-user/host/sparc64/host-signal.h → ...x-user/include/host/sparc64/host-signal.h b/linux-user/host/sparc64/host-signal.h → ...x-user/include/host/sparc64/host-signal.h
diff --git a/linux-user/host/x32/host-signal.h → linux-user/include/host/x32/host-signal.h b/linux-user/host/x32/host-signal.h → linux-user/include/host/x32/host-signal.h
diff --git a/linux-user/host/x86_64/host-signal.h → linux-user/include/host/x86_64/host-signal.h b/linux-user/host/x86_64/host-signal.h → linux-user/include/host/x86_64/host-signal.h
diff --git a/linux-user/special-errno.h → linux-user/include/special-errno.h b/linux-user/special-errno.h → linux-user/include/special-errno.h
diff --git a/linux-user/meson.build b/linux-user/meson.build
@@ -4,8 +4,8 @@ endif
 
 linux_user_ss = ss.source_set()
 
-common_user_inc += include_directories('host/' / host_arch)
-common_user_inc += include_directories('.')
+common_user_inc += include_directories('include/host/' / host_arch)
+common_user_inc += include_directories('include')
 
 linux_user_ss.add(files(
   'elfload.c',