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 C60EBA0350 for ; Sat, 6 Jun 2020 12:09:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2E5F11D146; Sat, 6 Jun 2020 12:09:23 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 16E231D146 for ; Sat, 6 Jun 2020 12:09:22 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 4DEB95C0132; Sat, 6 Jun 2020 06:09:21 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sat, 06 Jun 2020 06:09:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=mNKuoTb/Dav0qde1GnP7/AFLtJ FSWKAB780dEY90bLs=; b=uE3UCsqNzPxRd2jRe6kZjvoa8OcA7Bii1VMzLe47KC mFFG+NF8dkUj5TPpJeHudyJnUoJsTzEEHV0e+3buGApSAraeM2Qxl5V6T7lliAYP BcouCZDRR79GA3qYNLQ4YJ0nPhCf64yhfBZ/q9m1Nsjz+57OcNVBtk5tgZW45T/4 828rIQzd4+dqdXoauncKb6f8PIDhin1sCTTKwLkH0cUbCHNXr/aOEci8XjNjP3Un Geld+ZaAqj8eV0dUBRgLewyxsanqJvxfq+YsXdRXPY7GOJqko+s25z6pjdtCNdly yOEjJvmX2Lp5dtaQ2WHKh1kOfl/kfWp30pkhmr5o1JeA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=mNKuoTb/Dav0qde1G nP7/AFLtJFSWKAB780dEY90bLs=; b=RBYSAAiaSLlJCpxQ+oObByq+TI/rDnPvG 1rStOG3nLWtuq0jmjicZGPzdp/s6/Oe540O4/AYkf8L3hN3r/c4X85jTSbo5gvjr 2ubY52oTa+wdnreTa9pq1M0YH8IHHmn1uSljeDacfmW5yAm1l9IawLU4WeeGPehe O1/2ohKjLzPOk7OF2tKIff4bvm/bw2hpo2vRXKwhV5T7ECD4FCEzYAVqeXbmGEIG SJqZA8wmkgm+BqfrGbCo5zyJPUBrSjBccq3E7cMbGfOFaBZyJV7AUajTPRl+qsYD ZIloz2GXOCUKBaiyIFSIvUBESN2P6PC+kd1icsBF9aKbt2E1CPO9g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudeghedgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgrshcu ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuggftrf grthhtvghrnhepvdelvdduhedvudduveeuvdevheegudelgeeigfejheduhedttdegudff jeeihffgnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhn rdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id DB2D73060F09; Sat, 6 Jun 2020 06:09:19 -0400 (EDT) From: Thomas Monjalon To: stable@dpdk.org Cc: bluca@debian.org, Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko Date: Sat, 6 Jun 2020 12:08:56 +0200 Message-Id: <20200606100856.2073664-1-thomas@monjalon.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 19.11] net/mlx5: fix build with separate glue lib for dlopen 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" If building with option RTE_IBVERBS_LINK_DLOPEN (make) or ibverbs_link=dlopen (meson), the glue is a separate library which can be dlopen. In such case, the object mlx5_glue must be allocated in two places: one in the glue, and one outside of the glue to be assigned when loading the glue with dlopen/dlsym. When backporting the allocation split for gcc 10, both allocations were made inside the glue. As a consequence, the symbol is undefined outside of the glue: drivers/net/mlx5/mlx5.c: undefined reference to 'mlx5_glue' The second allocation is restored outside of the glue, in mlx5.c. Fixes: b3e01cd3e46f ("common/mlx5: fix build with -fno-common") Signed-off-by: Thomas Monjalon --- drivers/net/mlx5/mlx5.c | 4 ++++ drivers/net/mlx5/mlx5_glue.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 9161114978..8879df317d 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -187,6 +187,10 @@ struct mlx5_dev_spawn_data { struct rte_pci_device *pci_dev; /**< Backend PCI device. */ }; +#ifdef MLX5_GLUE +const struct mlx5_glue *mlx5_glue; +#endif + static LIST_HEAD(, mlx5_ibv_shared) mlx5_ibv_list = LIST_HEAD_INITIALIZER(); static pthread_mutex_t mlx5_ibv_list_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c index c2dd0392d0..44f63116a8 100644 --- a/drivers/net/mlx5/mlx5_glue.c +++ b/drivers/net/mlx5/mlx5_glue.c @@ -30,10 +30,6 @@ #include "mlx5_autoconf.h" #include "mlx5_glue.h" -#ifdef MLX5_GLUE -const struct mlx5_glue *mlx5_glue; -#endif - static int mlx5_glue_fork_init(void) { -- 2.26.2