git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/liboil-win64.patch

   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
   4 @@ -2,7 +2,7 @@
   5  #include <liboil/liboilfunction.h>
   6  #include <liboil/liboilclasses.h>
   7  #include <stddef.h>
   8 -
   9 +#include <stdint.h>
  10
  11  void
  12  deinterleave2_asm (int16_t *d1, int16_t *d2, int16_t *s_2xn, int n)
  13 @@ -1409,7 +1409,7 @@
  14        "  jnz 1b\n"
  15        "  emms\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)
  19        );
  20  }
  21  OIL_DEFINE_IMPL_FULL (multiply_and_acc_12xn_s16_u8_mmx,
  22 @@ -1596,7 +1596,7 @@
  23          [s2_nx4_off] "+r" (s2_nx4_off),
  24          [n] "+m" (n),
  25          [s1] "+r" (s1)
  26 -      : [sstr] "r" ((long)(sstr2))
  27 +      : [sstr] "r" ((intptr_t)(sstr2))
  28        );
  29  }
  30  OIL_DEFINE_IMPL_FULL (mas4_across_add_s16_mmx, mas4_across_add_s16,
  31 @@ -1753,8 +1753,8 @@
  32          [s3_8] "+r" (s3_8),
  33          [d] "+r" (d),
  34          [n] "+m" (n),
  35 -        [s1] "+r" ((long)(s1))
  36 -      : [sstr] "r" ((long)(sstr2))
  37 +        [s1] "+r" ((intptr_t)(s1))
  38 +      : [sstr] "r" ((intptr_t)(sstr2))
  39        );
  40  }
  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
  45 @@ -1,7 +1,7 @@
  46
  47  #include <liboil/liboilfunction.h>
  48  #include <liboil/liboilclasses.h>
  49 -
  50 +#include <stdint.h>
  51
  52  void
  53  mas10_u8_mmx (uint8_t *d, const uint8_t *s1_np9, const int16_t *s2_10,
  54 @@ -1104,7 +1104,7 @@
  55        "  packuswb %%mm2, %%mm2\n"
  56        "  movd %%mm2, 0(%[d])\n"
  57        : [p] "+r" (p)
  58 -      : [d] "r" (d), [ss1] "r" ((long)ss1));
  59 +      : [d] "r" (d), [ss1] "r" ((intptr_t)ss1));
  60      d+=4;
  61      s1_nx8+=4;
  62      n--;
  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
  66 @@ -1,6 +1,7 @@
  67
  68  #include <liboil/liboilfunction.h>
  69  #include <liboil/liboilclasses.h>
  70 +#include <stdint.h>
  71
  72  void
  73  multiply_and_acc_6xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1,
  74 @@ -32,7 +33,7 @@
  75  #ifdef __i386__
  76        : "m" (is1), "m" (ss1), "m" (ss2)
  77  #else
  78 -      : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
  79 +      : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
  80  #endif
  81        );
  82  }
  83 @@ -68,7 +69,7 @@
  84  #ifdef __i386__
  85        : "m" (is1), "m" (ss1), "m" (ss2)
  86  #else
  87 -      : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
  88 +      : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
  89  #endif
  90        );
  91  }
  92 @@ -114,7 +115,7 @@
  93  #ifdef __i386__
  94        : "m" (is1), "m" (ss1), "m" (ss2)
  95  #else
  96 -      : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
  97 +      : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
  98  #endif
  99        );
 100  }
 101 @@ -170,7 +171,7 @@
 102  #ifdef __i386__
 103        : "m" (is1), "m" (ss1), "m" (ss2)
 104  #else
 105 -      : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2)
 106 +      : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2)
 107  #endif
 108        );
 109  }