diff --git a/0001-Fix-for-glibc-2.36.patch b/0001-Fix-for-glibc-2.36.patch
new file mode 100644
index 0000000..5f24109
--- /dev/null
+++ b/0001-Fix-for-glibc-2.36.patch
@@ -0,0 +1,44 @@
+From 59bd3b1866360131af4ba3166029e53603ce9287 Mon Sep 17 00:00:00 2001
+From: David Abdurachmanov <davidlt@rivosinc.com>
+Date: Fri, 29 Jul 2022 09:23:10 +0300
+Subject: [PATCH] Fix for glibc 2.36
+
+See: https://github.com/llvm/llvm-project/commit/9cf13067cb5088626ba7ee1ec4c42ec59c7995a0
+
+Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
+---
+ .../sanitizer_platform_limits_posix.cpp                | 10 ++++++----
+ 1 file 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 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
+
diff --git a/gcc.spec b/gcc.spec
index 5f61f5a..ff1b1df 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -284,6 +284,8 @@ Patch107: gcc11-fortran-fdec-promotion.patch
 Patch108: gcc11-fortran-fdec-sequence.patch
 Patch109: gcc11-fortran-fdec-add-missing-indexes.patch
 
+Patch200: 0001-Fix-for-glibc-2.36.patch
+
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
 %ifnarch %{arm}
@@ -816,6 +818,10 @@ to NVidia PTX capable devices if available.
 %patch109 -p1 -b .fortran-fdec-add-missing-indexes~
 %endif
 
+%ifarch riscv64
+%patch200 -p1 -b .fix-glibc236~
+%endif
+
 %ifarch %{arm}
 rm -f gcc/testsuite/go.test/test/fixedbugs/issue19182.go
 %endif