commit: 636d9ed6c929921b4705e9fc9eb3dd3d8ac04bfd Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jul 31 01:11:35 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jul 31 01:11:35 2025 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=636d9ed6
13.3.0: drop upstreamed libsanitizer fixes Signed-off-by: Sam James <sam <AT> gentoo.org> ...ll-libsanitizer-Fix-build-with-glibc-2.42.patch | 82 ---------------------- ...ommon-Remove-reference-to-obsolete-termio.patch | 76 -------------------- 13.3.0/gentoo/README.history | 5 ++ 3 files changed, 5 insertions(+), 158 deletions(-) diff --git a/13.3.0/gentoo/94_all-libsanitizer-Fix-build-with-glibc-2.42.patch b/13.3.0/gentoo/94_all-libsanitizer-Fix-build-with-glibc-2.42.patch deleted file mode 100644 index 40c3e67..0000000 --- a/13.3.0/gentoo/94_all-libsanitizer-Fix-build-with-glibc-2.42.patch +++ /dev/null @@ -1,82 +0,0 @@ -From faf929fcc361d3ca64c6acb0ee9660c79b5905d2 Mon Sep 17 00:00:00 2001 -Message-ID: <faf929fcc361d3ca64c6acb0ee9660c79b5905d2.1753477197.git....@gentoo.org> -From: Florian Weimer <[email protected]> -Date: Fri, 2 May 2025 17:41:43 +0200 -Subject: [PATCH 1/2] libsanitizer: Fix build with glibc 2.42 - -The termio structure will be removed from glibc 2.42. It has -been deprecated since the late 80s/early 90s. - -Cherry-picked from LLVM commit 59978b21ad9c65276ee8e14f26759691b8a65763 -("[sanitizer_common] Remove interceptors for deprecated struct termio -(#137403)"). - -Co-Authored-By: Tom Stellard <[email protected]> - -libsanitizer/ - - * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry - picked from LLVM commit 59978b21ad9c65276ee8e14f26759691b8a65763. - * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. - * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise. - -(cherry picked from commit 1789c57dc97ea2f9819ef89e28bf17208b6208e7) ---- - .../sanitizer_common_interceptors_ioctl.inc | 8 -------- - .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 3 --- - .../sanitizer_common/sanitizer_platform_limits_posix.h | 1 - - 3 files changed, 12 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -index 49ec4097c900..dda11daa77f4 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -338,17 +338,9 @@ static void ioctl_table_fill() { - _(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int)); - _(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int)); - _(TCFLSH, NONE, 0); --#if SANITIZER_GLIBC -- _(TCGETA, WRITE, struct_termio_sz); --#endif - _(TCGETS, WRITE, struct_termios_sz); - _(TCSBRK, NONE, 0); - _(TCSBRKP, NONE, 0); --#if SANITIZER_GLIBC -- _(TCSETA, READ, struct_termio_sz); -- _(TCSETAF, READ, struct_termio_sz); -- _(TCSETAW, READ, struct_termio_sz); --#endif - _(TCSETS, READ, struct_termios_sz); - _(TCSETSF, READ, struct_termios_sz); - _(TCSETSW, READ, struct_termios_sz); -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -index c85cf1626a75..c13811e39a44 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -467,9 +467,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned struct_input_id_sz = sizeof(struct input_id); - unsigned struct_mtpos_sz = sizeof(struct mtpos); - unsigned struct_rtentry_sz = sizeof(struct rtentry); --#if SANITIZER_GLIBC || SANITIZER_ANDROID -- unsigned struct_termio_sz = sizeof(struct termio); --#endif - unsigned struct_vt_consize_sz = sizeof(struct vt_consize); - unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes); - unsigned struct_vt_stat_sz = sizeof(struct vt_stat); -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index 44dd3d9e22d1..45c1e1302f8f 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -998,7 +998,6 @@ extern unsigned struct_hd_geometry_sz; - extern unsigned struct_input_absinfo_sz; - extern unsigned struct_input_id_sz; - extern unsigned struct_mtpos_sz; --extern unsigned struct_termio_sz; - extern unsigned struct_vt_consize_sz; - extern unsigned struct_vt_sizes_sz; - extern unsigned struct_vt_stat_sz; - -base-commit: e8e9c25cbaee08f54b7be3051ba5c444a042a958 --- -2.50.1 - diff --git a/13.3.0/gentoo/95_all-sanitizer_common-Remove-reference-to-obsolete-termio.patch b/13.3.0/gentoo/95_all-sanitizer_common-Remove-reference-to-obsolete-termio.patch deleted file mode 100644 index 589c948..0000000 --- a/13.3.0/gentoo/95_all-sanitizer_common-Remove-reference-to-obsolete-termio.patch +++ /dev/null @@ -1,76 +0,0 @@ -From e48245a3cf32b4a1989b0175577e9ee1890a9124 Mon Sep 17 00:00:00 2001 -Message-ID: <e48245a3cf32b4a1989b0175577e9ee1890a9124.1753477197.git....@gentoo.org> -In-Reply-To: <faf929fcc361d3ca64c6acb0ee9660c79b5905d2.1753477197.git....@gentoo.org> -References: <faf929fcc361d3ca64c6acb0ee9660c79b5905d2.1753477197.git....@gentoo.org> -From: Sam James <[email protected]> -Date: Fri, 25 Jul 2025 19:45:18 +0100 -Subject: [PATCH 2/2] [sanitizer_common] Remove reference to obsolete termio - ioctls (#138822) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Cherry picked from LLVM commit c99b1bcd505064f2e086e6b1034ce0b0c91ea5b9. - -The termio ioctls are no longer used after commit 59978b21ad9c -("[sanitizer_common] Remove interceptors for deprecated struct termio -(#137403)"), remove them. Fixes this build error: - -../../../../libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp:765:27: error: invalid application of ‘sizeof’ to incomplete type ‘__sanitizer::termio’ - 765 | unsigned IOCTL_TCGETA = TCGETA; - | ^~~~~~ -../../../../libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp:769:27: error: invalid application of ‘sizeof’ to incomplete type ‘__sanitizer::termio’ - 769 | unsigned IOCTL_TCSETA = TCSETA; - | ^~~~~~ -../../../../libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp:770:28: error: invalid application of ‘sizeof’ to incomplete type ‘__sanitizer::termio’ - 770 | unsigned IOCTL_TCSETAF = TCSETAF; - | ^~~~~~~ -../../../../libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp:771:28: error: invalid application of ‘sizeof’ to incomplete type ‘__sanitizer::termio’ - 771 | unsigned IOCTL_TCSETAW = TCSETAW; - | ^~~~~~~ - -(cherry picked from commit 50cff2194bcb8321414437169d443bf48695972c) ---- - .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 4 ---- - .../sanitizer_common/sanitizer_platform_limits_posix.h | 4 ---- - 2 files changed, 8 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -index c13811e39a44..cb50a272c422 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -743,13 +743,9 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned IOCTL_SOUND_PCM_WRITE_FILTER = SOUND_PCM_WRITE_FILTER; - #endif // SOUND_VERSION - unsigned IOCTL_TCFLSH = TCFLSH; -- unsigned IOCTL_TCGETA = TCGETA; - unsigned IOCTL_TCGETS = TCGETS; - unsigned IOCTL_TCSBRK = TCSBRK; - unsigned IOCTL_TCSBRKP = TCSBRKP; -- unsigned IOCTL_TCSETA = TCSETA; -- unsigned IOCTL_TCSETAF = TCSETAF; -- unsigned IOCTL_TCSETAW = TCSETAW; - unsigned IOCTL_TCSETS = TCSETS; - unsigned IOCTL_TCSETSF = TCSETSF; - unsigned IOCTL_TCSETSW = TCSETSW; -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index 45c1e1302f8f..70ea7e3c1bc2 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -1242,13 +1242,9 @@ extern unsigned IOCTL_SNDCTL_COPR_SENDMSG; - extern unsigned IOCTL_SNDCTL_COPR_WCODE; - extern unsigned IOCTL_SNDCTL_COPR_WDATA; - extern unsigned IOCTL_TCFLSH; --extern unsigned IOCTL_TCGETA; - extern unsigned IOCTL_TCGETS; - extern unsigned IOCTL_TCSBRK; - extern unsigned IOCTL_TCSBRKP; --extern unsigned IOCTL_TCSETA; --extern unsigned IOCTL_TCSETAF; --extern unsigned IOCTL_TCSETAW; - extern unsigned IOCTL_TCSETS; - extern unsigned IOCTL_TCSETSF; - extern unsigned IOCTL_TCSETSW; --- -2.50.1 - diff --git a/13.3.0/gentoo/README.history b/13.3.0/gentoo/README.history index a8fa3a7..f6bde9a 100644 --- a/13.3.0/gentoo/README.history +++ b/13.3.0/gentoo/README.history @@ -1,3 +1,8 @@ +7 ???? + + - 94_all-libsanitizer-Fix-build-with-glibc-2.42.patch + - 95_all-sanitizer_common-Remove-reference-to-obsolete-termio.patch + 6 25 July 2025 + 94_all-libsanitizer-Fix-build-with-glibc-2.42.patch
