[patch] Another patch for the linuxsampler-0.3.3 package in portage.

linuxsampler-0.3.3-gcc4-2.patch (text/plain), 2.16 KB, created by Joachim Schiele on 2007-02-04 17:51:22 UTC

--- linuxsampler-0.3.3.orig/src/engines/common/Resampler.h	2007-02-04 18:26:25.000000000 +0100
+++ linuxsampler-0.3.3/src/engines/common/Resampler.h	2007-02-04 18:26:44.000000000 +0100
@@ -76,9 +76,9 @@
 
 #if CONFIG_ASM && ARCH_X86
             inline static void GetNext4SamplesMonoMMXSSE(sample_t* pSrc, void* Pos, float& Pitch) {
+                float __4f = 4.0f;
                 if (INTERPOLATE) Interpolate4StepsMonoMMXSSE(pSrc, Pos, Pitch);
                 else { // no pitch, so no interpolation necessary
-                    const float __4f = 4.0f;
                     __asm__ __volatile__ (
                         "movss    (%1), %%xmm5           # load Pos\n\t"
                         "cvtss2si %%xmm5, %%edi          # int(Pos)\n\t"
@@ -96,7 +96,7 @@
                         "movswl   6(%0,%%edi,2), %%edx   # load sample 3\n\t"
                         "cvtsi2ss  %%edx, %%xmm2         # convert to float\n\t"
                         "shufps    $0x1b, %%xmm2, %%xmm2 # swap to correct order\n\t"
-                        :: "r" (pSrc), "r" (Pos), "m" (&__4f)
+                        :: "r" (pSrc), "r" (Pos), "m" (__4f)
                         :  "%eax", "%edx", "%edi"
                     );
                 }
@@ -107,7 +107,10 @@
                     Interpolate4StepsStereoMMXSSE(pSrc, Pos, Pitch);
                     //EMMS;
                 } else { // no pitch, so no interpolation necessary
-                    const float __4f = 4.0f;
+			;
+
+                    float __4f = 4.0f;
+
                     __asm__ __volatile__ (
                         "movss    (%1), %%xmm5           # load Pos\n\t"
                         "cvtss2si %%xmm5, %%edi          # int(Pos)\n\t"
@@ -137,7 +140,7 @@
                         "movswl  14(%0, %%edi,4), %%edx  # load sample 3 (right)\n\t"
                         "cvtsi2ss  %%edx, %%xmm3         # convert to float\n\t"
                         "shufps    $0x1b, %%xmm3, %%xmm3 # swap to correct order\n\t"
-                        :: "r" (pSrc), "r" (Pos), "m" (&__4f)
+                        :: "r" (pSrc), "r" (Pos), "m" (__4f)
                         :  "%eax", "%edx", "%edi"
                     );
                 }