diff options
| author |   Sam James <sam@gentoo.org> | 2022-08-15 17:43:10 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-08-18 21:03:39 +0100 |
| commit | 0f4d1be169eebcc993c567da333c96c3b4e6abbe (patch) | |
| tree | 882d02fdc0f865779ca9847949c5840b5b9aa0e5 /9.4.0 | |
| parent | 11.4.0: add 50_all_calloc_libgccjit (diff) | |
| download | gcc-patches-0f4d1be169eebcc993c567da333c96c3b4e6abbe.tar.gz gcc-patches-0f4d1be169eebcc993c567da333c96c3b4e6abbe.tar.bz2 gcc-patches-0f4d1be169eebcc993c567da333c96c3b4e6abbe.zip | |
9.5.0: clone of 9.4.0, add glibc-2.36 patch
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to '9.4.0')
| -rw-r--r-- | 9.4.0/gentoo/30_all_glibc_236.patch | 37 | ||||
| -rw-r--r-- | 9.4.0/gentoo/README.history | 3 |
2 files changed, 40 insertions, 0 deletions
diff --git a/9.4.0/gentoo/30_all_glibc_236.patch b/9.4.0/gentoo/30_all_glibc_236.patch new file mode 100644 index 0000000..68fe0a6 --- /dev/null +++ b/9.4.0/gentoo/30_all_glibc_236.patch @@ -0,0 +1,37 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bd956e31b2fb6fe1eee4eb1bf309247dcd19b23 + +From 6bd956e31b2fb6fe1eee4eb1bf309247dcd19b23 Mon Sep 17 00:00:00 2001 +From: Martin Liska <mliska@suse.cz> +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; diff --git a/9.4.0/gentoo/README.history b/9.4.0/gentoo/README.history index 2adb561..e9aa4ec 100644 --- a/9.4.0/gentoo/README.history +++ b/9.4.0/gentoo/README.history @@ -1,3 +1,6 @@ +2 15 Aug 2022 + + 30_all_glibc_236.patch + 1 01 June 2021 + 01_all_default-fortify-source.patch + 02_all_default-warn-format-security.patch |