toolchain/gcc/patches-11.x/400-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch

   1 From d2356ebb0084a0d80dbfe33040c9afe938c15d19 Mon Sep 17 00:00:00 2001
   2 From: Martin Liska <mliska@suse.cz>
   3 Date: Mon, 11 Jul 2022 22:03:14 +0200
   4 Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
   5
   6 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
   7
   8 (cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe)
   9 ---
  10  .../sanitizer_platform_limits_posix.cpp                | 10 ++++++----
  11  1 file changed, 6 insertions(+), 4 deletions(-)
  12
  13 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
  14 +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
  15 @@ -72,7 +72,9 @@
  16  #include <sys/vt.h>
  17  #include <linux/cdrom.h>
  18  #include <linux/fd.h>
  19 +#if SANITIZER_ANDROID
  20  #include <linux/fs.h>
  21 +#endif
  22  #include <linux/hdreg.h>
  23  #include <linux/input.h>
  24  #include <linux/ioctl.h>
  25 @@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
  26    unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
  27    unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
  28  #endif
  29 -  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
  30 -  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
  31 -  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
  32 -  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
  33 +  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
  34 +  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
  35 +  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
  36 +  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
  37    unsigned IOCTL_GIO_CMAP = GIO_CMAP;
  38    unsigned IOCTL_GIO_FONT = GIO_FONT;
  39    unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;