diff mbox series

[v2,2/8] build: rename ppc sub-directories

Message ID 20200327011540.954014-3-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series eal: reorganize directories layout |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Thomas Monjalon March 27, 2020, 1:15 a.m. UTC 
  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

Comments

David Christensen March 27, 2020, 5:49 p.m. UTC | #1 
On 3/26/20 6:15 PM, Thomas Monjalon wrote:
> 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>

Reviewed-by: David Christensen <drc@linux.vnet.ibm.com>
diff mbox series

Patch

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