From 1d861978463fdc247a7a57464b8349debba51912 Mon Sep 17 00:00:00 2001 From: Bertrand Marquis Date: Fri, 9 Oct 2020 13:37:18 +0100 Subject: ipxe: Fix gcc10 compilation Add ipxe patch to pass -fcommon flag to gcc during compilation. This patch is required to have ipxe compiling properly with gcc10. Without it the following error occur (and multiple others of the same kind: bin/blib.a(epic100.o):(.bss+0x0): multiple definition of `_shared_bss'; bin/blib.a(davicom.o):(.bss+0x0): first defined here Change-Id: Id9aed4cfe6bec9c0cbdb0b99271ddff472f1f0c3 Signed-off-by: Bertrand Marquis Signed-off-by: Bruce Ashfield --- ...explicit-about-fcommon-compiler-directive.patch | 33 ++++++++++++++++++++++ recipes-extended/ipxe/ipxe_git.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 recipes-extended/ipxe/files/build-be-explicit-about-fcommon-compiler-directive.patch diff --git a/recipes-extended/ipxe/files/build-be-explicit-about-fcommon-compiler-directive.patch b/recipes-extended/ipxe/files/build-be-explicit-about-fcommon-compiler-directive.patch new file mode 100644 index 00000000..6fa58580 --- /dev/null +++ b/recipes-extended/ipxe/files/build-be-explicit-about-fcommon-compiler-directive.patch @@ -0,0 +1,33 @@ +From f982a712979619dbae2c6e0d741757e2ce94be11 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Bruce Rogers +Date: Wed, 6 May 2020 15:03:02 -0600 +Subject: [PATCH] [build] Be explicit about -fcommon compiler directive + +gcc10 switched default behavior from -fcommon to -fno-common. Since +"__shared" relies on the legacy behavior, explicitly specify it. + +Upstream-Status: backport + +Signed-off-by: Bruce Rogers +Modified-by: Michael Brown +Signed-off-by: Michael Brown +--- + src/Makefile.housekeeping | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping +index 66d6dd44..b6c61c11 100644 +--- a/Makefile.housekeeping ++++ b/Makefile.housekeeping +@@ -418,6 +418,7 @@ CFLAGS += -Os + CFLAGS += -g + ifeq ($(CCTYPE),gcc) + CFLAGS += -ffreestanding ++CFLAGS += -fcommon + CFLAGS += -Wall -W -Wformat-nonliteral + HOST_CFLAGS += -Wall -W -Wformat-nonliteral + endif +-- +2.17.1 + diff --git a/recipes-extended/ipxe/ipxe_git.bb b/recipes-extended/ipxe/ipxe_git.bb index fbaad309..d7c60ab0 100644 --- a/recipes-extended/ipxe/ipxe_git.bb +++ b/recipes-extended/ipxe/ipxe_git.bb @@ -15,6 +15,7 @@ SRC_URI = " \ file://ipxe-fix-hostcc-nopie-cflags.patch \ file://ipxe-intel-Avoid-spurious-compiler-warning-on-GCC-10.patch \ file://ipxe-golan-Add-explicit-type-casts-for-nodnic_queue_pair_.patch \ + file://build-be-explicit-about-fcommon-compiler-directive.patch \ " FILES_${PN} = "/usr/share/firmware/*.rom" -- cgit v1.2.3-54-g00ecf