0001-mips-h-constraint-removal.patch 2.2 KB

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