[opencv] 56/71: types_c.h: Fix compiling VFP assembler code

Nobuhiro Iwamatsu iwamatsu at moszumanska.debian.org
Mon Oct 17 20:16:30 UTC 2016


This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.1
in repository opencv.

commit c7045184ce220a04796d8e9072ac42d2d362dc71
Author: Bernd Kuhls <bernd.kuhls at t-online.de>
Date:   Tue Sep 6 11:49:00 2016 +0200

    types_c.h: Fix compiling VFP assembler code
    
    Replace asm by __asm__ according to
    https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
    as suggested by Arnout Vandecappelle:
    http://lists.busybox.net/pipermail/buildroot/2016-September/171491.html
    
    to fix build errors in ffmpeg with opencv2 support detected by
    buildroot autobuilders:
    http://autobuild.buildroot.net/results/c32/c32a21240a9933796ee850349a62ff3c2314f25c/build-end.log
    
    Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
---
 modules/core/include/opencv2/core/types_c.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h
index c21cd2c..771715d 100644
--- a/modules/core/include/opencv2/core/types_c.h
+++ b/modules/core/include/opencv2/core/types_c.h
@@ -318,7 +318,7 @@ enum {
     int res; \
     float temp; \
     (void)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__

-- 
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