summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2018-09-26 10:15:36 +0100
committerThomas Monjalon <thomas@monjalon.net>2019-02-26 18:34:28 +0100
commitd23e141ffa52e3ae13a5fd1c1cfb88f40cbd06f3 (patch)
tree82581e368a8279a9f17ea98abfd1a1e7c9ebae9f /config
parent3655096fb1dee33ce1e1f63da7b8b3b0c3aa3c2d (diff)
downloaddpdk-next-eventdev-d23e141ffa52e3ae13a5fd1c1cfb88f40cbd06f3.zip
dpdk-next-eventdev-d23e141ffa52e3ae13a5fd1c1cfb88f40cbd06f3.tar.gz
dpdk-next-eventdev-d23e141ffa52e3ae13a5fd1c1cfb88f40cbd06f3.tar.xz
build: set RTE_ARCH_64 based on pointer size
Rather than relying on the target machine architecture, use the size of a pointer from the compiler to determine if we are 64-bits or not. This allows correct behaviour when you pass -m32 as a compile option. It also allows us to use this value repeatedly throughout the repo rather than continually testing for the sizeof(void*). Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Tested-by: Luca Boccassi <bluca@debian.org> Acked-by: Luca Boccassi <bluca@debian.org>
Diffstat (limited to 'config')
-rw-r--r--config/arm/meson.build3
-rw-r--r--config/meson.build5
-rw-r--r--config/ppc_64/meson.build4
-rw-r--r--config/x86/meson.build3
4 files changed, 9 insertions, 6 deletions
diff --git a/config/arm/meson.build b/config/arm/meson.build
index dae55d6..4e3bc6a 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -89,7 +89,7 @@ impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
-if cc.sizeof('void *') != 8
+if not dpdk_conf.get('RTE_ARCH_64')
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
dpdk_conf.set('RTE_ARCH_ARM', 1)
dpdk_conf.set('RTE_ARCH_ARMv7', 1)
@@ -99,7 +99,6 @@ if cc.sizeof('void *') != 8
else
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 128)
dpdk_conf.set('RTE_ARCH_ARM64', 1)
- dpdk_conf.set('RTE_ARCH_64', 1)
machine = []
cmd_generic = ['generic', '', '', 'default', '']
diff --git a/config/meson.build b/config/meson.build
index db32499..c094c47 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -43,6 +43,8 @@ toolchain = cc.get_id()
dpdk_conf.set_quoted('RTE_TOOLCHAIN', toolchain)
dpdk_conf.set('RTE_TOOLCHAIN_' + toolchain.to_upper(), 1)
+dpdk_conf.set('RTE_ARCH_64', cc.sizeof('void *') == 8)
+
add_project_link_arguments('-Wl,--no-as-needed', language: 'c')
dpdk_extra_ldflags += '-Wl,--no-as-needed'
@@ -90,7 +92,7 @@ warning_flags = [
'-Wcast-qual',
'-Wno-address-of-packed-member'
]
-if cc.sizeof('void *') == 4
+if not dpdk_conf.get('RTE_ARCH_64')
# for 32-bit, don't warn about casting a 32-bit pointer to 64-bit int - it's fine!!
warning_flags += '-Wno-pointer-to-int-cast'
endif
@@ -110,6 +112,7 @@ dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
+
compile_time_cpuflags = []
if host_machine.cpu_family().startswith('x86')
arch_subdir = 'x86'
diff --git a/config/ppc_64/meson.build b/config/ppc_64/meson.build
index e207c43..7ceae1d 100644
--- a/config/ppc_64/meson.build
+++ b/config/ppc_64/meson.build
@@ -1,9 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
+if not dpdk_conf.get('RTE_ARCH_64')
+ error('Only 64-bit compiles are supported for this platform type')
+endif
dpdk_conf.set('RTE_ARCH', 'ppc_64')
dpdk_conf.set('RTE_ARCH_PPC_64', 1)
-dpdk_conf.set('RTE_ARCH_64', 1)
# overrides specific to ppc64
dpdk_conf.set('RTE_MAX_LCORE', 256)
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 9e5952a..7504cb9 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -28,10 +28,9 @@ foreach f:base_flags
endforeach
dpdk_conf.set('RTE_ARCH_X86', 1)
-if (host_machine.cpu_family() == 'x86_64')
+if dpdk_conf.get('RTE_ARCH_64')
dpdk_conf.set('RTE_ARCH_X86_64', 1)
dpdk_conf.set('RTE_ARCH', 'x86_64')
- dpdk_conf.set('RTE_ARCH_64', 1)
else
dpdk_conf.set('RTE_ARCH_I686', 1)
dpdk_conf.set('RTE_ARCH', 'i686')