From patchwork Sun Aug 16 10:29:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3341 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BTtkl2T6hz3x0m for ; Sun, 16 Aug 2020 10:31:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BTtjm2VvQzyY; Sun, 16 Aug 2020 10:30:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BTtjd0nr4z30Z1; Sun, 16 Aug 2020 10:30:29 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BTtjZ6f5qz30Wc for ; Sun, 16 Aug 2020 10:30:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BTtjY43x9ztw; Sun, 16 Aug 2020 10:30:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1597573825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bwv9NChGqED81LspZt7DIBIrS9foefywat7xMnF0WU0=; b=WbIiDptJBU7MBX+jIDWBSOhCrrrGG4FYTvqmvTHxRTx28l32s5ZbwMiYxAlkH/ZbBtFvgJ 2SQ+ij4Uc/wbjyCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1597573825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Bwv9NChGqED81LspZt7DIBIrS9foefywat7xMnF0WU0=; b=PmP2yL1O5G3Xf0hXsxPdBAvDhekSop3ikKK+RyYSKnZG8jlqmahEgB9/b8MySpShy4vON0 JNTpgLOuRd+KsuVPUQnsYwJvyAbh+UPLRSuniO1Ft7XjWhu19lZkDfliMnMx+NZko453XS MUcagOaf+nCL2gV7P3fQ9GQD6TRgktw66OW2FfvfHy+QwBlnSghHXJXAhekUjLODicfNO6 QgG54Exd8SpIEo1qCW9BHvpX2gpYJ5FbebJLfC1RHup7ZaY7gADe7Vpi6xM0QyOtY5viqr pUsDY1FxFCIn2/clwoT6rQeAxPBJBzMuzbGU8jNNTl31M+B1T8AfdyTrRLhUWg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 36/62] ipfire-netboot: Fix build with GCC 10 Date: Sun, 16 Aug 2020 10:29:27 +0000 Message-Id: <20200816102953.3881-36-michael.tremer@ipfire.org> In-Reply-To: <20200816102953.3881-1-michael.tremer@ipfire.org> References: <20200816102953.3881-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/ipfire-netboot | 1 + ...cit-about-fcommon-compiler-directive.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch diff --git a/lfs/ipfire-netboot b/lfs/ipfire-netboot index 23f5d4375..af9ef8e92 100644 --- a/lfs/ipfire-netboot +++ b/lfs/ipfire-netboot @@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && tar axf $(DIR_DL)/ipxe-$(PXE_VER).tar.gz cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-fix-stringop-truncation-warning-with-gcc-8-x.patch cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-handle-R_X86_64_PLT32.patch + cd $(DIR_APP)/ipxe-$(PXE_VER) && patch -Np1 < $(DIR_SRC)/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe cd $(DIR_APP) && make $(MAKETUNING) bin/ipxe.lkrn ifeq "$(BUILD_ARCH)" "x86_64" 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 new file mode 100644 index 000000000..9df561f67 --- /dev/null +++ b/src/patches/ipxe-1b67a05-be-explicit-about-fcommon-compiler-directive.patch @@ -0,0 +1,27 @@ +From f982a712979619dbae2c6e0d741757e2ce94be11 Mon Sep 17 00:00:00 2001 +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. + +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 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