patches/libmad/libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch

   1 libmad: MIPS GCC-4.4 build fixes
   2
   3 GCC-4.4 on MIPS removed the "h" asm constraint, fix this up.
   4 Taken from OE.
   5
   6 http://patchwork.openembedded.org/patch/921/
   7
   8 diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
   9 --- libmad-0.15.1b-orig/fixed.h 2004-02-17 12:32:03.000000000 +1030
  10 +++ libmad-0.15.1b/fixed.h      2009-08-05 10:46:30.000000000 +0930
  11 @@ -299,6 +299,23 @@
  12
  13  # elif defined(FPM_MIPS)
  14
  15 +/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
  16 +#if defined (__GNUC__) && defined (__GNUC_MINOR__)
  17 +#define __GNUC_PREREQ(maj, min) \
  18 +       ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
  19 +#else
  20 +#define __GNUC_PREREQ(maj, min)  0
  21 +#endif
  22 +
  23 +#if __GNUC_PREREQ(4,4)
  24 +  typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
  25 +# define MAD_F_MLX(hi, lo, x, y) \
  26 +   do { \
  27 +      u64_di_t __ll = (u64_di_t) (x) * (y); \
  28 +      hi = __ll >> 32; \
  29 +      lo = __ll; \
  30 +   } while (0)
  31 +#else
  32  /*
  33   * This MIPS version is fast and accurate; the disposition of the least
  34   * significant bit depends on OPT_ACCURACY via mad_f_scale64().
  35 @@ -328,6 +345,7 @@
  36          : "%r" ((x) >> 12), "r" ((y) >> 16))
  37  #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
  38  # endif
  39 +#endif /* __GNU_PREREQ(4,4) */
  40
  41  # if defined(OPT_SPEED)
  42  #  define mad_f_scale64(hi, lo)  \
  43 diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h
  44 --- libmad-0.15.1b-orig/mad.h   2004-02-17 13:25:44.000000000 +1030
  45 +++ libmad-0.15.1b/mad.h        2009-08-05 10:42:40.000000000 +0930
  46 @@ -344,6 +344,23 @@
  47
  48  # elif defined(FPM_MIPS)
  49
  50 +/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
  51 +#if defined (__GNUC__) && defined (__GNUC_MINOR__)
  52 +#define __GNUC_PREREQ(maj, min) \
  53 +       ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
  54 +#else
  55 +#define __GNUC_PREREQ(maj, min)  0
  56 +#endif
  57 +
  58 +#if __GNUC_PREREQ(4,4)
  59 +  typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
  60 +# define MAD_F_MLX(hi, lo, x, y) \
  61 +   do { \
  62 +      u64_di_t __ll = (u64_di_t) (x) * (y); \
  63 +      hi = __ll >> 32; \
  64 +      lo = __ll; \
  65 +   } while (0)
  66 +#else
  67  /*
  68   * This MIPS version is fast and accurate; the disposition of the least
  69   * significant bit depends on OPT_ACCURACY via mad_f_scale64().
  70 @@ -373,6 +390,7 @@
  71          : "%r" ((x) >> 12), "r" ((y) >> 16))
  72  #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
  73  # endif
  74 +#endif /* __GNU_PREREQ(4,4) */
  75
  76  # if defined(OPT_SPEED)
  77  #  define mad_f_scale64(hi, lo)  \