From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: david.marchand@redhat.com,
Maxime Coquelin <maxime.coquelin@redhat.com>,
Zhihong Wang <zhihong.wang@intel.com>,
Xiaolong Ye <xiaolong.ye@intel.com>
Subject: [dpdk-dev] [PATCH v2 2/8] build: rename ppc sub-directories
Date: Fri, 27 Mar 2020 02:15:34 +0100 [thread overview]
Message-ID: <20200327011540.954014-3-thomas@monjalon.net> (raw)
In-Reply-To: <20200327011540.954014-1-thomas@monjalon.net>
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 <thomas@monjalon.net>
---
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
next prev parent reply other threads:[~2020-03-27 1:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-20 0:12 [dpdk-dev] [PATCH] eal: reorganize directories layout Thomas Monjalon
2020-03-20 9:34 ` Bruce Richardson
2020-03-20 11:46 ` Thomas Monjalon
2020-03-27 1:15 ` [dpdk-dev] [PATCH v2 0/8] " Thomas Monjalon
2020-03-27 1:15 ` [dpdk-dev] [PATCH v2 1/8] eal: remove useless makefiles Thomas Monjalon
2020-03-27 12:05 ` Bruce Richardson
2020-03-27 1:15 ` Thomas Monjalon [this message]
2020-03-27 17:49 ` [dpdk-dev] [PATCH v2 2/8] build: rename ppc sub-directories David Christensen
2020-03-27 1:15 ` [dpdk-dev] [PATCH v2 3/8] eal: move arch-specific C files Thomas Monjalon
2020-03-27 17:46 ` David Christensen
2020-03-27 1:15 ` [dpdk-dev] [PATCH v2 4/8] eal: move arch-specific header files Thomas Monjalon
2020-03-27 2:39 ` Gavin Hu
2020-03-27 17:47 ` David Christensen
2020-03-27 1:15 ` [dpdk-dev] [PATCH v2 5/8] eal: simplify meson build of common directory Thomas Monjalon
2020-03-27 1:15 ` [dpdk-dev] [PATCH v2 6/8] eal: move common header files Thomas Monjalon
2020-03-30 13:25 ` David Marchand
2020-03-27 1:15 ` [dpdk-dev] [PATCH v2 7/8] eal: move OS-specific sub-directories Thomas Monjalon
2020-03-27 1:15 ` [dpdk-dev] [PATCH v2 8/8] eal: clean make and meson files Thomas Monjalon
2020-03-27 14:47 ` [dpdk-dev] [PATCH v2 0/8] eal: reorganize directories layout Stephen Hemminger
2020-03-27 15:12 ` Thomas Monjalon
2020-03-30 14:22 ` David Marchand
2020-03-31 11:13 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200327011540.954014-3-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=xiaolong.ye@intel.com \
--cc=zhihong.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).