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 AF82FA057C; Fri, 27 Mar 2020 02:16:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8374E1C06C; Fri, 27 Mar 2020 02:16:39 +0100 (CET) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id D5DA33B5 for ; Fri, 27 Mar 2020 02:16:38 +0100 (CET) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 896405C01CF; Thu, 26 Mar 2020 21:16:38 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 26 Mar 2020 21:16:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=xD3RkwV9cU ltXAJTxv0FjH3xtWzNgYlAuS9qSSuGMyE=; b=soG3JFxAKkNnZwi3D3DZVhcDWF oxdjcMbTO8+6JZyh8dx9JJe1qyR5HOBHV3pt4VN+ffXDy+dg4e4hwr5KYIitZBbt 8t+dMDZA1I8sifWd61o7pbXoYn2eFZi6epXXSm/pJiMjz9eTIBSQGPzTpU40roqh Q2SWgImE1YVHzYZlI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=xD3RkwV9cUltXAJTxv0FjH3xtWzNgYlAuS9qSSuGMyE=; b=glJdEHlC SbXN+mUhsNaC1qsLiSL2oNweOO7BFw11gDuoEwdMTLhC930nUg1HjUIdvPi6EEEJ 5bc2st4eITLNgQ7xswQXFWiXSAN4zAJPy+PfS9DfhekZ3EO0UODGvu+3tVC/l7wV ai1UCyxqTAxgFLHRA4nCZ1mbJQE4BfDSUE9zd/6O+g0VYfyOn7EFEvBzJZsUm3qd 7XTSRoIDWR4Z75d2jZKJqoxSzvz2fEgNIT2ZY3tfJFomo4uWPN86/ZSeIB7gL6TX iuKGt5vbKKiKlR3xTk+7gdXieX0HNUry5rL/EmqpMk4Fe6J+vVQii7GICNYQDIg7 LxiD8su7Dt5D3A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudehjedgudefudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhm rghsucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenuc ffohhmrghinhepvhgrrhhsrdhmkhenucfkphepjeejrddufeegrddvtdefrddukeegnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrg hssehmohhnjhgrlhhonhdrnhgvth 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 8DDF2306AC3D; Thu, 26 Mar 2020 21:16:37 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, Maxime Coquelin , Zhihong Wang , Xiaolong Ye Date: Fri, 27 Mar 2020 02:15:34 +0100 Message-Id: <20200327011540.954014-3-thomas@monjalon.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200327011540.954014-1-thomas@monjalon.net> References: <20200320001220.150235-1-thomas@monjalon.net> <20200327011540.954014-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 2/8] build: rename ppc sub-directories 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" The directories ppc_64 are renamed as ppc in - config/ - lib/librte_eal/common/arch/ - lib/librte_eal/common/include/arch/ The EAL directories are not really renamed, but symbolically linked, because they will be moved with their new name in the next commits. If ppc_32 needs to be supported, it can be in the same directory. The arch directories arm and x86 are already covering both 32 and 64-bit sub-architectures. Signed-off-by: Thomas Monjalon --- config/meson.build | 2 +- config/{ppc_64 => ppc}/meson.build | 0 drivers/net/virtio/meson.build | 2 +- lib/librte_eal/common/arch/ppc | 1 + lib/librte_eal/common/include/arch/ppc | 1 + mk/arch/ppc_64/rte.vars.mk | 1 + 6 files changed, 5 insertions(+), 2 deletions(-) rename config/{ppc_64 => ppc}/meson.build (100%) create mode 120000 lib/librte_eal/common/arch/ppc create mode 120000 lib/librte_eal/common/include/arch/ppc diff --git a/config/meson.build b/config/meson.build index abedd76f23..58421342b1 100644 --- a/config/meson.build +++ b/config/meson.build @@ -234,7 +234,7 @@ if host_machine.cpu_family().startswith('x86') elif host_machine.cpu_family().startswith('arm') or host_machine.cpu_family().startswith('aarch') arch_subdir = 'arm' elif host_machine.cpu_family().startswith('ppc') - arch_subdir = 'ppc_64' + arch_subdir = 'ppc' endif subdir(arch_subdir) dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) diff --git a/config/ppc_64/meson.build b/config/ppc/meson.build similarity index 100% rename from config/ppc_64/meson.build rename to config/ppc/meson.build diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build index 04c7fdf25d..5e7ca855c8 100644 --- a/drivers/net/virtio/meson.build +++ b/drivers/net/virtio/meson.build @@ -11,7 +11,7 @@ deps += ['kvargs', 'bus_pci'] if arch_subdir == 'x86' sources += files('virtio_rxtx_simple_sse.c') -elif arch_subdir == 'ppc_64' +elif arch_subdir == 'ppc' sources += files('virtio_rxtx_simple_altivec.c') elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64') sources += files('virtio_rxtx_simple_neon.c') diff --git a/lib/librte_eal/common/arch/ppc b/lib/librte_eal/common/arch/ppc new file mode 120000 index 0000000000..2db6a0c918 --- /dev/null +++ b/lib/librte_eal/common/arch/ppc @@ -0,0 +1 @@ +ppc_64 \ No newline at end of file diff --git a/lib/librte_eal/common/include/arch/ppc b/lib/librte_eal/common/include/arch/ppc new file mode 120000 index 0000000000..2db6a0c918 --- /dev/null +++ b/lib/librte_eal/common/include/arch/ppc @@ -0,0 +1 @@ +ppc_64 \ No newline at end of file diff --git a/mk/arch/ppc_64/rte.vars.mk b/mk/arch/ppc_64/rte.vars.mk index 39f5728fe8..9f7ab22f42 100644 --- a/mk/arch/ppc_64/rte.vars.mk +++ b/mk/arch/ppc_64/rte.vars.mk @@ -2,6 +2,7 @@ # Copyright (C) IBM Corporation 2014. ARCH ?= powerpc +ARCH_DIR := ppc CROSS ?= CPU_CFLAGS ?= -m64 -- 2.25.1