diff options
| author |   Sam James <sam@gentoo.org> | 2022-08-18 21:03:20 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-08-18 21:03:40 +0100 |
| commit | 97ae6391c543891918047f724b0bddecc5f834bc (patch) | |
| tree | e2c28c1c21888053dd778c33816a7c1589aceb43 /11.3.0 | |
| parent | 9.5.0: clone of 9.4.0, add glibc-2.36 patch (diff) | |
| download | gcc-patches-97ae6391c543891918047f724b0bddecc5f834bc.tar.gz gcc-patches-97ae6391c543891918047f724b0bddecc5f834bc.tar.bz2 gcc-patches-97ae6391c543891918047f724b0bddecc5f834bc.zip | |
11.3.0: add 77_all_glibc_236.patch
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to '11.3.0')
| -rw-r--r-- | 11.3.0/gentoo/77_all_glibc_236.patch | 39 | ||||
| -rw-r--r-- | 11.3.0/gentoo/README.history | 3 |
2 files changed, 42 insertions, 0 deletions
diff --git a/11.3.0/gentoo/77_all_glibc_236.patch b/11.3.0/gentoo/77_all_glibc_236.patch new file mode 100644 index 0000000..c74e6ac --- /dev/null +++ b/11.3.0/gentoo/77_all_glibc_236.patch @@ -0,0 +1,39 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d2356ebb0084a0d80dbfe33040c9afe938c15d19 + +Fix build w/ glibc 2.36. + +From d2356ebb0084a0d80dbfe33040c9afe938c15d19 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> +@@ -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; diff --git a/11.3.0/gentoo/README.history b/11.3.0/gentoo/README.history index 49c754f..11d3a12 100644 --- a/11.3.0/gentoo/README.history +++ b/11.3.0/gentoo/README.history @@ -1,3 +1,6 @@ +6 18 August 2022 + + 77_all_glibc_236.patch + 5 3 July 2022 + 27_all_msgfmt-libstdc++-link.patch |