diff --git a/backport-tweak-for-gcc-10.patch b/backport-tweak-for-gcc-10.patch new file mode 100644 index 0000000000000000000000000000000000000000..7313b71ddd5600035d281a32a36a79a2dc447e8a --- /dev/null +++ b/backport-tweak-for-gcc-10.patch @@ -0,0 +1,83 @@ +From 8284530f4bd86a38b9867f847bd844f5d8d08e87 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 6 Apr 2020 23:46:03 +0100 +Subject: sys-boot/syslinux: tweak for gcc-10, bug #705730 + +Closes: https://bugs.gentoo.org/705730 +Package-Manager: Portage-2.3.96, Repoman-2.3.22 +Signed-off-by: Sergei Trofimovich + +Reference:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8284530f4bd86a38b9867f847bd844f5d8d08e87 +https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c31ce51ace223e4439cde2b6b2a395e40ae9d5 +--- + mk/com32.mk | 1 + + mk/efi.mk | 2 +- + mk/elf.mk | 1 + + mk/embedded.mk | 1 + + mk/lib.mk | 1 + + 5 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/mk/com32.mk b/mk/com32.mk +index aeb8a2c..5ae14fe 100644 +--- a/mk/com32.mk ++++ b/mk/com32.mk +@@ -47,6 +47,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0) + GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) + GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0) + GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) ++GCCOPT += $(call gcc_ok,-fcommon) + + ifeq ($(FWCLASS),EFI) + GCCOPT += -mno-red-zone +diff --git a/mk/efi.mk b/mk/efi.mk +index f097ad2..a082bad 100644 +--- a/mk/efi.mk ++++ b/mk/efi.mk +@@ -7,7 +7,7 @@ core = $(topdir)/core + # Set up architecture specifics; for cross compilation, set ARCH as apt + # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories + # set up the LIBDIR and EFIINC for building for the appropriate architecture +-GCCOPT := $(call gcc_ok,-fno-stack-protector,) ++GCCOPT := $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-fcommon) + EFIINC = $(objdir)/include/efi + LIBDIR = $(objdir)/lib + +diff --git a/mk/elf.mk b/mk/elf.mk +index b46dbd0..7ac7600 100644 +--- a/mk/elf.mk ++++ b/mk/elf.mk +@@ -42,6 +42,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0) + GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) + GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0) + GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) ++GCCOPT += $(call gcc_ok,-fcommon) + + com32 = $(topdir)/com32 + core = $(topdir)/core +diff --git a/mk/embedded.mk b/mk/embedded.mk +index 488dc0f..bfca1a8 100644 +--- a/mk/embedded.mk ++++ b/mk/embedded.mk +@@ -51,6 +51,7 @@ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) + GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0) + GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) + GCCOPT += $(call gcc_ok,-fvisibility=hidden) ++GCCOPT += $(call gcc_ok,-fcommon) + + LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc) + +diff --git a/mk/lib.mk b/mk/lib.mk +index 54f1fd5..baad194 100644 +--- a/mk/lib.mk ++++ b/mk/lib.mk +@@ -28,6 +28,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0) + GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) + GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0) + GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) ++GCCOPT += $(call gcc_ok,-fcommon) + + INCLUDE = -I$(SRC) + STRIP = strip --strip-all -R .comment -R .note +-- +2.27.0 + diff --git a/syslinux.spec b/syslinux.spec index 865b1752b6de0f7dbe636d0e3bc7260a7236c47f..a84e6ff08eb3a1db8b4fa7dc4b92fd5831593438 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -2,7 +2,7 @@ Name: syslinux Version: 6.04 -Release: 9 +Release: 10 License: GPLv2+ Summary: The Syslinux boot loader collection URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project @@ -25,6 +25,7 @@ Patch0003: 0003-include-sysmacros-h.patch Patch0004: backport-replace-builtin-strlen-that-appears-to-get-optimized.patch Patch0005: backport-add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch +Patch0006: backport-tweak-for-gcc-10.patch %description The Syslinux Project covers lightweight bootloaders for MS-DOS FAT filesystems (SYSLINUX), @@ -159,6 +160,9 @@ fi %{_datadir}/syslinux/efi64 %changelog +* Mon Sep 6 2021 yangcheng - 6.04-10 +- fix build failed due to gcc-10 + * Mon Sep 6 2021 yangcheng - 6.04-9 - Streamline the build dependency and fix the compiling stuck