rpms
/
OpenImageIO
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix arm patch.

This commit is contained in:
Richard M. Shaw 2013-05-17 09:26:19 -05:00
parent a0d96eed41
commit e3e2eba6cc
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
oiio-arm.patch
View File

@ -1,26 +1,27 @@
--- oiio-Release-1.1.3/src/include/thread.h.orig 2013-04-01 00:27:21.337292586 +0100
+++ oiio-Release-1.1.3/src/include/thread.h 2013-04-01 00:30:08.910886481 +0100
--- 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
@@ -326,7 +326,11 @@
__TBB_Pause(delay);
#elif defined(__GNUC__)
{
#if defined(__GNUC__)
for (int i = 0; i < delay; ++i) {
+#if defined __arm__
+ __asm__ __volatile__("NOP;");
+#else
+#else
__asm__ __volatile__("pause;");
+#endif
+#endif
}
#elif defined(_MSC_VER)
for (int i = 0; i < delay; ++i) {
@@ -441,7 +445,11 @@
#elif USE_TBB
__TBB_Pause(delay);
@@ -446,7 +450,12 @@
// Disallow copy construction by making private and unimplemented.
atomic (atomic const &);
+#if defined __arm__
+} __attribute__((aligned(8)));
+#else
+#else
};
+#endif
+#endif
+
#endif /* ! USE_TBB */
#endif /* ! USE_TBB_ATOMIC */