From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D5F31A0093 for ; Tue, 19 May 2020 14:58:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CBBE91D61E; Tue, 19 May 2020 14:58:37 +0200 (CEST) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by dpdk.org (Postfix) with ESMTP id 8FC331D610 for ; Tue, 19 May 2020 14:58:36 +0200 (CEST) Received: by mail-wm1-f54.google.com with SMTP id n18so3433307wmj.5 for ; Tue, 19 May 2020 05:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iynGQWZh7eUHgn3aCa6I0IdtLMTpFJW0fU9eATxQwDA=; b=Fb422d7tUaY4Z8+rjcm13zHvZhkAPS5MLFa+jn6Py4MkdOcB9Qy+8mIMGqC5f8ZBS6 PtG7PJK7/mBtM/QYOnkup6Zp2DarqXm029U2ZU+iWgBORm/wReU8RzU9raYiLAIVBOO/ NBiO19AB/0S9m7mv9OUUqih7TDE95E9N9EeL+5q1Pk/jkN0us6H1rv/tpBHxEvN5cAZi UCEsPc9NCj9fieUGg28NoEf/p2WY+r7MiJ+/sOsPQTxzwjDX+Q3WPoJKnAJfLKSi0uyN BHE7MJJ8Yi4KyCSe4RQ4bEfSuDXwasOhsJPc9CY0HvNU9Qn+e5dVCt6EmN0H+3hdHkyP X9Rw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=iynGQWZh7eUHgn3aCa6I0IdtLMTpFJW0fU9eATxQwDA=; b=b8wWhN9pn3bXp3Q5BAEzx60KRfbPQ2y5ZgR6k4fJLAiSa8mVE8Rd+KyheBIlgBw6vK 2qIqcSBG1ZV3Y5TrhJvLXY03AGWTTSWJXtKEC4Dhnyuo0QWHcfQiQnG9h6IY3QtLfHr/ pTjgRDsMui8GoVuAuMLXLRf58uNm+wSH5mIDTx3hhVi/f0mHmgUCwv8kbbuqWDsM5a4Z 0dH8N9tMQlSZvEYNF0+A/Qm5n33i7NntkuAI4nXK3cpCrPsb7sCkSp44XqrMAY0x9aS0 0XKaIJ0KVLlwX5YBfIuS8JMt7oA5vL6fLzDcZpmBD8Mn6H4lwOY2zzFgM2uA3kzNDcVc LAUA== X-Gm-Message-State: AOAM532K1xSb49XcZlR8R8F30e+TQgXv3i5alpPkl8LlBJKaMhMDYeu1 zgSFe8X1LkokMv//RWyabKM= X-Google-Smtp-Source: ABdhPJwW51kps+oqibfQsS/yoa9K/GiZWKYBXR8L9MNMwN9MvJJSbT50IiC1c5bB/CFY0e2P4K6V5g== X-Received: by 2002:a1c:bad6:: with SMTP id k205mr4110010wmf.53.1589893116337; Tue, 19 May 2020 05:58:36 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j1sm20650008wrm.40.2020.05.19.05.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:35 -0700 (PDT) From: luca.boccassi@gmail.com To: Timothy Redaelli Cc: David Marchand , dpdk stable Date: Tue, 19 May 2020 13:53:15 +0100 Message-Id: <20200519125804.104349-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/eventdev: fix build with gcc 10' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 4de659fdc0488e13b463134592fd48ef5ab45992 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 5 Feb 2020 18:05:45 +0100 Subject: [PATCH] examples/eventdev: fix build with gcc 10 [ upstream commit 78de15bb586ac3d8938512db1977d83815c494f8 ] GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: 3d1b33e44ae2 ("examples/eventdev: move common data into pipeline common") Signed-off-by: Timothy Redaelli Acked-by: David Marchand --- examples/eventdev_pipeline/main.c | 2 ++ examples/eventdev_pipeline/pipeline_common.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/eventdev_pipeline/main.c b/examples/eventdev_pipeline/main.c index d3ff1bbe4f..d0da51b1c9 100644 --- a/examples/eventdev_pipeline/main.c +++ b/examples/eventdev_pipeline/main.c @@ -10,6 +10,8 @@ #include "pipeline_common.h" +struct fastpath_data *fdata; + struct config_data cdata = { .num_packets = (1L << 25), /* do ~32M packets */ .num_fids = 512, diff --git a/examples/eventdev_pipeline/pipeline_common.h b/examples/eventdev_pipeline/pipeline_common.h index 8e30393d09..c7245f7f0f 100644 --- a/examples/eventdev_pipeline/pipeline_common.h +++ b/examples/eventdev_pipeline/pipeline_common.h @@ -93,8 +93,8 @@ struct port_link { uint8_t priority; }; -struct fastpath_data *fdata; -struct config_data cdata; +extern struct fastpath_data *fdata; +extern struct config_data cdata; static __rte_always_inline void exchange_mac(struct rte_mbuf *m) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:19.058517299 +0100 +++ 0005-examples-eventdev-fix-build-with-gcc-10.patch 2020-05-19 13:56:18.171500955 +0100 @@ -1,14 +1,15 @@ -From 78de15bb586ac3d8938512db1977d83815c494f8 Mon Sep 17 00:00:00 2001 +From 4de659fdc0488e13b463134592fd48ef5ab45992 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 5 Feb 2020 18:05:45 +0100 Subject: [PATCH] examples/eventdev: fix build with gcc 10 +[ upstream commit 78de15bb586ac3d8938512db1977d83815c494f8 ] + GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: 3d1b33e44ae2 ("examples/eventdev: move common data into pipeline common") -Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli Acked-by: David Marchand