From: Bruce Richardson Date: Wed, 6 Mar 2019 16:22:41 +0000 (+0000) Subject: build: rename linuxapp to linux in meson cross files X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=ae2f2fee247a;hp=5fbc1d498f548026cfdcd63f28330d687761f2a3;p=dpdk.git build: rename linuxapp to linux in meson cross files Rename the cross files for meson compilation from having linuxapp in the name to just linux in the name. Signed-off-by: Bruce Richardson --- diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc new file mode 100644 index 0000000000..67dd9a97d9 --- /dev/null +++ b/config/arm/arm64_armv8_linux_gcc @@ -0,0 +1,27 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-cpp' +ar = 'aarch64-linux-gnu-gcc-ar' +strip = 'aarch64-linux-gnu-strip' +pcap-config = '' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementor_id = 'generic' + +# Valid options for Arm's implementor_pn: +# 'default': valid for all armv8-a architectures (default value) +# '0xd03': cortex-a53 +# '0xd04': cortex-a35 +# '0xd05': cortex-a55 +# '0xd07': cortex-a57 +# '0xd08': cortex-a72 +# '0xd09': cortex-a73 +# '0xd0a': cortex-a75 +# '0xd0b': cortex-a76 +implementor_pn = 'default' diff --git a/config/arm/arm64_armv8_linuxapp_gcc b/config/arm/arm64_armv8_linuxapp_gcc deleted file mode 100644 index 67dd9a97d9..0000000000 --- a/config/arm/arm64_armv8_linuxapp_gcc +++ /dev/null @@ -1,27 +0,0 @@ -[binaries] -c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' -ar = 'aarch64-linux-gnu-gcc-ar' -strip = 'aarch64-linux-gnu-strip' -pcap-config = '' - -[host_machine] -system = 'linux' -cpu_family = 'aarch64' -cpu = 'armv8-a' -endian = 'little' - -[properties] -implementor_id = 'generic' - -# Valid options for Arm's implementor_pn: -# 'default': valid for all armv8-a architectures (default value) -# '0xd03': cortex-a53 -# '0xd04': cortex-a35 -# '0xd05': cortex-a55 -# '0xd07': cortex-a57 -# '0xd08': cortex-a72 -# '0xd09': cortex-a73 -# '0xd0a': cortex-a75 -# '0xd0b': cortex-a76 -implementor_pn = 'default' diff --git a/config/arm/arm64_dpaa2_linux_gcc b/config/arm/arm64_dpaa2_linux_gcc new file mode 100644 index 0000000000..0df8c8f7d0 --- /dev/null +++ b/config/arm/arm64_dpaa2_linux_gcc @@ -0,0 +1,16 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-cpp' +ar = 'aarch64-linux-gnu-ar' +as = 'aarch64-linux-gnu-as' +strip = 'aarch64-linux-gnu-strip' +pcap-config = '' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementor_id = 'dpaa2' diff --git a/config/arm/arm64_dpaa2_linuxapp_gcc b/config/arm/arm64_dpaa2_linuxapp_gcc deleted file mode 100644 index 0df8c8f7d0..0000000000 --- a/config/arm/arm64_dpaa2_linuxapp_gcc +++ /dev/null @@ -1,16 +0,0 @@ -[binaries] -c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' -ar = 'aarch64-linux-gnu-ar' -as = 'aarch64-linux-gnu-as' -strip = 'aarch64-linux-gnu-strip' -pcap-config = '' - -[host_machine] -system = 'linux' -cpu_family = 'aarch64' -cpu = 'armv8-a' -endian = 'little' - -[properties] -implementor_id = 'dpaa2' diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc new file mode 100644 index 0000000000..f4b85a84b9 --- /dev/null +++ b/config/arm/arm64_dpaa_linux_gcc @@ -0,0 +1,16 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-cpp' +ar = 'aarch64-linux-gnu-ar' +as = 'aarch64-linux-gnu-as' +strip = 'aarch64-linux-gnu-strip' +pcap-config = '' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementor_id = 'dpaa' diff --git a/config/arm/arm64_dpaa_linuxapp_gcc b/config/arm/arm64_dpaa_linuxapp_gcc deleted file mode 100644 index f4b85a84b9..0000000000 --- a/config/arm/arm64_dpaa_linuxapp_gcc +++ /dev/null @@ -1,16 +0,0 @@ -[binaries] -c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' -ar = 'aarch64-linux-gnu-ar' -as = 'aarch64-linux-gnu-as' -strip = 'aarch64-linux-gnu-strip' -pcap-config = '' - -[host_machine] -system = 'linux' -cpu_family = 'aarch64' -cpu = 'armv8-a' -endian = 'little' - -[properties] -implementor_id = 'dpaa' diff --git a/config/arm/arm64_thunderx_linux_gcc b/config/arm/arm64_thunderx_linux_gcc new file mode 100644 index 0000000000..14b8019989 --- /dev/null +++ b/config/arm/arm64_thunderx_linux_gcc @@ -0,0 +1,15 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-cpp' +ar = 'aarch64-linux-gnu-gcc-ar' +strip = 'aarch64-linux-gnu-strip' +pcap-config = '' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementor_id = '0x43' diff --git a/config/arm/arm64_thunderx_linuxapp_gcc b/config/arm/arm64_thunderx_linuxapp_gcc deleted file mode 100644 index 14b8019989..0000000000 --- a/config/arm/arm64_thunderx_linuxapp_gcc +++ /dev/null @@ -1,15 +0,0 @@ -[binaries] -c = 'aarch64-linux-gnu-gcc' -cpp = 'aarch64-linux-gnu-cpp' -ar = 'aarch64-linux-gnu-gcc-ar' -strip = 'aarch64-linux-gnu-strip' -pcap-config = '' - -[host_machine] -system = 'linux' -cpu_family = 'aarch64' -cpu = 'armv8-a' -endian = 'little' - -[properties] -implementor_id = '0x43' diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index f82a0fd6c7..f0d5c9a84b 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -67,7 +67,7 @@ if command -v $c >/dev/null 2>&1 ; then # compile the general v8a also for clang to increase coverage export CC="ccache clang" build build-arm64-host-clang $use_shared \ - --cross-file config/arm/arm64_armv8_linuxapp_gcc + --cross-file config/arm/arm64_armv8_linux_gcc for f in config/arm/arm*gcc ; do export CC="ccache gcc" diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt index 0a3316386f..912cb3a8cc 100644 --- a/doc/build-sdk-meson.txt +++ b/doc/build-sdk-meson.txt @@ -157,9 +157,9 @@ command:: For example if the target machine is arm64 we can use the following command:: - meson arm-build --cross-file config/arm/arm64_armv8_linuxapp_gcc + meson arm-build --cross-file config/arm/arm64_armv8_linux_gcc -where config/arm/arm64_armv8_linuxapp_gcc contains the following +where config/arm/arm64_armv8_linux_gcc contains the following parameters:: [binaries]