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 7BC76A00C4; Thu, 31 Oct 2019 15:09:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3663C1C29F; Thu, 31 Oct 2019 15:09:39 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 533271C29C for ; Thu, 31 Oct 2019 15:09:37 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 07:09:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,250,1569308400"; d="scan'208";a="199023588" Received: from silpixa00399953.ir.intel.com (HELO silpixa00399953.ger.corp.intel.com) ([10.237.223.218]) by fmsmga008.fm.intel.com with ESMTP; 31 Oct 2019 07:09:34 -0700 From: Ciara Power To: dev@dpdk.org, akhil.goyal@nxp.com Cc: Ciara Power , hemant.agrawal@nxp.com Date: Thu, 31 Oct 2019 14:05:52 +0000 Message-Id: <20191031140552.62117-1-ciara.power@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] crypto/dpaa2_sec: fix build with clang 3.4.2 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" Building with clang 3.4.2 caused the following error: CC dpaa2_sec_dpseci.o In file included from /dpdk/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c:40: In file included from /dpdk/drivers/common/dpaax/caamflib/desc/ipsec.h:11: In file included from /dpdk/drivers/common/dpaax/caamflib/rta.h:11: In file included from .../common/dpaax/caamflib/rta/sec_run_time_asm.h:14: /dpdk/drivers/common/dpaax/compat.h:108:18: error: redefinition of typedef 'dma_addr_t' is a C11 feature [-Werror,-Wtypedef-redefinition] typedef uint64_t dma_addr_t; ^ /dpdk/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c:37:18: note: previous definition is here typedef uint64_t dma_addr_t; ^ 1 error generated. The dma_addr_t was defined in the common compat.h file, and does not need to be redefined. The meson build include directories list was updated to enable the definition in the common compat.h file be used. Fixes: 8c83f28cc8a4 ("common/dpaax: move OF library from DPAA bus") Cc: hemant.agrawal@nxp.com Signed-off-by: Ciara Power --- The commit referenced adds the common/dpaax path to Makefiles as an include path, meaning the common/dpaax/compat.h file is included instead of common/dpaax/caamflib/compat.h by the other files. Is this the intended header file to be included? --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 3 --- drivers/crypto/dpaa2_sec/meson.build | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 52e522e4a..add3b9ea6 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -33,9 +33,6 @@ #include "dpaa2_sec_event.h" #include "dpaa2_sec_logs.h" -/* Required types */ -typedef uint64_t dma_addr_t; - /* RTA header files */ #include #include diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build index 1b749186c..9d1b170be 100644 --- a/drivers/crypto/dpaa2_sec/meson.build +++ b/drivers/crypto/dpaa2_sec/meson.build @@ -14,4 +14,4 @@ sources = files('dpaa2_sec_dpseci.c', allow_experimental_apis = true -includes += include_directories('mc', '../../common/dpaax/caamflib') +includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib') -- 2.17.1