svn commit: r407142 - branches/2016Q1/games/libretro-cores/files

[Mark Felder]

Author: feld
Date: Sun Jan 24 15:07:21 2016
New Revision: 407142
URL: https://svnweb.freebsd.org/changeset/ports/407142

Log:
  MFH: r407068
  
  In the copy of mednafen included in libretro-cores, replace a named
  label in inline assembly in an inline function with a local label.
  This prevents "invalid symbol redefinition" errors when the function is
  inlined multiple times, for example within an unrolled loop.
  
  Approved by:	yuri at rawbw.com (maintainer)
  PR:		206542
  
  Approved by:	ports-secteam (with hat)

Added:
  branches/2016Q1/games/libretro-cores/files/patch-beetle-pcfx-libretro-mednafen-sound-OwlResampler.cpp
     - copied unchanged from r407068, head/games/libretro-cores/files/patch-beetle-pcfx-libretro-mednafen-sound-OwlResampler.cpp
Modified:
Directory Properties:
  branches/2016Q1/   (props changed)

Copied: branches/2016Q1/games/libretro-cores/files/patch-beetle-pcfx-libretro-mednafen-sound-OwlResampler.cpp (from r407068, head/games/libretro-cores/files/patch-beetle-pcfx-libretro-mednafen-sound-OwlResampler.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/games/libretro-cores/files/patch-beetle-pcfx-libretro-mednafen-sound-OwlResampler.cpp	Sun Jan 24 15:07:21 2016	(r407142, copy of r407068, head/games/libretro-cores/files/patch-beetle-pcfx-libretro-mednafen-sound-OwlResampler.cpp)
@@ -0,0 +1,38 @@
+--- beetle-pcfx-libretro/mednafen/sound/OwlResampler.cpp.orig	2015-10-16 02:50:34.000000000 +0200
++++ beetle-pcfx-libretro/mednafen/sound/OwlResampler.cpp	2016-01-23 21:47:18.614641000 +0100
+@@ -346,7 +346,7 @@ static INLINE void DoMAC_SSE(float *wave
+ "movups  0(%%" X86_REGC "di), %%xmm0\n\t"
+ "movups 16(%%" X86_REGC "di), %%xmm1\n\t"
+ 
+-"SSE_Loop:\n\t"
++"1:\n\t"
+ 
+ "movups 32(%%" X86_REGC "di), %%xmm2\n\t"
+ "mulps   0(%%" X86_REGC "si), %%xmm0\n\t"
+@@ -384,7 +384,7 @@ static INLINE void DoMAC_SSE(float *wave
+ "add" X86_REGAT " $128, %%" X86_REGC "si\n\t"
+ "add" X86_REGAT " $128, %%" X86_REGC "di\n\t"
+ "subl $1, %%ecx\n\t"
+-"jnz SSE_Loop\n\t"
++"jnz 1b\n\t"
+ 
+ "addps  %%xmm3, %%xmm7\n\t"	// For a loop optimization
+ 
+@@ -451,7 +451,7 @@ static INLINE void DoMAC_SSE(float *wave
+ "xorps %%xmm7, %%xmm7\n\t"
+ 
+ "movups  0(%%" X86_REGC "di), %%xmm0\n\t"
+-"SSE_Loop:\n\t"
++"1:\n\t"
+ 
+ "movups 16(%%" X86_REGC "di), %%xmm1\n\t"
+ "mulps   0(%%" X86_REGC "si), %%xmm0\n\t"
+@@ -472,7 +472,7 @@ static INLINE void DoMAC_SSE(float *wave
+ "add" X86_REGAT " $64, %%" X86_REGC "si\n\t"
+ "add" X86_REGAT " $64, %%" X86_REGC "di\n\t"
+ "subl $1, %%ecx\n\t"
+-"jnz SSE_Loop\n\t"
++"jnz 1b\n\t"
+ 
+ "addps  %%xmm3, %%xmm7\n\t"	// For a loop optimization
+