packages/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Revert] Revert Backport libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream

Browse Source 
The glibc version of oe-22.03 is 2.34, so revert this unnecessary modification
This commit is contained in:
liyancheng 2023-05-24 16:28:38 +08:00
parent 0a6a82352b
commit 3cb850871b
2 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0089-Backport-libsanitizer-cherry-pick-9cf13067cb5088626b.patch
View File

@ -1,46 +0,0 @@
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 <linux/fs.h> 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 <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>
@@ -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

11
gcc.spec
View File

@ -61,7 +61,7 @@
Summary: Various compilers (C, C++, Objective-C, ...) Summary: Various compilers (C, C++, Objective-C, ...)
Name: gcc Name: gcc
Version: %{gcc_version} Version: %{gcc_version}
Release: 28 Release: 29
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
URL: https://gcc.gnu.org URL: https://gcc.gnu.org
@ -197,7 +197,6 @@ Patch85: 0085-loop-distribution-Bugfix-for-loop-distribution.patch
Patch86: 0086-semi-relayout-Bugfix-for-struct-semi-relayout.patch Patch86: 0086-semi-relayout-Bugfix-for-struct-semi-relayout.patch
Patch87: 0087-Backport-tree-optimization-97238-fix-typo-causing-IC.patch Patch87: 0087-Backport-tree-optimization-97238-fix-typo-causing-IC.patch
Patch88: 0088-Backport-fix-typo-causing-ICE.patch Patch88: 0088-Backport-fix-typo-causing-ICE.patch
Patch89: 0089-Backport-libsanitizer-cherry-pick-9cf13067cb5088626b.patch
Patch90: 0090-State-sysroot-option-as-validated-once-processed.patch Patch90: 0090-State-sysroot-option-as-validated-once-processed.patch
Patch91: 0091-bogus-Wstringop-overflow-with-VLA-of-elements-larger.patch Patch91: 0091-bogus-Wstringop-overflow-with-VLA-of-elements-larger.patch
Patch92: 0092-phiopt2-Add-option-to-control-the-simplify.patch Patch92: 0092-phiopt2-Add-option-to-control-the-simplify.patch
@ -743,7 +742,6 @@ not stable, so plugins must be rebuilt any time GCC is updated.
%patch86 -p1 %patch86 -p1
%patch87 -p1 %patch87 -p1
%patch88 -p1 %patch88 -p1
%patch89 -p1
%patch90 -p1 %patch90 -p1
%patch91 -p1 %patch91 -p1
%patch92 -p1 %patch92 -p1
@ -2771,6 +2769,13 @@ end
%doc rpm.doc/changelogs/libcc1/ChangeLog* %doc rpm.doc/changelogs/libcc1/ChangeLog*
%changelog %changelog
* Wed May 24 2023 liyancheng <412998149@qq.com> - 10.3.1-29
- Type:Revert
- ID:NA
- SUG:NA
- DESC:Revert patch89
The glibc version of oe-22.03 is 2.34, so revert it
* Mon May 22 2023 huangxiaoquan <huangxiaoquan1@huawei.com> - 10.3.1-28 * Mon May 22 2023 huangxiaoquan <huangxiaoquan1@huawei.com> - 10.3.1-28
- Type:Sync - Type:Sync
- ID:NA - ID:NA