Fix libgo with glibc 2.36

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2022-07-31 08:04:12 +03:00
parent 2676399cce
commit ca97bcb5a3
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
1 changed files with 21 additions and 4 deletions

View File

@ -1,15 +1,32 @@
From 59bd3b1866360131af4ba3166029e53603ce9287 Mon Sep 17 00:00:00 2001
From 45d05567b776686843da39bde28b8adf0e14a2fa Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Fri, 29 Jul 2022 09:23:10 +0300
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
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 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
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