diff options
| author | Martin Liska <mliska@suse.cz> | 2022-07-11 22:03:14 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-07-11 22:04:00 +0200 |
| commit | 2701442d0cf6292f6624443c15813d6d1a3562fe (patch) | |
| tree | ffa5deada51abb818ed962b87977bde69258db3e /libsanitizer | |
| parent | 12a9b98ac574bc8092a75849b5c462135d35c31d (diff) | |
| download | gcc-2701442d0cf6292f6624443c15813d6d1a3562fe.zip gcc-2701442d0cf6292f6624443c15813d6d1a3562fe.tar.gz gcc-2701442d0cf6292f6624443c15813d6d1a3562fe.tar.bz2 | |
libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp | 10 |
1 files 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 8ed3e92..97fd07a 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; |