<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/03854045b33cc296a5ac9ec28969e121c5b90831">https://github.com/macports/macports-ports/commit/03854045b33cc296a5ac9ec28969e121c5b90831</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 03854045b33 onetbb: update to 2021.9.0
</span>03854045b33 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 03854045b33cc296a5ac9ec28969e121c5b90831
</span>Author: Mohamed Akram <mohd.akram@outlook.com>
AuthorDate: Thu Apr 20 23:01:01 2023 +0400
<span style='display:block; white-space:pre;color:#404040;'> onetbb: update to 2021.9.0
</span>---
devel/onetbb/Portfile | 9 +-
.../onetbb/files/patch-onetbb-older-platforms.diff | 227 +++++++++++++--------
2 files changed, 143 insertions(+), 93 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/onetbb/Portfile b/devel/onetbb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b4c85c707e..b365c4d78e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/onetbb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/onetbb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup oneapi-src oneTBB 2021.8.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup oneapi-src oneTBB 2021.9.0 v
</span> github.tarball_from archive
conflicts tbb
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,11 +22,10 @@ long_description oneTBB is a flexible C++ library that simplifies the work \
</span> of adding parallelism to complex applications, even if you \
are not a threading expert.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2f9fae5f442066bf8e7eb5067104d71d6e1ce15d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eee380323bb7ce864355ed9431f85c43955faaae9e9bce35c62b372d7ffd9f8b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2575336
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 512a17da62b94d14a4ac4d0c5482557c90643ed6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1ce48f34dada7837f510735ff1172f6e2c261b09460e3bf773b49791d247d24e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2579150
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span> patchfiles patch-onetbb-older-platforms.diff
compiler.blacklist-append {clang < 700}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/onetbb/files/patch-onetbb-older-platforms.diff b/devel/onetbb/files/patch-onetbb-older-platforms.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fea8fe7be0c..01e86ad151e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/onetbb/files/patch-onetbb-older-platforms.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/onetbb/files/patch-onetbb-older-platforms.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/oneapi-src/oneTBB/pull/840
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 91b43909e83e02945df77f37b95b042d8f03a1c9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 15 Nov 2022 18:06:45 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Restore support for 32-bit platforms, add fix-ups for PPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/compilers/AppleClang.cmake b/cmake/compilers/AppleClang.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5ebbdbd1..f27e1382 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/compilers/AppleClang.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/compilers/AppleClang.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Copyright (c) 2020-2022 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Copyright (c) 2020-2023 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/compilers/AppleClang.cmake cmake/compilers/AppleClang.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5ebbdbd1..f0681744 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compilers/AppleClang.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compilers/AppleClang.cmake
</span> @@ -37,7 +37,7 @@ if (CMAKE_OSX_ARCHITECTURES)
else()
set(_tbb_target_architectures "${CMAKE_SYSTEM_PROCESSOR}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,10 +11,10 @@ index 5ebbdbd1..f27e1382 100644
</span> set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
endif()
unset(_tbb_target_architectures)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4555d77b..0e7a0287 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/compilers/GNU.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/compilers/GNU.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/compilers/GNU.cmake cmake/compilers/GNU.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b60172c8..1ca1ca12 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compilers/GNU.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compilers/GNU.cmake
</span> @@ -36,7 +36,13 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,17 +30,10 @@ index 4555d77b..0e7a0287 100644
</span> set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/oneapi/tbb/task_group.h b/include/oneapi/tbb/task_group.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2bbacd55..dc671acb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/oneapi/tbb/task_group.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/oneapi/tbb/task_group.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Copyright (c) 2005-2022 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Copyright (c) 2005-2023 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git include/oneapi/tbb/task_group.h include/oneapi/tbb/task_group.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2bbacd55..d282a5af 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/oneapi/tbb/task_group.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/oneapi/tbb/task_group.h
</span> @@ -187,6 +187,23 @@ private:
};
task_group_context_version my_version;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,13 +79,13 @@ index 2bbacd55..dc671acb 100644
</span>
enum task_group_status {
not_complete,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/tbb/def/mac32-tbb.def b/src/tbb/def/mac32-tbb.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tbb/def/mac32-tbb.def src/tbb/def/mac32-tbb.def
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 00000000..b3b1288a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 00000000..10eedc3c
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/tbb/def/mac32-tbb.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tbb/def/mac32-tbb.def
</span> @@ -0,0 +1,159 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Copyright (c) 2005-2023 Intel Corporation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Copyright (c) 2005-2021 Intel Corporation
</span> +#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -265,10 +244,110 @@ index 00000000..b3b1288a
</span> +_TBB_runtime_interface_version
+_TBB_runtime_version
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tbb/semaphore.h src/tbb/semaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9d27f3ac..b8942329 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tbb/semaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tbb/semaphore.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,8 +22,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if _WIN32||_WIN64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED > 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <dispatch/dispatch.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/semaphore.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/task.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/mach_init.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/error.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <semaphore.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef TBB_USE_DEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cerrno>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,6 +152,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! Edsger Dijkstra's counting semaphore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED > 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class semaphore : no_copy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! ctor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,6 +169,34 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dispatch_semaphore_t my_sem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class semaphore : no_copy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! ctor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ semaphore(int start_cnt_ = 0) : sem(start_cnt_) { init_semaphore(start_cnt_); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! dtor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ~semaphore() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t ret = semaphore_destroy( mach_task_self(), sem );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __TBB_ASSERT_EX( ret==err_none, nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! wait/acquire
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void P() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = semaphore_wait( sem );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } while( ret==KERN_ABORTED );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __TBB_ASSERT( ret==KERN_SUCCESS, "semaphore_wait() failed" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! post/release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void V() { semaphore_signal( sem ); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ semaphore_t sem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void init_semaphore(int start_cnt_) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t ret = semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, start_cnt_ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __TBB_ASSERT_EX( ret==err_none, "failed to create a semaphore" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* __APPLE__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* Linux/Unix */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef uint32_t sem_count_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! Edsger Dijkstra's counting semaphore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,7 +268,35 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !__TBB_USE_SRWLOCK */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //! binary_semaphore for concurrent monitor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED > 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using binary_semaphore = semaphore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class binary_semaphore : no_copy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! ctor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ binary_semaphore() : my_sem(0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t ret = semaphore_create( mach_task_self(), &my_sem, SYNC_POLICY_FIFO, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __TBB_ASSERT_EX( ret==err_none, "failed to create a semaphore" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! dtor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ~binary_semaphore() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t ret = semaphore_destroy( mach_task_self(), my_sem );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __TBB_ASSERT_EX( ret==err_none, nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! wait/acquire
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void P() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = semaphore_wait( my_sem );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } while( ret==KERN_ABORTED );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __TBB_ASSERT( ret==KERN_SUCCESS, "semaphore_wait() failed" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //! post/release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void V() { semaphore_signal( my_sem ); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ semaphore_t my_sem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* __APPLE__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* Linux/Unix */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if __TBB_USE_FUTEX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tbb/tools_api/ittnotify_config.h src/tbb/tools_api/ittnotify_config.h
</span> index 0f5d80f6..60cde151 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/tbb/tools_api/ittnotify_config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/tbb/tools_api/ittnotify_config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tbb/tools_api/ittnotify_config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tbb/tools_api/ittnotify_config.h
</span> @@ -184,6 +184,10 @@
# define ITT_ARCH_RISCV64 10
#endif /* ITT_ARCH_RISCV64 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,17 +370,10 @@ index 0f5d80f6..60cde151 100644
</span> # define ITT_ARCH ITT_ARCH_PPC64
# elif defined __loongarch__
# define ITT_ARCH ITT_ARCH_LOONGARCH64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/tbb/tools_api/ittnotify_static.c b/src/tbb/tools_api/ittnotify_static.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0b9aa492..23cff36d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/tbb/tools_api/ittnotify_static.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/tbb/tools_api/ittnotify_static.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Copyright (c) 2005-2021 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Copyright (c) 2005-2023 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tbb/tools_api/ittnotify_static.c src/tbb/tools_api/ittnotify_static.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0b9aa492..0144ebee 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tbb/tools_api/ittnotify_static.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tbb/tools_api/ittnotify_static.c
</span> @@ -125,7 +125,7 @@ static const char* ittnotify_lib_name = "libittnotify.dylib";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,13 +383,13 @@ index 0b9aa492..23cff36d 100644
</span> #define LIB_VAR_NAME INTEL_LIBITTNOTIFY32
#else
#define LIB_VAR_NAME INTEL_LIBITTNOTIFY64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/tbbmalloc/def/mac32-tbbmalloc.def b/src/tbbmalloc/def/mac32-tbbmalloc.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tbbmalloc/def/mac32-tbbmalloc.def src/tbbmalloc/def/mac32-tbbmalloc.def
</span> new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 00000000..4dae67f9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 00000000..b729364c
</span> --- /dev/null
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/tbbmalloc/def/mac32-tbbmalloc.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tbbmalloc/def/mac32-tbbmalloc.def
</span> @@ -0,0 +1,45 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Copyright (c) 2005-2023 Intel Corporation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Copyright (c) 2005-2021 Intel Corporation
</span> +#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -362,17 +434,10 @@ index 00000000..4dae67f9
</span> +__ZN3rml13pool_identifyEPv
+__ZN3rml10pool_msizeEPNS_10MemoryPoolEPv
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/tbbmalloc_proxy/proxy_overload_osx.h b/src/tbbmalloc_proxy/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 69582983..942933e2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/tbbmalloc_proxy/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/tbbmalloc_proxy/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Copyright (c) 2005-2022 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Copyright (c) 2005-2023 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tbbmalloc_proxy/proxy_overload_osx.h src/tbbmalloc_proxy/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 69582983..350310e3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tbbmalloc_proxy/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tbbmalloc_proxy/proxy_overload_osx.h
</span> @@ -134,10 +134,14 @@ struct DoMallocReplacement {
introspect.force_lock = &zone_force_lock;
introspect.force_unlock = &zone_force_unlock;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -399,17 +464,10 @@ index 69582983..942933e2 100644
</span>
// make sure that default purgeable zone is initialized
malloc_default_purgeable_zone();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/test/common/doctest.h b/test/common/doctest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3b906764..b7116596 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/test/common/doctest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/test/common/doctest.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Modifications Copyright (c) 2020-2022 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Modifications Copyright (c) 2020-2023 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Modifications Licensed under the Apache License, Version 2.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/common/doctest.h test/common/doctest.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3b906764..0d349aa9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/common/doctest.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/common/doctest.h
</span> @@ -412,6 +412,9 @@ DOCTEST_MSVC_SUPPRESS_WARNING(26812) // Prefer 'enum class' over 'enum'
#elif defined(DOCTEST_PLATFORM_MAC)
#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(__i386)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -420,17 +478,10 @@ index 3b906764..b7116596 100644
</span> #else
#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("brk #0"); // NOLINT (hicpp-no-assembler)
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/test/conformance/conformance_allocators.cpp b/test/conformance/conformance_allocators.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 60ec5cae..f0b3c1b4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/test/conformance/conformance_allocators.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/test/conformance/conformance_allocators.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Copyright (c) 2005-2021 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Copyright (c) 2005-2023 Intel Corporation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Licensed under the Apache License, Version 2.0 (the "License");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- you may not use this file except in compliance with the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git test/conformance/conformance_allocators.cpp test/conformance/conformance_allocators.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 60ec5cae..7e40b0ab 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/conformance/conformance_allocators.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/conformance/conformance_allocators.cpp
</span> @@ -31,6 +31,7 @@ TEST_CASE("Allocator concept") {
TestAllocator<oneapi::tbb::cache_aligned_allocator<void>>(Concept);
TestAllocator<oneapi::tbb::tbb_allocator<void>>(Concept);
</pre><pre style='margin:0'>
</pre>