commit: 6fb906ef2da01327d64cea263887ef34c97c1bbf Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sun Sep 18 07:15:53 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Sep 30 00:13:22 2022 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=6fb906ef
10.3.0: backport glibc 2.36, gettext/msgfmt patch from 10.4.0 Bug: https://bugs.gentoo.org/295480 Bug: https://bugs.gentoo.org/372377 Bug: https://bugs.gentoo.org/843119 Bug: https://bugs.gentoo.org/864717 Bug: https://bugs.gentoo.org/865879 Closes: https://github.com/gentoo/gcc-patches/pull/2 Signed-off-by: Sam James <sam <AT> gentoo.org> 10.3.0/gentoo/36_all_msgfmt-libstdc++-link.patch | 39 ++++++++++++++ 10.3.0/gentoo/37_all_glibc_236.patch | 68 ++++++++++++++++++++++++ 10.3.0/gentoo/README.history | 4 ++ 3 files changed, 111 insertions(+) diff --git a/10.3.0/gentoo/36_all_msgfmt-libstdc++-link.patch b/10.3.0/gentoo/36_all_msgfmt-libstdc++-link.patch new file mode 100644 index 0000000..0d2f113 --- /dev/null +++ b/10.3.0/gentoo/36_all_msgfmt-libstdc++-link.patch @@ -0,0 +1,39 @@ +Ensure that msgfmt doesn't encounter problems during gcc bootstrapping. + +Solves error messages like the following: + +msgfmt: /var/tmp/portage/sys-devel/gcc-4.1.2/work/build/./gcc/libgcc_s.so.1: version `GCC_4.2.0' not found (required by /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/libstdc++.so.6) + +The libgcc_s.so used during build doesn't satisfy the needs of the +libstdc++.so that msgfmt is linked against. On the other hand, msgfmt +is used as a stand-alone application here, and what library it uses +behind the scenes is of no concern to the gcc build process. +Therefore, simply invoking it "as usual", i.e. without any special +library path, will make it work as expected here. + +2011-09-19 Martin von Gagern + +References: +https://bugs.gentoo.org/372377 +https://bugs.gentoo.org/295480 +https://bugs.gentoo.org/843119 +--- a/libstdc++-v3/po/Makefile.am ++++ b/libstdc++-v3/po/Makefile.am +@@ -39,6 +39,7 @@ MSGFMT = msgfmt + EXTRA_DIST = string_literals.cc POTFILES.in $(PACKAGE).pot $(LOCALE_IN) + + .po.mo: ++ env --unset=LD_LIBRARY_PATH \ + $(MSGFMT) -o $@ $< + + all-local: all-local-$(USE_NLS) +--- a/libstdc++-v3/po/Makefile.in ++++ b/libstdc++-v3/po/Makefile.in +@@ -419,6 +419,7 @@ uninstall-am: uninstall-info-am + + + .po.mo: ++ env --unset=LD_LIBRARY_PATH \ + $(MSGFMT) -o $@ $< + + all-local: all-local-$(USE_NLS) diff --git a/10.3.0/gentoo/37_all_glibc_236.patch b/10.3.0/gentoo/37_all_glibc_236.patch new file mode 100644 index 0000000..7a0f7d3 --- /dev/null +++ b/10.3.0/gentoo/37_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.3.0/gentoo/README.history b/10.3.0/gentoo/README.history index 4487403..6420b44 100644 --- a/10.3.0/gentoo/README.history +++ b/10.3.0/gentoo/README.history @@ -1,3 +1,7 @@ +4 17 Sep 2022 + + 36_all_msgfmt-libstdc++-link.patch + + 37_all_glibc_236.patch + 3 05 July 2021 + 35_all_remove-cyclades.patch
