Merge branch 'master' of ssh://people.ipfire.org/pub/git/ipfire-2.x

[people/stevee/ipfire-2.x.git] / src / patches / ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch

diff --git a/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch b/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
deleted file mode 100644 (file)
index 9df561f..0000000
--- a/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f982a712979619dbae2c6e0d741757e2ce94be11 Mon Sep 17 00:00:00 2001
-From: Bruce Rogers <brogers@suse.com>
-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.
-
-Signed-off-by: Bruce Rogers <brogers@suse.com>
-Modified-by: Michael Brown <mcb30@ipxe.org>
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
----
- src/Makefile.housekeeping | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
-index 66d6dd449..b6c61c112 100644
---- a/src/Makefile.housekeeping
-+++ b/src/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