From owner-svn-ports-branches@freebsd.org Sun Jan 24 15:07:22 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE9409D271C; Sun, 24 Jan 2016 15:07:22 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 86172391; Sun, 24 Jan 2016 15:07:22 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0OF7L6d097164; Sun, 24 Jan 2016 15:07:21 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0OF7Lkh097163; Sun, 24 Jan 2016 15:07:21 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201601241507.u0OF7Lkh097163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 24 Jan 2016 15:07:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407142 - branches/2016Q1/games/libretro-cores/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2016 15:07:22 -0000 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@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 +