43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From e195f6bb86c7fb3a009eba292a78ed13f3d19dc2 Mon Sep 17 00:00:00 2001
|
|
From: <zhangwuji1@huawei.com>
|
|
Date: Wed, 7 Jun 2023 15:34:03 +0000
|
|
Subject: [PATCH] fix libsanitizer multiple definition
|
|
|
|
https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=2701442d0cf6292f6624443c15813d6d1a3562fe
|
|
---
|
|
.../sanitizer_platform_limits_posix.cc | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
index aae5ec2fe82..72277af7026 100644
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
|
|
@@ -62,7 +62,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>
|
|
@@ -834,10 +836,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.34.1
|
|
|