From: Laurent Vivier <laurent@vivier.eu>
To: Mike Frysinger <vapier@gentoo.org>, qemu-devel@nongnu.org
Subject: Re: [PATCH] linux-user: move target_flat.h to target subdirs
Date: Mon, 30 Jan 2023 09:40:19 +0100 [thread overview]
Message-ID: <80d2a10b-838c-8787-d001-5f76df400d16@vivier.eu> (raw)
In-Reply-To: <20230129004625.11228-1-vapier@gentoo.org>
Le 29/01/2023 à 01:46, Mike Frysinger a écrit :
> 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>
> ---
> 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"
Applied to my linux-user-for-8.0 branch.
Thanks,
Laurent
prev parent reply other threads:[~2023-01-30 8:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-29 0:46 [PATCH] linux-user: move target_flat.h to target subdirs Mike Frysinger
2023-01-29 5:46 ` Richard Henderson
2023-01-30 8:40 ` Laurent Vivier [this message]
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=80d2a10b-838c-8787-d001-5f76df400d16@vivier.eu \
--to=laurent@vivier.eu \
--cc=qemu-devel@nongnu.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).