[SCM] libav/experimental: Alpha: fix inline asm with DEC/Compaq/HP compiler

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:39:01 UTC 2013


The following commit has been merged in the experimental branch:
commit 822be725d93669bd8c8cb70b6263a928e4767d6a
Author: Måns Rullgård <mans at mansr.com>
Date:   Sat Feb 21 16:03:23 2009 +0000

    Alpha: fix inline asm with DEC/Compaq/HP compiler
    
    Originally committed as revision 17477 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/alpha/asm.h b/libavcodec/alpha/asm.h
index 04d4f89..4df9a2a 100644
--- a/libavcodec/alpha/asm.h
+++ b/libavcodec/alpha/asm.h
@@ -158,31 +158,31 @@ struct unaligned_long { uint64_t l; } __attribute__((packed));
 #define ldl(p) (*(const int32_t *)  (p))
 #define stq(l, p) do { *(uint64_t *) (p) = (l); } while (0)
 #define stl(l, p) do { *(int32_t *)  (p) = (l); } while (0)
-#define ldq_u(a)     __asm__ ("ldq_u   %v0,0(%a0)", a)
+#define ldq_u(a)     asm ("ldq_u   %v0,0(%a0)", a)
 #define uldq(a)      (*(const __unaligned uint64_t *) (a))
-#define cmpbge(a, b) __asm__ ("cmpbge  %a0,%a1,%v0", a, b)
-#define extql(a, b)  __asm__ ("extql   %a0,%a1,%v0", a, b)
-#define extwl(a, b)  __asm__ ("extwl   %a0,%a1,%v0", a, b)
-#define extqh(a, b)  __asm__ ("extqh   %a0,%a1,%v0", a, b)
-#define zap(a, b)    __asm__ ("zap     %a0,%a1,%v0", a, b)
-#define zapnot(a, b) __asm__ ("zapnot  %a0,%a1,%v0", a, b)
-#define amask(a)     __asm__ ("amask   %a0,%v0", a)
-#define implver()    __asm__ ("implver %v0")
-#define rpcc()       __asm__ ("rpcc           %v0")
-#define minub8(a, b) __asm__ ("minub8  %a0,%a1,%v0", a, b)
-#define minsb8(a, b) __asm__ ("minsb8  %a0,%a1,%v0", a, b)
-#define minuw4(a, b) __asm__ ("minuw4  %a0,%a1,%v0", a, b)
-#define minsw4(a, b) __asm__ ("minsw4  %a0,%a1,%v0", a, b)
-#define maxub8(a, b) __asm__ ("maxub8  %a0,%a1,%v0", a, b)
-#define maxsb8(a, b) __asm__ ("maxsb8  %a0,%a1,%v0", a, b)
-#define maxuw4(a, b) __asm__ ("maxuw4  %a0,%a1,%v0", a, b)
-#define maxsw4(a, b) __asm__ ("maxsw4  %a0,%a1,%v0", a, b)
-#define perr(a, b)   __asm__ ("perr    %a0,%a1,%v0", a, b)
-#define pklb(a)      __asm__ ("pklb    %a0,%v0", a)
-#define pkwb(a)      __asm__ ("pkwb    %a0,%v0", a)
-#define unpkbl(a)    __asm__ ("unpkbl  %a0,%v0", a)
-#define unpkbw(a)    __asm__ ("unpkbw  %a0,%v0", a)
-#define wh64(a)      __asm__ ("wh64    %a0", a)
+#define cmpbge(a, b) asm ("cmpbge  %a0,%a1,%v0", a, b)
+#define extql(a, b)  asm ("extql   %a0,%a1,%v0", a, b)
+#define extwl(a, b)  asm ("extwl   %a0,%a1,%v0", a, b)
+#define extqh(a, b)  asm ("extqh   %a0,%a1,%v0", a, b)
+#define zap(a, b)    asm ("zap     %a0,%a1,%v0", a, b)
+#define zapnot(a, b) asm ("zapnot  %a0,%a1,%v0", a, b)
+#define amask(a)     asm ("amask   %a0,%v0", a)
+#define implver()    asm ("implver %v0")
+#define rpcc()       asm ("rpcc           %v0")
+#define minub8(a, b) asm ("minub8  %a0,%a1,%v0", a, b)
+#define minsb8(a, b) asm ("minsb8  %a0,%a1,%v0", a, b)
+#define minuw4(a, b) asm ("minuw4  %a0,%a1,%v0", a, b)
+#define minsw4(a, b) asm ("minsw4  %a0,%a1,%v0", a, b)
+#define maxub8(a, b) asm ("maxub8  %a0,%a1,%v0", a, b)
+#define maxsb8(a, b) asm ("maxsb8  %a0,%a1,%v0", a, b)
+#define maxuw4(a, b) asm ("maxuw4  %a0,%a1,%v0", a, b)
+#define maxsw4(a, b) asm ("maxsw4  %a0,%a1,%v0", a, b)
+#define perr(a, b)   asm ("perr    %a0,%a1,%v0", a, b)
+#define pklb(a)      asm ("pklb    %a0,%v0", a)
+#define pkwb(a)      asm ("pkwb    %a0,%v0", a)
+#define unpkbl(a)    asm ("unpkbl  %a0,%v0", a)
+#define unpkbw(a)    asm ("unpkbw  %a0,%v0", a)
+#define wh64(a)      asm ("wh64    %a0", a)
 
 #else
 #error "Unknown compiler!"

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list