| 1 |
commit: 97ae6391c543891918047f724b0bddecc5f834bc |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 18 20:03:20 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 18 20:03:40 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=97ae6391 |
| 7 |
|
| 8 |
11.3.0: add 77_all_glibc_236.patch |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
11.3.0/gentoo/77_all_glibc_236.patch | 39 ++++++++++++++++++++++++++++++++++++ |
| 13 |
11.3.0/gentoo/README.history | 3 +++ |
| 14 |
2 files changed, 42 insertions(+) |
| 15 |
|
| 16 |
diff --git a/11.3.0/gentoo/77_all_glibc_236.patch b/11.3.0/gentoo/77_all_glibc_236.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..c74e6ac |
| 19 |
--- /dev/null |
| 20 |
+++ b/11.3.0/gentoo/77_all_glibc_236.patch |
| 21 |
@@ -0,0 +1,39 @@ |
| 22 |
+https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d2356ebb0084a0d80dbfe33040c9afe938c15d19 |
| 23 |
+ |
| 24 |
+Fix build w/ glibc 2.36. |
| 25 |
+ |
| 26 |
+From d2356ebb0084a0d80dbfe33040c9afe938c15d19 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Martin Liska <mliska@××××.cz> |
| 28 |
+Date: Mon, 11 Jul 2022 22:03:14 +0200 |
| 29 |
+Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream |
| 30 |
+ |
| 31 |
+9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 |
| 32 |
+ |
| 33 |
+(cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe) |
| 34 |
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp |
| 35 |
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp |
| 36 |
+@@ -72,7 +72,9 @@ |
| 37 |
+ #include <sys/vt.h> |
| 38 |
+ #include <linux/cdrom.h> |
| 39 |
+ #include <linux/fd.h> |
| 40 |
++#if SANITIZER_ANDROID |
| 41 |
+ #include <linux/fs.h> |
| 42 |
++#endif |
| 43 |
+ #include <linux/hdreg.h> |
| 44 |
+ #include <linux/input.h> |
| 45 |
+ #include <linux/ioctl.h> |
| 46 |
+@@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); |
| 47 |
+ unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; |
| 48 |
+ unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; |
| 49 |
+ #endif |
| 50 |
+- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; |
| 51 |
+- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; |
| 52 |
+- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; |
| 53 |
+- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; |
| 54 |
++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); |
| 55 |
++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); |
| 56 |
++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); |
| 57 |
++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); |
| 58 |
+ unsigned IOCTL_GIO_CMAP = GIO_CMAP; |
| 59 |
+ unsigned IOCTL_GIO_FONT = GIO_FONT; |
| 60 |
+ unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; |
| 61 |
|
| 62 |
diff --git a/11.3.0/gentoo/README.history b/11.3.0/gentoo/README.history |
| 63 |
index 49c754f..11d3a12 100644 |
| 64 |
--- a/11.3.0/gentoo/README.history |
| 65 |
+++ b/11.3.0/gentoo/README.history |
| 66 |
@@ -1,3 +1,6 @@ |
| 67 |
+6 18 August 2022 |
| 68 |
+ + 77_all_glibc_236.patch |
| 69 |
+ |
| 70 |
5 3 July 2022 |
| 71 |
+ 27_all_msgfmt-libstdc++-link.patch |
Archives