[MPlayer-dev-eng] Patch: Compile error in mp3lib/decode_MMX.c

[Fredrik Kuivinen]

Hi

I get 

gcc -c -W -Wall -march=i686 -mcpu=i686 -g -pg -D_REENTRANT  -o decode_MMX.o decode_MMX.c
decode_MMX.c:13: warning: `null_one' defined but not used
decode_MMX.c:14: warning: `one_null' defined but not used
/tmp/cccCRy3O.s: Assembler messages:
/tmp/cccCRy3O.s:293: Error: symbol `.L2' is already defined
make[1]: *** [decode_MMX.o] Error 1
make[1]: Leaving directory `/usr/home/ksorim/mplayer/nypl/main/mp3lib'
make: *** [mp3lib/libMP3.a] Error 2

when I try to compile current CVS with gcc 2.95.4. The attached (untested)
patch fixes this.

/ Fredrik Kuivinen

-------------- next part --------------
Index: decode_MMX.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.c,v
retrieving revision 1.3
diff -u -3 -p -r1.3 decode_MMX.c
--- decode_MMX.c	23 Jan 2002 17:27:07 -0000	1.3
+++ decode_MMX.c	6 Feb 2002 19:21:04 -0000
@@ -60,12 +60,12 @@ __asm __volatile(
 	"decl %%ecx\n\t"
         "movl %3,%%esi\n\t"
         "movl (%%edx),%%eax\n\t"
-        "jecxz .L1\n\t"
+        "jecxz .Label1\n\t"
         "decl %%eax\n\t"
         "andl %%ebx,%%eax\n\t"
         "leal 1088(%%esi),%%esi\n\t"
         "movl %%eax,(%%edx)\n\t"
-".L1:\n\t"
+".Label1:\n\t"
         "leal (%%esi,%%eax,2),%%edx\n\t"
         "movl %%eax,%5\n\t"
         "incl %%eax\n\t"
@@ -74,11 +74,11 @@ __asm __volatile(
         "leal 544(%%esi,%%eax,2),%%ecx\n\t"
 	"incl %%ebx\n\t"
 	"testl $1, %%eax\n\t"
-	"jnz .L2\n\t"
+	"jnz .Label2\n\t"
         "xchgl %%edx,%%ecx\n\t"
 	"incl %5\n\t"
         "leal 544(%%esi),%%esi\n\t"
-".L2:\n\t"
+".Label2:\n\t"
 	"emms\n\t"
         "pushl %%edx\n\t"
         "pushl %%ecx\n\t"
@@ -89,7 +89,7 @@ __asm __volatile(
 	"leal "MANGLE(decwins)"(%%ebx,%%ebx,1), %%edx\n\t"
 	"shrl $1, %%ecx\n\t"
 ".align 16\n\t"
-".L3:\n\t"
+".Label3:\n\t"
         "movq  (%%edx),%%mm0\n\t"
         "movq  64(%%edx),%%mm4\n\t"
         "pmaddwd (%%esi),%%mm0\n\t"
@@ -135,7 +135,7 @@ __asm __volatile(
         "leal 8(%%edi),%%edi\n\t"
 
 	"decl %%ecx\n\t"
-        "jnz  .L3\n\t"
+        "jnz  .Label3\n\t"
 
 	"popl %%ecx\n\t"
 	"andl $1, %%ecx\n\t"
@@ -167,7 +167,7 @@ __asm __volatile(
         "subl $64,%%esi\n\t"
         "movl $7,%%ecx\n\t"
 ".align 16\n\t"
-".L4:\n\t"
+".Label4:\n\t"
         "movq  (%%edx),%%mm0\n\t"
         "movq  64(%%edx),%%mm4\n\t"
         "pmaddwd (%%esi),%%mm0\n\t"
@@ -216,7 +216,7 @@ __asm __volatile(
         "addl $128,%%edx\n\t"
         "leal 8(%%edi),%%edi\n\t"
         "decl %%ecx\n\t"
-	"jnz  .L4\n\t"
+	"jnz  .Label4\n\t"
 
         "movq  (%%edx),%%mm0\n\t"
         "pmaddwd (%%esi),%%mm0\n\t"