From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 02/15] gcc: Fix build against glibc 2.36
Date: Mon, 15 Aug 2022 17:17:40 +0000
Message-ID: <20220815171753.1858688-2-michael.tremer@ipfire.org>
In-Reply-To: <20220815171753.1858688-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8899458287621849634=="
List-Id: <development.lists.ipfire.org>

--===============8899458287621849634==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/gcc                                       |  2 +
 .../gcc-11.3.0-glibc-2.36-headers-fix.patch   | 44 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/patches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch

diff --git a/lfs/gcc b/lfs/gcc
index d04063a91..f25548892 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -236,6 +236,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_D=
L)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/gcc-build
=20
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc/gcc-11.3.0-glibc-2=
.36-headers-fix.patch
+
 	cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefi=
le.in
 	cd $(DIR_APP) && sed -i gcc/Makefile.in \
 		-e 's@\./fixinc\.sh(a)-c true@' \
diff --git a/src/patches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch b/src/pa=
tches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch
new file mode 100644
index 000000000..b9143d462
--- /dev/null
+++ b/src/patches/gcc/gcc-11.3.0-glibc-2.36-headers-fix.patch
@@ -0,0 +1,44 @@
+From d2356ebb0084a0d80dbfe33040c9afe938c15d19 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska(a)suse.cz>
+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)
+---
+ .../sanitizer_platform_limits_posix.cpp                | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.c=
pp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+index 025e575b5bc..5743516c046 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>
+@@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz =3D sizeof(Elf_Phdr);
+   unsigned IOCTL_EVIOCGPROP =3D IOCTL_NOT_PRESENT;
+   unsigned IOCTL_EVIOCSKEYCODE_V2 =3D IOCTL_NOT_PRESENT;
+ #endif
+-  unsigned IOCTL_FS_IOC_GETFLAGS =3D FS_IOC_GETFLAGS;
+-  unsigned IOCTL_FS_IOC_GETVERSION =3D FS_IOC_GETVERSION;
+-  unsigned IOCTL_FS_IOC_SETFLAGS =3D FS_IOC_SETFLAGS;
+-  unsigned IOCTL_FS_IOC_SETVERSION =3D FS_IOC_SETVERSION;
++  unsigned IOCTL_FS_IOC_GETFLAGS =3D _IOR('f', 1, long);
++  unsigned IOCTL_FS_IOC_GETVERSION =3D _IOR('v', 1, long);
++  unsigned IOCTL_FS_IOC_SETFLAGS =3D _IOW('f', 2, long);
++  unsigned IOCTL_FS_IOC_SETVERSION =3D _IOW('v', 2, long);
+   unsigned IOCTL_GIO_CMAP =3D GIO_CMAP;
+   unsigned IOCTL_GIO_FONT =3D GIO_FONT;
+   unsigned IOCTL_GIO_UNIMAP =3D GIO_UNIMAP;
+--=20
+2.30.2
+
--=20
2.30.2


--===============8899458287621849634==--