From 26470f64109326037f521e2cfa2c2a3c0fe5cedb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 20 Apr 2022 18:43:19 +0200 Subject: [PATCH] package/tbb: fix nios2 build Fix the following build failure on nios2 raised since bump to version 2021.5.0 in commit 3c66ac07a0783b21f95e699b3762edd15e27bdf9: In file included from /home/giuliobenetti/autobuild/run/instance-2/output-1/build/tbb-2021.5.0/src/tbb/tools_api/ittnotify_static.c:17, from /home/giuliobenetti/autobuild/run/instance-2/output-1/build/tbb-2021.5.0/src/tbb/itt_notify.cpp:43: /home/giuliobenetti/autobuild/run/instance-2/output-1/build/tbb-2021.5.0/src/tbb/tools_api/ittnotify_config.h: In function 'long int __itt_interlocked_increment(volatile long int*)': /home/giuliobenetti/autobuild/run/instance-2/output-1/build/tbb-2021.5.0/src/tbb/tools_api/ittnotify_config.h:348:12: error: '__TBB_machine_fetchadd4' was not declared in this scope 348 | return __TBB_machine_fetchadd4(ptr, 1) + 1L; | ^~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/2b55d1d171f21030be8312f984ea02ec8c8348a8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-Define-ITT_ARCH_IA64-when-undefiend.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch diff --git a/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch b/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch new file mode 100644 index 0000000000..5b7f002499 --- /dev/null +++ b/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch @@ -0,0 +1,27 @@ +From 6fad69889da67bc4d4baff4afa94f77da45e006d Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Thu, 7 Oct 2021 14:16:16 +0800 +Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550) + +[Retrieved from: +https://github.com/oneapi-src/oneTBB/commit/6fad69889da67bc4d4baff4afa94f77da45e006d] +Signed-off-by: Fabrice Fontaine +--- + src/tbb/tools_api/ittnotify_config.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h +index 8ecc23781..f904a8e9d 100644 +--- a/src/tbb/tools_api/ittnotify_config.h ++++ b/src/tbb/tools_api/ittnotify_config.h +@@ -147,6 +147,10 @@ + # define ITT_ARCH_IA32E 2 + #endif /* ITT_ARCH_IA32E */ + ++#ifndef ITT_ARCH_IA64 ++# define ITT_ARCH_IA64 3 ++#endif /* ITT_ARCH_IA64 */ ++ + #ifndef ITT_ARCH_ARM + # define ITT_ARCH_ARM 4 + #endif /* ITT_ARCH_ARM */