[opencv] 01/01: use __asm__() rather than asm(), fixing src:mrpt build on armhf
Mattia Rizzolo
mattia at debian.org
Fri Jun 23 14:33:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository opencv.
commit 6d39f674e2f4db3dbca91a0e19438440a3acb458
Author: Mattia Rizzolo <mattia at debian.org>
Date: Fri Jun 23 16:33:30 2017 +0200
use __asm__() rather than asm(), fixing src:mrpt build on armhf
Thanks: James Clarke <jrtc27 at debian.org>
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
debian/patches/fix_VFP_asm.patch | 15 +++++++++++++++
debian/patches/series | 1 +
2 files changed, 16 insertions(+)
diff --git a/debian/patches/fix_VFP_asm.patch b/debian/patches/fix_VFP_asm.patch
new file mode 100644
index 0000000..d05cd9a
--- /dev/null
+++ b/debian/patches/fix_VFP_asm.patch
@@ -0,0 +1,15 @@
+Description: fix compilation failure of this header in arm (where VFP is enabled)
+Author: James Clarke <jrtc27 at jrtc27.com>
+Forwarded: https://github.com/opencv/opencv/pull/8976
+
+--- a/modules/core/include/opencv2/core/fast_math.hpp
++++ b/modules/core/include/opencv2/core/fast_math.hpp
+@@ -71,7 +71,7 @@
+ #define ARM_ROUND(_value, _asm_string) \
+ int res; \
+ float temp; \
+- asm(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \
++ __asm__(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \
+ return res
+ // 2. version for double
+ #ifdef __clang__
diff --git a/debian/patches/series b/debian/patches/series
index dd22f72..d702194 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ disable_opengl_test_build
mathjax
change_jquery.js_path
disable_dnn.patch
+fix_VFP_asm.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list