[OpenImageIO] Fix arm patch.
Richard Shaw
hobbes1069 at fedoraproject.org
Fri May 17 14:26:22 UTC 2013
commit e3e2eba6cc4c75eb9fa1ad836d86c79ce1bc3980
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date: Fri May 17 09:26:19 2013 -0500
Fix arm patch.
oiio-arm.patch | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/oiio-arm.patch b/oiio-arm.patch
index 0c9f732..ea2896b 100644
--- a/oiio-arm.patch
+++ b/oiio-arm.patch
@@ -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 */
More information about the scm-commits
mailing list