From dea73a8773a4b009c6d07ec1dfd6bd347a0fa7cb Mon Sep 17 00:00:00 2001 From: liyancheng <412998149@qq.com> Date: Tue, 10 Jan 2023 19:23:47 +0800 Subject: [PATCH] [Backport] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream [Reference] https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=2701442d0cf6292f6624443c15813d6d1a3562fe [sanitizer] Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 (cherry picked from commit 15f0df8aa07c8d5c8d22b200d831f7f0181a3e87) --- ...tizer-cherry-pick-9cf13067cb5088626b.patch | 46 +++++++++++++++++++ gcc.spec | 11 ++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0089-Backport-libsanitizer-cherry-pick-9cf13067cb5088626b.patch diff --git a/0089-Backport-libsanitizer-cherry-pick-9cf13067cb5088626b.patch b/0089-Backport-libsanitizer-cherry-pick-9cf13067cb5088626b.patch new file mode 100644 index 0000000..bdef52b --- /dev/null +++ b/0089-Backport-libsanitizer-cherry-pick-9cf13067cb5088626b.patch @@ -0,0 +1,46 @@ +From 655fcd3bad37d6d601c869a6471284cc8255e220 Mon Sep 17 00:00:00 2001 +From: liyancheng <412998149@qq.com> +Date: Wed, 23 Nov 2022 21:12:51 +0800 +Subject: [PATCH] [Backport] libsanitizer: cherry-pick 9cf13067cb5088626ba7 + from upstream + +[Reference] https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=2701442d0cf6292f6624443c15813d6d1a3562fe + +9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 +[sanitizer] Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 +--- + .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index aa845df4d..8b4162bcd 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -72,7 +72,9 @@ + #include + #include + #include ++#if SANITIZER_ANDROID + #include ++#endif + #include + #include + #include +@@ -833,10 +835,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; +-- +2.25.1 + diff --git a/gcc.spec b/gcc.spec index 4ebb8e7..d131dfd 100644 --- a/gcc.spec +++ b/gcc.spec @@ -61,7 +61,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: 21 +Release: 22 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD URL: https://gcc.gnu.org @@ -202,6 +202,7 @@ Patch85: 0085-loop-distribution-Bugfix-for-loop-distribution.patch Patch86: 0086-semi-relayout-Bugfix-for-struct-semi-relayout.patch Patch87: 0087-Backport-tree-optimization-97238-fix-typo-causing-IC.patch Patch88: 0088-Backport-fix-typo-causing-ICE.patch +Patch89: 0089-Backport-libsanitizer-cherry-pick-9cf13067cb5088626b.patch %global gcc_target_platform %{_arch}-linux-gnu @@ -744,6 +745,7 @@ not stable, so plugins must be rebuilt any time GCC is updated. %patch86 -p1 %patch87 -p1 %patch88 -p1 +%patch89 -p1 %build @@ -2767,6 +2769,13 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog +* Tue Jan 10 2023 liyancheng <412998149@qq.com> - 10.3.1-22 +- Type:Sync +- ID:NA +- SUG:NA +- DESC:Sync patch from openeuler/gcc + Fix conflict with glibc 2.36. + * Fri Dec 30 2022 Xiong Zhou - 10.3.1-21 - Type:Sync - ID:NA -- Gitee