diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch b/meta/recipes-devtools/gcc/gcc/0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch new file mode 100644 index 0000000000..6bbc95aa00 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc/0001-libsanitizer-cherry-pick-9cf13067cb5088626ba7-from-u.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 2701442d0cf6292f6624443c15813d6d1a3562fe 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 | Upstream-Status: Backport [https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=2701442d0cf6292f6624443c15813d6d1a3562fe] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- | ||
12 | 1 file changed, 6 insertions(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp | ||
15 | index 8ed3e92d270..97fd07acf9d 100644 | ||
16 | --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp | ||
17 | +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp | ||
18 | @@ -73,7 +73,9 @@ | ||
19 | #include <sys/vt.h> | ||
20 | #include <linux/cdrom.h> | ||
21 | #include <linux/fd.h> | ||
22 | +#if SANITIZER_ANDROID | ||
23 | #include <linux/fs.h> | ||
24 | +#endif | ||
25 | #include <linux/hdreg.h> | ||
26 | #include <linux/input.h> | ||
27 | #include <linux/ioctl.h> | ||
28 | @@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); | ||
29 | unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; | ||
30 | unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; | ||
31 | #endif | ||
32 | - unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; | ||
33 | - unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; | ||
34 | - unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; | ||
35 | - unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; | ||
36 | + unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); | ||
37 | + unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); | ||
38 | + unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); | ||
39 | + unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); | ||
40 | unsigned IOCTL_GIO_CMAP = GIO_CMAP; | ||
41 | unsigned IOCTL_GIO_FONT = GIO_FONT; | ||
42 | unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; | ||
43 | -- | ||
44 | 2.37.1 | ||
45 | |||