1 diff -ruN liboil.old/liboil/amd64/wavelet.c liboil/liboil/amd64/wavelet.c
2 --- liboil.old/liboil/amd64/wavelet.c 2009-08-18 11:36:57.000000000 +0200
3 +++ liboil/liboil/amd64/wavelet.c 2009-08-18 11:38:00.000000000 +0200
5 #include <liboil/liboilfunction.h>
6 #include <liboil/liboilclasses.h>
12 deinterleave2_asm (int16_t *d1, int16_t *d2, int16_t *s_2xn, int n)
16 : "+r" (i1), "+r" (s1), "+r" (s2), "+r" (n)
17 - : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
18 + : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
21 OIL_DEFINE_IMPL_FULL (multiply_and_acc_12xn_s16_u8_mmx,
23 [s2_nx4_off] "+r" (s2_nx4_off),
26 - : [sstr] "r" ((long)(sstr2))
27 + : [sstr] "r" ((intptr_t)(sstr2))
30 OIL_DEFINE_IMPL_FULL (mas4_across_add_s16_mmx, mas4_across_add_s16,
35 - [s1] "+r" ((long)(s1))
36 - : [sstr] "r" ((long)(sstr2))
37 + [s1] "+r" ((intptr_t)(s1))
38 + : [sstr] "r" ((intptr_t)(sstr2))
41 OIL_DEFINE_IMPL_FULL (mas8_across_add_s16_mmx, mas8_across_add_s16,
42 diff -ruN liboil.old/liboil/i386_amd64/mas.c liboil/liboil/i386_amd64/mas.c
43 --- liboil.old/liboil/i386_amd64/mas.c 2009-08-18 11:36:57.000000000 +0200
44 +++ liboil/liboil/i386_amd64/mas.c 2009-08-18 11:38:39.000000000 +0200
47 #include <liboil/liboilfunction.h>
48 #include <liboil/liboilclasses.h>
53 mas10_u8_mmx (uint8_t *d, const uint8_t *s1_np9, const int16_t *s2_10,
55 " packuswb %%mm2, %%mm2\n"
56 " movd %%mm2, 0(%[d])\n"
58 - : [d] "r" (d), [ss1] "r" ((long)ss1));
59 + : [d] "r" (d), [ss1] "r" ((intptr_t)ss1));
63 diff -ruN liboil.old/liboil/i386_amd64/multiply_and_acc.c liboil/liboil/i386_amd64/multiply_and_acc.c
64 --- liboil.old/liboil/i386_amd64/multiply_and_acc.c 2009-08-18 11:36:57.000000000 +0200
65 +++ liboil/liboil/i386_amd64/multiply_and_acc.c 2009-08-18 11:38:27.000000000 +0200
68 #include <liboil/liboilfunction.h>
69 #include <liboil/liboilclasses.h>
73 multiply_and_acc_6xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
76 : "m" (is1), "m" (ss1), "m" (ss2)
78 - : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
79 + : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
85 : "m" (is1), "m" (ss1), "m" (ss2)
87 - : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
88 + : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
94 : "m" (is1), "m" (ss1), "m" (ss2)
96 - : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
97 + : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
103 : "m" (is1), "m" (ss1), "m" (ss2)
105 - : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
106 + : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)