Commit 3c13093d authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

libmad: fix MIPS gcc 4.4+ "h" asm constraint removal 



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent e1529120

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


	Fixes all over the tree.



	Updated/fixed packages: bash, libglib2, midori,

	Updated/fixed packages: bash, libglib2, libmad, midori,

	module-init-tools, mtd-utils, openssh, qt, sqlite, webkit



	Issues resolved (http://bugs.uclibc.org):

package/multimedia/libmad/libmad-0.15.1b-mips-h-constraint-removal.patch

0 → 100644
+72 −0
Original line number Diff line number Diff line 
http://patchwork.openembedded.org/patch/921/



diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h

--- libmad-0.15.1b-orig/fixed.h	2004-02-17 12:32:03.000000000 +1030

+++ libmad-0.15.1b/fixed.h	2009-08-05 10:46:30.000000000 +0930

@@ -299,6 +299,23 @@

 

 # elif defined(FPM_MIPS)

 

+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */

+#if defined (__GNUC__) && defined (__GNUC_MINOR__)

+#define __GNUC_PREREQ(maj, min) \

+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))

+#else

+#define __GNUC_PREREQ(maj, min)  0

+#endif

+

+#if __GNUC_PREREQ(4,4)

+  typedef unsigned int u64_di_t __attribute__ ((mode (DI)));

+# define MAD_F_MLX(hi, lo, x, y) \

+   do { \

+      u64_di_t __ll = (u64_di_t) (x) * (y); \

+      hi = __ll >> 32; \

+      lo = __ll; \

+   } while (0) 

+#else

 /*

  * This MIPS version is fast and accurate; the disposition of the least

  * significant bit depends on OPT_ACCURACY via mad_f_scale64().

@@ -328,6 +345,7 @@

 	 : "%r" ((x) >> 12), "r" ((y) >> 16))

 #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))

 # endif

+#endif /* __GNU_PREREQ(4,4) */

 

 # if defined(OPT_SPEED)

 #  define mad_f_scale64(hi, lo)  \

diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h

--- libmad-0.15.1b-orig/mad.h	2004-02-17 13:25:44.000000000 +1030

+++ libmad-0.15.1b/mad.h	2009-08-05 10:42:40.000000000 +0930

@@ -344,6 +344,23 @@

 

 # elif defined(FPM_MIPS)

 

+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */

+#if defined (__GNUC__) && defined (__GNUC_MINOR__)

+#define __GNUC_PREREQ(maj, min) \

+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))

+#else

+#define __GNUC_PREREQ(maj, min)  0

+#endif

+

+#if __GNUC_PREREQ(4,4)

+  typedef unsigned int u64_di_t __attribute__ ((mode (DI)));

+# define MAD_F_MLX(hi, lo, x, y) \

+   do { \

+      u64_di_t __ll = (u64_di_t) (x) * (y); \

+      hi = __ll >> 32; \

+      lo = __ll; \

+   } while (0) 

+#else

 /*

  * This MIPS version is fast and accurate; the disposition of the least

  * significant bit depends on OPT_ACCURACY via mad_f_scale64().

@@ -373,6 +390,7 @@

 	 : "%r" ((x) >> 12), "r" ((y) >> 16))

 #  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))

 # endif

+#endif /* __GNU_PREREQ(4,4) */

 

 # if defined(OPT_SPEED)

 #  define mad_f_scale64(hi, lo)  \