fix libmad att asm syntax error for x86/amd64

android/jni/Application.mk

@@ -1,3 +1,3 @@
 APP_STL := stlport_static
-APP_ABI := armeabi-v7a
-APP_PLATFORM := android-9
+APP_ABI := armeabi-v7a x86
+APP_PLATFORM := android-9

libmad/fixed.h

@@ -217,7 +217,7 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
        asm ("shrl %3,%1\n\t"  \
 	    "shll %4,%2\n\t"  \
 	    "orl %2,%1"  \
-	    : "=rm" (__result),  \
+	    : "=rm" (__result)  \
 	    : "0" (lo), "r" (hi),  \
 	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
 	    : "cc");  \
@@ -227,7 +227,7 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
 #    define mad_f_scale64(hi, lo)  \
     ({ mad_fixed_t __result;  \
        asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result),  \
+	    : "=rm" (__result)  \
 	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
 	    : "cc");  \
        __result;  \

libmad/libmad_config.h

@@ -129,13 +129,13 @@
 /* Define to `int' if <sys/types.h> does not define. */
 /* #undef pid_t */
 
-//#if defined(_M_IX86) || defined(__i386__) || defined(__x86_64__)
-//#  define FPM_INTEL   1
-//#elif defined(_M_X64)
-//#  define FPM_64BIT   1
-//#elif defined(__arm__)
-//#  define FPM_ARM     1
-#if defined(__mips__)
+#if defined(_M_IX86) || defined(__i386__) || defined(__x86_64__)
+#  define FPM_INTEL   1
+#elif defined(_M_X64)
+#  define FPM_64BIT   1
+#elif defined(__arm__)
+#  define FPM_DEFAULT 1
+#elif defined(__mips__)
 #  define FPM_MIPS    1
 #elif defined(__sparc__)
 #  define FPM_SPARC   1