Date: Thu, 19 Jan 2017 05:39:23 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r431851 - branches/2017Q1/multimedia/x265/files Message-ID: <201701190539.v0J5dNJ4049242@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jan 19 05:39:23 2017 New Revision: 431851 URL: https://svnweb.freebsd.org/changeset/ports/431851 Log: MFH: r431776 by mi Add a patch to avoid providing our own implementation of __rtdsc when built with clang version 4 or higher (which has its own). PR: 216162 Approved by: ports-secteam blanket Added: branches/2017Q1/multimedia/x265/files/patch-rdtsc - copied unchanged from r431776, head/multimedia/x265/files/patch-rdtsc Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/multimedia/x265/files/patch-rdtsc (from r431776, head/multimedia/x265/files/patch-rdtsc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/multimedia/x265/files/patch-rdtsc Thu Jan 19 05:39:23 2017 (r431851, copy of r431776, head/multimedia/x265/files/patch-rdtsc) @@ -0,0 +1,9 @@ +--- test/testharness.h 2016-12-23 00:57:39.000000000 -0500 ++++ test/testharness.h 2017-01-17 15:46:38.623298000 -0500 +@@ -69,5 +69,5 @@ + #elif HAVE_RDTSC + #include <intrin.h> +-#elif defined(__GNUC__) ++#elif defined(__GNUC__) && (!defined(__clang__) || __clang_major__ < 4) + /* fallback for older GCC/MinGW */ + static inline uint32_t __rdtsc(void)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701190539.v0J5dNJ4049242>