From patchwork Mon Jul 13 15:37:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 73965 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D4B62A0540; Mon, 13 Jul 2020 17:37:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4481E1D728; Mon, 13 Jul 2020 17:37:46 +0200 (CEST) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id 438281C069 for ; Mon, 13 Jul 2020 17:37:45 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id B18C55C01F2; Mon, 13 Jul 2020 11:37:43 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Mon, 13 Jul 2020 11:37:43 -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=e9V6HL7DrUPwDRiFpvKvxhH3SN ksxIKQEfJOioxUND8=; b=p3vIh99v43rXJwJ0/htGC2Y6iNNNx8eIYSJSTbiciB MNjSvcGUfSd1Knxz2GN9yqThHuqRYPpUykeXF4Ubi/xLMkoMVh3sU1B4oCDZNJhl JHfIceH9jgioxr0xFEC6I56JlXropGtXwAZFDrg9zBXky4nv87dV46qJ7rjcP5g2 orA8tXKdYNPZGWWtQcx3lskZAVnKjaPD4owpVyZdcMgArjOyR42IXI3VyZsKHAET i+cDRczO2VmPS/xz91GpTGlyu9wXN0iBSNeqRlUBt/YD2u0MfLfROWviemp4UNPC U1uUmmqQRZVOMmS7oEzthvp6DgoHm44xL6JJS/JUwt/g== 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=e9V6HL7DrUPwDRiFp vKvxhH3SNksxIKQEfJOioxUND8=; b=RhwByJi/V3cQN4lUjue9ivocPPTlYonti PPqJYgn/yZ1QpJnYRVmcpS+zj/wnkV56MV54/W2xfDd/5NMnoUpxmkezCObVi2/f 8cynhV1Cdrb0g646OOS5HTWn/Q3MV5MMSXqudFcJFGphX8NNZgZsdaDBlwY6xWIM 21rsXRhByfxCeOufvvxYrqt2+ImcJPG7YiTynTn+EG3s4e5HXvkq7ofv0NDcGPhU HPviS5G1SoKMmRy6mZSes7L1V4Vi23/pbLHtc82JSBNItWb0rZZl0otEP3R94DOx NqJnyq2YLdwETht15q65wMbcFsQx0/3tTZX5tbLtL7i9zEwIac2FA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrvdekgdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghsucfo ohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtffrrg htthgvrhhnpedvledvudehvdduudevuedvveehgeduleegiefgjeehudehtddtgeduffej iefhgfenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdr nhgvth 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 4885C306005F; Mon, 13 Jul 2020 11:37:42 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: rasland@mellanox.com, ophirmu@mellanox.com, Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko Date: Mon, 13 Jul 2020 17:37:10 +0200 Message-Id: <20200713153710.807451-1-thomas@monjalon.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] common/mlx5: fix link with ibverbs glue dlopen option X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In case the ibverbs glue is a separate library to dlopen, the PMD library must allocate a glue structure to be filled by dlopen. The glue management was in mlx5_common.c and moved to mlx5_common_os.c, but the variable allocation was not removed from the original file. The consequence was a link failure, if ibverbs dlopen option is enabled, because of the redefinition of the variable (with GCC 10): multiple definition of 'mlx5_glue' The original definition is removed to keep only the one moved in the Linux sub-directory. Fixes: 79aa430721b1 ("common/mlx5: split common file under Linux directory") Cc: ophirmu@mellanox.com Signed-off-by: Thomas Monjalon Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_common.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index 693e2c68c8..341239d164 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -16,10 +16,6 @@ int mlx5_common_logtype; -#ifdef MLX5_GLUE -const struct mlx5_glue *mlx5_glue; -#endif - uint8_t haswell_broadwell_cpu; static int