From owner-svn-ports-head@freebsd.org Thu Dec 21 20:30:36 2017 Return-Path: Delivered-To: svn-ports-head@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 C1BABE886EB; Thu, 21 Dec 2017 20:30:36 +0000 (UTC) (envelope-from dim@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 741B476D72; Thu, 21 Dec 2017 20:30:36 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBLKUZH2025451; Thu, 21 Dec 2017 20:30:35 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBLKUZt9025450; Thu, 21 Dec 2017 20:30:35 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201712212030.vBLKUZt9025450@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 21 Dec 2017 20:30:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456945 - head/graphics/rawstudio/files X-SVN-Group: ports-head X-SVN-Commit-Author: dim X-SVN-Commit-Paths: head/graphics/rawstudio/files X-SVN-Commit-Revision: 456945 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Dec 2017 20:30:36 -0000 Author: dim (src committer) Date: Thu Dec 21 20:30:35 2017 New Revision: 456945 URL: https://svnweb.freebsd.org/changeset/ports/456945 Log: Fix build of graphics/rawstudio with clang (or any recent optimizing compiler), by using anonymous labels in asm fragments. PR: 216771 Approved by: maintainer timeout (8 months) Approved by: jbeich MFH: 2017Q4 Added: head/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp (contents, props changed) Added: head/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp Thu Dec 21 20:30:35 2017 (r456945) @@ -0,0 +1,38 @@ +--- plugins/denoise/fftwindow.cpp.orig 2011-02-15 17:28:03 UTC ++++ plugins/denoise/fftwindow.cpp +@@ -174,7 +174,7 @@ void FFTWindow::applyAnalysisWindowSSE( + if ((uintptr_t)src1 & 15) { + asm volatile + ( +- "loop_analysis_sse_ua:\n" ++ "1:\n" + "prefetchnta (%4)\n" // Prefetch next line (Used once only, so don't pollute cache) + "movups (%1), %%xmm0\n" // src1 pt1 + "movups 16(%1), %%xmm1\n" // src1 pt2 +@@ -193,7 +193,7 @@ void FFTWindow::applyAnalysisWindowSSE( + "add $64, %2\n" + "add $64, %4\n" + "dec %3\n" +- "jnz loop_analysis_sse_ua\n" ++ "jnz 1b\n" + + : /* no output registers */ + : "r" (analysis.getLine(y)), "r" (src1), "r" (dst->getLine(y)), "r" (sizew), "r" (&src1[image->pitch]) +@@ -202,7 +202,7 @@ void FFTWindow::applyAnalysisWindowSSE( + } else { + asm volatile + ( +- "loop_analysis_sse_a:\n" ++ "1:\n" + "prefetchnta (%4)\n" // Prefetch next line (Used once only, so don't pollute cache) + "movaps (%1), %%xmm0\n" // src1 pt1 + "movaps 16(%1), %%xmm1\n" // src1 pt2 +@@ -221,7 +221,7 @@ void FFTWindow::applyAnalysisWindowSSE( + "add $64, %2\n" + "add $64, %4\n" + "dec %3\n" +- "jnz loop_analysis_sse_a\n" ++ "jnz 1b\n" + + : /* no output registers */ + : "r" (analysis.getLine(y)), "r" (src1), "r" (dst->getLine(y)), "r" (sizew), "r" (&src1[image->pitch])