From patchwork Thu Mar 19 11:22:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Marko X-Patchwork-Id: 1258113 X-Patchwork-Delegate: lynxis@fe80.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sartura.hr Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=hLciw/VM; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sartura-hr.20150623.gappssmtp.com header.i=@sartura-hr.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=McNDz2ZH; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48jkz731g5z9sRY for ; Thu, 19 Mar 2020 22:22:42 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=hp9tiPwmG8zZQWeYG8PP+6UEOmVaYyo2UOc1r8y+qnw=; b=hLciw/VMdyUWK8 peBKEvU5qvZLRDVihTtGXDAclz66YJbyN/N0owePaXPX0I5MbzcdWqTKjVDg5kAzud+UvLE1reVQ8 4PIt4ESLw6bFHcEEUw86BTM3jHtGLi7O7zSLkeif9sSSNW0jMr0TH9n+eXdKzYwT/xkw+5yqECE92 onfyv817q5PoyR61UvuUejTqrFt1wMaee036J5oZ/4CzYqYug1ypZAku3bQcyYYJb4j6oBqhc8WBa 7LDndpRnZKy7y/QzoMZTC8P/Cc8GBbEYD4y0ntvP9vHOVjAmx+cIrefW6Wxc3ZT1uMA3puv0dmtJS 4Iv4KLHawzxNv7SSdUoA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEtG2-0003pM-IG; Thu, 19 Mar 2020 11:22:38 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEtFz-0003p2-Kv for openwrt-devel@lists.openwrt.org; Thu, 19 Mar 2020 11:22:37 +0000 Received: by mail-wr1-x443.google.com with SMTP id h6so2399050wrs.6 for ; Thu, 19 Mar 2020 04:22:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sartura-hr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Jt1PZ6hveZbh/oewKfvv5TuGezrBEGdoNtGom8w2jVE=; b=McNDz2ZHVZVGHAJOA6rWYQ7q5MNDvGz5qnlmZb9/F+VNTHz6hjdd6lT3ICdDlBf0ay CqnYbt1N9mDJc36fi3nOK0RGkHpctkB1F3timkjvQELFYIOSVeplE1qjxprVRMMkZdco bZ+b8RJDwYIAGp/3MwkSwX0JUoVtbQJ30vYsK02PXar9aWQSvgil9cMTeJRFBVbeN9Gn 4ePYQzedmfhuTFIidiFqh5NMxRI16hQRW5AZ3SKxeApkzLY1iv1mqvSVsfZTOjWKJJ76 /OsFLlB4yJ975yPLd+1r3Rb4y6HpRBuLOQBesacpFMD+iJV+E+zKtc1Hp5Wq91PR01nW GEHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Jt1PZ6hveZbh/oewKfvv5TuGezrBEGdoNtGom8w2jVE=; b=IDjYfJzd0nHDsnVUOM2U+qUogIWLD2Uo3iPbz5QuptF4meMwLzS3Nd/laFCoTddQsp EzyiF3H911va10C75cEDdjsUKrXQ8LQwGh69UWPRZBotN8n2ixyBFhkwbZKNVBHLGJgh Y70d4827MCHvBr1wW1/wbFXv6rl02oL3+EAxXvWW7tiBlpmOBvX5Eht1XYZwLCh5d9lY t32OmSjBh7d1/NzQfBEcZhsAclrwyQkbjkqbeBOhse2wBiFXUQLyneoVNZ43yxkdy48o Kz/dgSBKsV0IXpFbymFOp82NSVDM00xmw5MXL2aHihCyz/xEXBDkIKmIYQ04exBD6c8B B7ZQ== X-Gm-Message-State: ANhLgQ2od5bcaI1oEWky923kRIoLLrYSv683HJDr2JezCzSH/bXIJVwD vmdLbOJHJaR/hLiTb6UCv6emfM0nbC4wE3DO00gBm8ELFY8UIIexp9mRQQ0S6xKVVkr7Jbb3un/ 4hWJ6gXygIxJID7jo7F5FBoy1Gt9eBeV2GcZkdg0sbgk1/ktU9jetSbQfMV0yzapJPVPosq2ZkY B0aCnetX2Q X-Google-Smtp-Source: ADFU+vvDPb9H8ZrOdGME/cTTvbZzDwj2k/b60038KtKQJuDZXqD5DERYGuIXqExks//Is02EEPSWzw== X-Received: by 2002:adf:80af:: with SMTP id 44mr3656273wrl.241.1584616952640; Thu, 19 Mar 2020 04:22:32 -0700 (PDT) Received: from localhost.localdomain (dh207-96-37.xnet.hr. [88.207.96.37]) by smtp.googlemail.com with ESMTPSA id v2sm3102720wrt.58.2020.03.19.04.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2020 04:22:31 -0700 (PDT) From: Robert Marko X-Google-Original-From: Robert Marko To: openwrt-devel@lists.openwrt.org Date: Thu, 19 Mar 2020 12:22:07 +0100 Message-Id: <20200319112206.620246-1-robimarko@gmail.com> X-Mailer: git-send-email 2.26.0.rc2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200319_042235_748594_922974B8 X-CRM114-Status: GOOD ( 13.04 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH] tools: squashfskit4: fix build with GCC10 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Marko Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Robert Marko In order to build squashfskit with GCC10, this backport from upstream is needed. Signed-off-by: Robert Marko --- ...002-fix-build-failure-against-gcc-10.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch diff --git a/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch new file mode 100644 index 0000000000..46c6a5ea0f --- /dev/null +++ b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch @@ -0,0 +1,43 @@ +From fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 26 Jan 2020 18:35:13 +0000 +Subject: [PATCH] squashfs-tools: fix build failure against gcc-10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On gcc-10 (and gcc-9 -fno-common) build fails as: + +``` +cc ... -o mksquashfs +ld: read_fs.o:(.bss+0x0): + multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here +ld: read_fs.o:(.bss+0x8): + multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here +``` + +gcc-10 will change the default from -fcommon to fno-common: +https://gcc.gnu.org/PR85678. + +The error also happens if CFLAGS=-fno-common passed explicitly. + +Reported-by: Toralf Förster +Bug: https://bugs.gentoo.org/706456 +Signed-off-by: Sergei Trofimovich +--- + squashfs-tools/mksquashfs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h +index 1beefef7..b6503063 100644 +--- a/squashfs-tools/mksquashfs.h ++++ b/squashfs-tools/mksquashfs.h +@@ -143,7 +143,7 @@ struct append_file { + #endif + + extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; +-struct cache *bwriter_buffer, *fwriter_buffer; ++extern struct cache *bwriter_buffer, *fwriter_buffer; + extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, + *to_frag, *locked_fragment, *to_process_frag; + extern struct append_file **file_mapping;