commit: f53592f738b4807ef29bc08e316445bc26dee055 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Aug 22 01:22:08 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 22 01:41:31 2022 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=f53592f7
10.4.0: add glibc-2.36 patches Bug: https://bugs.gentoo.org/865879 Bug: https://bugs.gentoo.org/864717 Signed-off-by: Sam James <sam <AT> gentoo.org> 10.4.0/gentoo/75_all_glibc_236.patch | 68 ++++++++++++++++++++++++++++++++++++ 10.4.0/gentoo/README.history | 5 ++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/10.4.0/gentoo/75_all_glibc_236.patch b/10.4.0/gentoo/75_all_glibc_236.patch new file mode 100644 index 0000000..7a0f7d3 --- /dev/null +++ b/10.4.0/gentoo/75_all_glibc_236.patch @@ -0,0 +1,68 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bd956e31b2fb6fe1eee4eb1bf309247dcd19b23 +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=8c3238510ce63c75024c0288eade5c933f6d322e +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106266 +https://bugs.gentoo.org/864717 +https://bugs.gentoo.org/865879 + +From 6bd956e31b2fb6fe1eee4eb1bf309247dcd19b23 Mon Sep 17 00:00:00 2001 +From: Martin Liska <[email protected]> +Date: Mon, 11 Jul 2022 22:03:14 +0200 +Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream + +9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 + +(cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe) +--- 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> +@@ -822,10 +824,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; + +From 8c3238510ce63c75024c0288eade5c933f6d322e Mon Sep 17 00:00:00 2001 +From: Ian Lance Taylor <[email protected]> +Date: Tue, 12 Jul 2022 19:42:43 -0700 +Subject: [PATCH] libgo: don't include <linux/fs.h> when building + gen-sysinfo.go + +Removing this doesn't change anything at least with glibc 2.33. +The include was added in https://go.dev/cl/6100049 but it's not +clear why. + +Fixes PR go/106266 + +Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/417294 +(cherry picked from commit f35d65517a59565758107c5b1a51a5fa382f8d1a) +--- a/libgo/sysinfo.c ++++ b/libgo/sysinfo.c +@@ -150,9 +150,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/10.4.0/gentoo/README.history b/10.4.0/gentoo/README.history index 0f6b049..2def6c1 100644 --- a/10.4.0/gentoo/README.history +++ b/10.4.0/gentoo/README.history @@ -1,4 +1,7 @@ -2 03 Jul 2022 +3 22 Aug 2022 + + 75_all_glibc_236.patch + +2 03 Jul 2022 + 33_all_msgfmt-libstdc++-link.patch 1 22 May 2022
