Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'build_files/build_environment/patches/tbb.diff')
-rw-r--r--build_files/build_environment/patches/tbb.diff13
1 files changed, 12 insertions, 1 deletions
diff --git a/build_files/build_environment/patches/tbb.diff b/build_files/build_environment/patches/tbb.diff
index c05c35bca95..07f70aa7007 100644
--- a/build_files/build_environment/patches/tbb.diff
+++ b/build_files/build_environment/patches/tbb.diff
@@ -10,4 +10,15 @@ index 7a8d06a0..886699d8 100644
+ #if (__cplusplus >= 201402L && (!defined(_MSC_VER) || _MSC_VER >= 1920))
#define __TBB_DEPRECATED [[deprecated]]
#define __TBB_DEPRECATED_MSG(msg) [[deprecated(msg)]]
- #elif _MSC_VER \ No newline at end of file
+ #elif _MSC_VER
+--- a/src/tbb/tools_api/ittnotify_config.h
++++ b/src/tbb/tools_api/ittnotify_config.h
+@@ -162,7 +162,7 @@
+ # define ITT_ARCH ITT_ARCH_IA32E
+ # elif defined _M_IA64 || defined __ia64__
+ # define ITT_ARCH ITT_ARCH_IA64
+-# elif defined _M_ARM || defined __arm__
++# elif defined _M_ARM || defined __arm__ || defined __aarch64__
+ # define ITT_ARCH ITT_ARCH_ARM
+ # elif defined __powerpc64__
+ # define ITT_ARCH ITT_ARCH_PPC64