From: Felipe Huici <felipe.huici@neclab.eu>
Date: Fri, 17 Apr 2020 20:21:40 +0000 (+0200)
Subject: Prevent kludgeoning by barrier macro.
X-Git-Tag: RELEASE-0.5^0
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a2e995bc55fed312d7c20581e8f2aa7d8a64743a;p=unikraft%2Flibs%2Feigen.git

Prevent kludgeoning by barrier macro.

Add patch to prevent the definition of the macro "barrier" in lcpu.h
from kludgeoning the use of the word barrier in eigen code.

Signed-off-by: Felipe Huici <felipe.huici@neclab.eu
Reviewed-by: George Muraru <murarugeorgec@gmail.com>
---

diff --git a/patches/0002-prevent-barrier-macro-code-kludge.patch b/patches/0002-prevent-barrier-macro-code-kludge.patch
new file mode 100644
index 0000000..0b3fe78
--- /dev/null
+++ b/patches/0002-prevent-barrier-macro-code-kludge.patch
@@ -0,0 +1,10 @@
+--- a/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h	2020-04-17 17:13:19.072796790 +0200
++++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDeviceThreadPool.h	2021-04-17 17:13:41.800543414 +0200
+@@ -98,6 +98,7 @@
+       const char* src_ptr = static_cast<const char*>(src);
+       char* dst_ptr = static_cast<char*>(dst);
+       const size_t blocksize = (n + (num_threads - 1)) / num_threads;
++#undef barrier      
+       Barrier barrier(static_cast<int>(num_threads - 1));
+       // Launch the last 3 blocks on worker threads.
+       for (size_t i = 1; i < num_threads; ++i) {