From: Richard Biener <richard.guenther@gmail.com>
To: "Martin Liška" <mliska@suse.cz>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>,
Andreas Schwab <schwab@linux-m68k.org>
Subject: Re: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
Date: Thu, 21 Jul 2022 12:18:40 +0200 [thread overview]
Message-ID: <CAFiYyc0yc81JLLtadL06RFQMS+=K4j1sw98Mj92AFihHsBWMNw@mail.gmail.com> (raw)
In-Reply-To: <7d96af3f-d1d2-6c09-3ddb-41ed51e5f208@suse.cz>
On Mon, Jul 11, 2022 at 10:05 PM Martin Liška <mliska@suse.cz> wrote:
>
> I'm going to push the following cherry-pick which fixes libasan
> build with top-of-tree glibc.
Can you also push this to active branches please?
> Martin
>
> 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
> ---
> .../sanitizer_platform_limits_posix.cpp | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
> index 8ed3e92d270..97fd07acf9d 100644
> --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
> +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
> @@ -73,7 +73,9 @@
> #include <sys/vt.h>
> #include <linux/cdrom.h>
> #include <linux/fd.h>
> +#if SANITIZER_ANDROID
> #include <linux/fs.h>
> +#endif
> #include <linux/hdreg.h>
> #include <linux/input.h>
> #include <linux/ioctl.h>
> @@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
> unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
> unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
> #endif
> - unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
> - unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
> - unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
> - unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
> + unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
> + unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
> + unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
> + unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
> unsigned IOCTL_GIO_CMAP = GIO_CMAP;
> unsigned IOCTL_GIO_FONT = GIO_FONT;
> unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
> --
> 2.36.1
>
next prev parent reply other threads:[~2022-07-21 10:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-11 20:05 Martin Liška
2022-07-21 10:18 ` Richard Biener [this message]
2022-07-21 11:52 ` Martin Liška
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='CAFiYyc0yc81JLLtadL06RFQMS+=K4j1sw98Mj92AFihHsBWMNw@mail.gmail.com' \
--to=richard.guenther@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=mliska@suse.cz \
--cc=schwab@linux-m68k.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 read-only IMAP folder(s) and NNTP newsgroup(s).