SOURCES: jpeg-mmx-gcc41.patch (NEW), jpeg-mmx-PIC.patch (NEW) - pa...

[glen]

Author: glen                         Date: Fri Jun  9 09:15:22 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- patches from gentoo

---- Files affected:
SOURCES:
   jpeg-mmx-gcc41.patch (NONE -> 1.1)  (NEW), jpeg-mmx-PIC.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/jpeg-mmx-gcc41.patch
diff -u /dev/null SOURCES/jpeg-mmx-gcc41.patch:1.1
--- /dev/null	Fri Jun  9 11:15:22 2006
+++ SOURCES/jpeg-mmx-gcc41.patch	Fri Jun  9 11:15:17 2006
@@ -0,0 +1,12 @@
+diff -Naur jpeg-mmx-orig/jquant_x86simd.c jpeg-mmx/jquant_x86simd.c
+--- jpeg-mmx-orig/jquant_x86simd.c	2006-01-22 21:37:14.000000000 -0600
++++ jpeg-mmx/jquant_x86simd.c	2006-01-22 21:37:43.000000000 -0600
+@@ -104,7 +104,7 @@
+ 
+ 	/* Initialise zero block flags */
+ 	/* Set up SSE rounding mode */
+-	__asm__ ( "ldmxcsr %0\n" : : "X" (trunc_mxcsr) );
++	__asm__ ( "ldmxcsr %0\n" : : "m" (trunc_mxcsr) );
+ 
+ 	for (i=0; i < 64 ; i+=4)
+ 	{

================================================================
Index: SOURCES/jpeg-mmx-PIC.patch
diff -u /dev/null SOURCES/jpeg-mmx-PIC.patch:1.1
--- /dev/null	Fri Jun  9 11:15:22 2006
+++ SOURCES/jpeg-mmx-PIC.patch	Fri Jun  9 11:15:17 2006
@@ -0,0 +1,48 @@
+Fix compiling as PIC.
+
+--- jidctint.c
++++ jidctint.c
+@@ -2838,6 +2838,8 @@
+ 
+         "emms                        \n\t"
+ 
++        "popl %%ebx                  \n\t"
++
+ 	:
+ 	//      %0           %1             %2       %3            %4
+ 	: "m"(quantptr), "m"(inptr), "m"(wsptr), "m"(outptr), "g"(output_col),
+@@ -2857,7 +2859,7 @@
+ 	  "m"(fix_n196p307n256), "m"(fix_054p076), "m"(fix_054), "m"(fix_054n184),
+ 	//    %28
+ 	  "m"(const_0x0808)
+-	: "eax", "ebx", "ecx", "edx", "edi", "esi", "cc", "memory", "st"
++	: "eax", "ecx", "edx", "edi", "esi", "cc", "memory", "st"
+         );
+ #endif /* ATT style assembler */
+ }		
+--- jdcolor.c
++++ jdcolor.c
+@@ -262,12 +262,11 @@
+ #endif
+ #if defined(HAVE_MMX_ATT_MNEMONICS)
+       __asm__(
+-	  "pushl %%ebx\n"
+ 	      "mov %1, %%eax\n"  
+-	      "mov %2, %%ebx\n"  
++	      "mov %2, %%edx\n"  
+ 	      "mov %3, %%ecx\n"  
+ 	      "movd (%%eax),%%mm0\n"    // mm0: 0 0 0 0 y3 y2 y1 y0 - 8 bit
+-	  "movd (%%ebx),%%mm1\n"    // mm1: 0 0 0 0 cb3 cb2 cb1 cb0
++	  "movd (%%edx),%%mm1\n"    // mm1: 0 0 0 0 cb3 cb2 cb1 cb0
+ 	  "movd (%%ecx),%%mm2\n"    // mm2: 0 0 0 0 cr3 cr2 cr1 cr0
+ 	  "pxor %%mm7,%%mm7\n"      // mm7 = 0
+ 	  "punpcklbw %%mm7,%%mm0\n" // mm0: y3 y2 y1 y0 - expand to 16 bit
+@@ -352,7 +351,7 @@
+ 	  :"=m"(outptr[0])
+ 	  :"m"(inptr0),"m"(inptr1),"m"(inptr2), //y cb cr
+ 	   "m"(te0),"m"(te1),"m"(te2)
+-	  :"eax", "ebx", "ecx", "st");
++	  :"eax", "edx", "ecx", "st");
+ #endif
+ 
+       outptr+=12;
================================================================