2013-05-17 14:26:19 +00:00
|
|
|
--- oiio-Release-1.1.10/src/include/thread.h.orig 2013-04-01 00:27:21.337292586 +0100
|
|
|
|
|
+++ oiio-Release-1.1.10/src/include/thread.h 2013-04-01 00:30:08.910886481 +0100
|
2013-03-31 23:59:02 +00:00
|
|
|
@@ -326,7 +326,11 @@
|
2013-05-17 14:26:19 +00:00
|
|
|
{
|
|
|
|
|
#if defined(__GNUC__)
|
2013-03-31 23:59:02 +00:00
|
|
|
for (int i = 0; i < delay; ++i) {
|
|
|
|
|
+#if defined __arm__
|
|
|
|
|
+ __asm__ __volatile__("NOP;");
|
2013-05-17 14:26:19 +00:00
|
|
|
+#else
|
2013-03-31 23:59:02 +00:00
|
|
|
__asm__ __volatile__("pause;");
|
2013-05-17 14:26:19 +00:00
|
|
|
+#endif
|
2013-03-31 23:59:02 +00:00
|
|
|
}
|
2013-05-17 14:26:19 +00:00
|
|
|
#elif USE_TBB
|
|
|
|
|
__TBB_Pause(delay);
|
|
|
|
|
@@ -446,7 +450,12 @@
|
2013-03-31 23:59:02 +00:00
|
|
|
|
|
|
|
|
// Disallow copy construction by making private and unimplemented.
|
|
|
|
|
atomic (atomic const &);
|
|
|
|
|
+#if defined __arm__
|
|
|
|
|
+} __attribute__((aligned(8)));
|
2013-05-17 14:26:19 +00:00
|
|
|
+#else
|
2013-03-31 23:59:02 +00:00
|
|
|
};
|
2013-05-17 14:26:19 +00:00
|
|
|
+#endif
|
|
|
|
|
+
|
2013-03-31 23:59:02 +00:00
|
|
|
|
|
|
|
|
|
2013-05-17 14:26:19 +00:00
|
|
|
#endif /* ! USE_TBB_ATOMIC */
|
