62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From 45d05567b776686843da39bde28b8adf0e14a2fa Mon Sep 17 00:00:00 2001
|
|
From: David Abdurachmanov <davidlt@rivosinc.com>
|
|
Date: Sun, 31 Jul 2022 08:00:50 +0300
|
|
Subject: [PATCH] Fix for glibc 2.36
|
|
|
|
See:
|
|
https://github.com/llvm/llvm-project/commit/9cf13067cb5088626ba7ee1ec4c42ec59c7995a0
|
|
https://github.com/gcc-mirror/gcc/commit/f35d65517a59565758107c5b1a51a5fa382f8d1a
|
|
|
|
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
|
|
---
|
|
libgo/sysinfo.c | 3 ---
|
|
.../sanitizer_platform_limits_posix.cpp | 10 ++++++----
|
|
2 files changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
|
|
index 8ce061e2f..336a59837 100644
|
|
--- a/libgo/sysinfo.c
|
|
+++ b/libgo/sysinfo.c
|
|
@@ -158,9 +158,6 @@
|
|
#if defined(HAVE_LINUX_ETHER_H)
|
|
#include <linux/ether.h>
|
|
#endif
|
|
-#if defined(HAVE_LINUX_FS_H)
|
|
-#include <linux/fs.h>
|
|
-#endif
|
|
#if defined(HAVE_LINUX_REBOOT_H)
|
|
#include <linux/reboot.h>
|
|
#endif
|
|
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
index 025e575b5..5743516c0 100644
|
|
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
@@ -72,7 +72,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>
|
|
@@ -828,10 +830,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.35.1
|
|
|