From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Mike Frysinger <vapier@gentoo.org>,
Richard Henderson <richard.henderson@linaro.org>,
Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 14/22] linux-user: move target_flat.h to target subdirs
Date: Sat, 4 Feb 2023 17:08:22 +0100 [thread overview]
Message-ID: <20230204160830.193093-15-laurent@vivier.eu> (raw)
In-Reply-To: <20230204160830.193093-1-laurent@vivier.eu>
From: Mike Frysinger <vapier@gentoo.org>
This makes target_flat.h behave like every other target_xxx.h header.
It also makes it actually work -- while the current header says adding
a header to the target subdir overrides the common one, it doesn't.
This is for two reasons:
* meson.build adds -Ilinux-user before -Ilinux-user/$arch
* the compiler search path for "target_flat.h" looks in the same dir
as the source file before searching -I paths.
This can be seen with the xtensa port -- the subdir settings aren't
used which breaks stack setup.
Move it to the generic/ subdir and add include stubs like every
other target_xxx.h header is handled.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230129004625.11228-1-vapier@gentoo.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/aarch64/target_flat.h | 1 +
linux-user/arm/target_flat.h | 1 +
linux-user/{ => generic}/target_flat.h | 0
linux-user/m68k/target_flat.h | 1 +
linux-user/microblaze/target_flat.h | 1 +
linux-user/sh4/target_flat.h | 1 +
6 files changed, 5 insertions(+)
create mode 100644 linux-user/aarch64/target_flat.h
create mode 100644 linux-user/arm/target_flat.h
rename linux-user/{ => generic}/target_flat.h (100%)
create mode 100644 linux-user/m68k/target_flat.h
create mode 100644 linux-user/microblaze/target_flat.h
create mode 100644 linux-user/sh4/target_flat.h
diff --git a/linux-user/aarch64/target_flat.h b/linux-user/aarch64/target_flat.h
new file mode 100644
index 000000000000..bc83224cea12
--- /dev/null
+++ b/linux-user/aarch64/target_flat.h
@@ -0,0 +1 @@
+#include "../generic/target_flat.h"
diff --git a/linux-user/arm/target_flat.h b/linux-user/arm/target_flat.h
new file mode 100644
index 000000000000..bc83224cea12
--- /dev/null
+++ b/linux-user/arm/target_flat.h
@@ -0,0 +1 @@
+#include "../generic/target_flat.h"
diff --git a/linux-user/target_flat.h b/linux-user/generic/target_flat.h
similarity index 100%
rename from linux-user/target_flat.h
rename to linux-user/generic/target_flat.h
diff --git a/linux-user/m68k/target_flat.h b/linux-user/m68k/target_flat.h
new file mode 100644
index 000000000000..bc83224cea12
--- /dev/null
+++ b/linux-user/m68k/target_flat.h
@@ -0,0 +1 @@
+#include "../generic/target_flat.h"
diff --git a/linux-user/microblaze/target_flat.h b/linux-user/microblaze/target_flat.h
new file mode 100644
index 000000000000..bc83224cea12
--- /dev/null
+++ b/linux-user/microblaze/target_flat.h
@@ -0,0 +1 @@
+#include "../generic/target_flat.h"
diff --git a/linux-user/sh4/target_flat.h b/linux-user/sh4/target_flat.h
new file mode 100644
index 000000000000..bc83224cea12
--- /dev/null
+++ b/linux-user/sh4/target_flat.h
@@ -0,0 +1 @@
+#include "../generic/target_flat.h"
--
2.39.1
next prev parent reply other threads:[~2023-02-04 16:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-04 16:08 [PULL 00/22] Linux user for 8.0 patches Laurent Vivier
2023-02-04 16:08 ` [PULL 01/22] linux-user/strace: Constify struct flags Laurent Vivier
2023-02-04 16:08 ` [PULL 02/22] linux-user/strace: Extract print_execve_argv() from print_execve() Laurent Vivier
2023-02-04 16:08 ` [PULL 03/22] linux-user/strace: Add output for execveat() syscall Laurent Vivier
2023-02-04 16:08 ` [PULL 04/22] linux-user/syscall: Extract do_execve() from do_syscall1() Laurent Vivier
2023-02-04 16:08 ` [PULL 05/22] linux-user/syscall: Implement execveat() Laurent Vivier
2023-02-04 16:08 ` [PULL 06/22] linux-user: Add missing MAP_HUGETLB and MAP_STACK flags in strace Laurent Vivier
2023-02-04 16:08 ` [PULL 07/22] linux-user: un-parent OBJECT(cpu) when closing thread Laurent Vivier
2023-02-04 16:08 ` [PULL 08/22] linux-user: fix strace build w/out munlockall Laurent Vivier
2023-02-04 16:08 ` [PULL 09/22] linux-user: add more netlink protocol constants Laurent Vivier
2023-02-04 16:08 ` [PULL 10/22] Revert "linux-user: add more compat ioctl definitions" Laurent Vivier
2023-02-04 16:08 ` [PULL 11/22] Revert "linux-user: fix compat with glibc >= 2.36 sys/mount.h" Laurent Vivier
2023-02-04 16:08 ` [PULL 12/22] linux-user: Add strace output for clock_getres_time64() and futex_time64() Laurent Vivier
2023-02-04 16:08 ` [PULL 13/22] linux-user: Improve strace output of getgroups() and setgroups() Laurent Vivier
2023-02-04 16:08 ` Laurent Vivier [this message]
2023-02-04 16:08 ` [PULL 15/22] linux-user: Fix SO_ERROR return code of getsockopt() Laurent Vivier
2023-02-04 16:08 ` [PULL 16/22] linux-user: Fix /proc/cpuinfo output for hppa Laurent Vivier
2023-02-04 16:08 ` [PULL 17/22] linux-user: Improve strace output of personality() and sysinfo() Laurent Vivier
2023-02-04 16:08 ` [PULL 18/22] linux-user: Add emulation for MADV_WIPEONFORK and MADV_KEEPONFORK in madvise() Laurent Vivier
2023-02-04 16:08 ` [PULL 19/22] linux-user: Show 4th argument of rt_sigprocmask() in strace Laurent Vivier
2023-02-04 16:08 ` [PULL 20/22] linux-user: Enhance strace output for various syscalls Laurent Vivier
2023-02-04 16:08 ` [PULL 21/22] linux-user: Implement SOL_ALG encryption support Laurent Vivier
2023-02-04 16:08 ` [PULL 22/22] linux-user: Allow sendmsg() without IOV Laurent Vivier
2023-02-04 19:12 ` [PULL 00/22] Linux user for 8.0 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230204160830.193093-15-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).