From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 37/62] syslinux: Fix build with GCC 10 Date: Sun, 16 Aug 2020 10:29:28 +0000 Message-ID: <20200816102953.3881-37-michael.tremer@ipfire.org> In-Reply-To: <20200816102953.3881-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4512355725057395401==" List-Id: --===============4512355725057395401== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- lfs/syslinux | 2 + src/patches/syslinux-6.04_pre1-fcommon.patch | 54 +++++++++++++++++++ ...strlen-that-appears-to-get-optimized.patch | 28 ++++++++++ 3 files changed, 84 insertions(+) create mode 100644 src/patches/syslinux-6.04_pre1-fcommon.patch create mode 100644 src/patches/syslinux-6.04_replace-builtin-strlen-that-app= ears-to-get-optimized.patch diff --git a/lfs/syslinux b/lfs/syslinux index 1670da27e..b2eec0d5b 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -77,6 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) =20 # Apply patches cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.03-sysmacro= s.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_replace-= builtin-strlen-that-appears-to-get-optimized.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.04_pre1-fco= mmon.patch =20 # Build cd $(DIR_APP) && make bios $(MAKETUNING) diff --git a/src/patches/syslinux-6.04_pre1-fcommon.patch b/src/patches/sysli= nux-6.04_pre1-fcommon.patch new file mode 100644 index 000000000..7d061db26 --- /dev/null +++ b/src/patches/syslinux-6.04_pre1-fcommon.patch @@ -0,0 +1,54 @@ +https://bugs.gentoo.org/705730 + +gcc-10 enabled f-no-common by default. Broke syslinux linking. +--- a/mk/com32.mk ++++ b/mk/com32.mk +@@ -47,6 +47,7 @@ GCCOPT +=3D $(call gcc_ok,-falign-functions=3D0,-malign-fu= nctions=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-jumps=3D0,-malign-jumps=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-labels=3D0,-malign-labels=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-loops=3D0,-malign-loops=3D0) ++GCCOPT +=3D $(call gcc_ok,-fcommon) +=20 + ifeq ($(FWCLASS),EFI) + GCCOPT +=3D -mno-red-zone +--- a/mk/elf.mk ++++ b/mk/elf.mk +@@ -42,6 +42,7 @@ GCCOPT +=3D $(call gcc_ok,-falign-functions=3D0,-malign-fu= nctions=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-jumps=3D0,-malign-jumps=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-labels=3D0,-malign-labels=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-loops=3D0,-malign-loops=3D0) ++GCCOPT +=3D $(call gcc_ok,-fcommon) +=20 + com32 =3D $(topdir)/com32 + core =3D $(topdir)/core +--- a/mk/embedded.mk ++++ b/mk/embedded.mk +@@ -51,6 +51,7 @@ GCCOPT +=3D $(call gcc_ok,-falign-jumps=3D0,-malign-jum= ps=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-labels=3D0,-malign-labels=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-loops=3D0,-malign-loops=3D0) + GCCOPT +=3D $(call gcc_ok,-fvisibility=3Dhidden) ++GCCOPT +=3D $(call gcc_ok,-fcommon) +=20 + LIBGCC :=3D $(shell $(CC) $(GCCOPT) --print-libgcc) +=20 +--- a/mk/lib.mk ++++ b/mk/lib.mk +@@ -28,6 +28,7 @@ GCCOPT +=3D $(call gcc_ok,-falign-functions=3D0,-malign-fu= nctions=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-jumps=3D0,-malign-jumps=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-labels=3D0,-malign-labels=3D0) + GCCOPT +=3D $(call gcc_ok,-falign-loops=3D0,-malign-loops=3D0) ++GCCOPT +=3D $(call gcc_ok,-fcommon) +=20 + INCLUDE =3D -I$(SRC) + STRIP =3D strip --strip-all -R .comment -R .note +--- a/mk/efi.mk ++++ b/mk/efi.mk +@@ -7,7 +7,7 @@ core =3D $(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 :=3D $(call gcc_ok,-fno-stack-protector,) ++GCCOPT :=3D $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-fcommon) + EFIINC =3D $(objdir)/include/efi + LIBDIR =3D $(objdir)/lib +=20 diff --git a/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to= -get-optimized.patch b/src/patches/syslinux-6.04_replace-builtin-strlen-that-= appears-to-get-optimized.patch new file mode 100644 index 000000000..c70769fce --- /dev/null +++ b/src/patches/syslinux-6.04_replace-builtin-strlen-that-appears-to-get-op= timized.patch @@ -0,0 +1,28 @@ +diff --git a/dos/string.h b/dos/string.h +index f648de2d..407d0233 100644 +--- a/dos/string.h ++++ b/dos/string.h +@@ -5,12 +5,22 @@ + #ifndef _STRING_H + #define _STRING_H +=20 ++#include ++ + /* Standard routines */ + #define memcpy(a,b,c) __builtin_memcpy(a,b,c) + #define memmove(a,b,c) __builtin_memmove(a,b,c) + #define memset(a,b,c) __builtin_memset(a,b,c) + #define strcpy(a,b) __builtin_strcpy(a,b) +-#define strlen(a) __builtin_strlen(a) ++#define strlen(a) inline_strlen(a) ++ ++/* replacement for builtin strlen that appears to get optimized away */ ++static inline size_t inline_strlen(const char *str) ++{ ++ size_t l; ++ for (l =3D 0; *str++; l++); ++ return l; ++} +=20 + /* This only returns true or false */ + static inline int memcmp(const void *__m1, const void *__m2, unsigned int _= _n) --=20 2.20.1 --===============4512355725057395401==--