summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-04-06 00:35:40 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-09 21:34:17 +0200
commit23c711ed619a0362167720fe92fcc4dd02a8caea (patch)
tree7dacf6cce64f2e205e0dfacaf204537f8f22dc37 /meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch
parentd5de18c7e9816d3428050f4e3ec6590259e6af00 (diff)
downloadmeta-openembedded-23c711ed619a0362167720fe92fcc4dd02a8caea.tar.gz
libmad: remove
This is largely equivalent to the recipe in OE-Core apart from LICENSE_FLAGS, insignificant patch differences, and an additional patch for avr32 optimisation (and since there appears to be no public layer for an avr32 machine, there's not a great deal of point in preserving the latter). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch')
-rw-r--r--meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch b/meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch
deleted file mode 100644
index b65555e1fa..0000000000
--- a/meta-oe/recipes-multimedia/libmad/files/mad-mips-h-constraint.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
2--- libmad-0.15.1b-orig/fixed.h 2004-02-17 12:32:03.000000000 +1030
3+++ libmad-0.15.1b/fixed.h 2009-08-05 10:46:30.000000000 +0930
4@@ -299,6 +299,23 @@
5
6 # elif defined(FPM_MIPS)
7
8+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
9+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
10+#define __GNUC_PREREQ(maj, min) \
11+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
12+#else
13+#define __GNUC_PREREQ(maj, min) 0
14+#endif
15+
16+#if __GNUC_PREREQ(4,4)
17+ typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
18+# define MAD_F_MLX(hi, lo, x, y) \
19+ do { \
20+ u64_di_t __ll = (u64_di_t) (x) * (y); \
21+ hi = __ll >> 32; \
22+ lo = __ll; \
23+ } while (0)
24+#else
25 /*
26 * This MIPS version is fast and accurate; the disposition of the least
27 * significant bit depends on OPT_ACCURACY via mad_f_scale64().
28@@ -328,6 +345,7 @@
29 : "%r" ((x) >> 12), "r" ((y) >> 16))
30 # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo))
31 # endif
32+#endif /* __GNU_PREREQ(4,4) */
33
34 # if defined(OPT_SPEED)
35 # define mad_f_scale64(hi, lo) \
36diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h
37--- libmad-0.15.1b-orig/mad.h 2004-02-17 13:25:44.000000000 +1030
38+++ libmad-0.15.1b/mad.h 2009-08-05 10:42:40.000000000 +0930
39@@ -344,6 +344,23 @@
40
41 # elif defined(FPM_MIPS)
42
43+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
44+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
45+#define __GNUC_PREREQ(maj, min) \
46+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
47+#else
48+#define __GNUC_PREREQ(maj, min) 0
49+#endif
50+
51+#if __GNUC_PREREQ(4,4)
52+ typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
53+# define MAD_F_MLX(hi, lo, x, y) \
54+ do { \
55+ u64_di_t __ll = (u64_di_t) (x) * (y); \
56+ hi = __ll >> 32; \
57+ lo = __ll; \
58+ } while (0)
59+#else
60 /*
61 * This MIPS version is fast and accurate; the disposition of the least
62 * significant bit depends on OPT_ACCURACY via mad_f_scale64().
63@@ -373,6 +390,7 @@
64 : "%r" ((x) >> 12), "r" ((y) >> 16))
65 # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo))
66 # endif
67+#endif /* __GNU_PREREQ(4,4) */
68
69 # if defined(OPT_SPEED)
70 # define mad_f_scale64(hi, lo) \