From owner-svn-ports-all@freebsd.org  Thu Jan 19 05:39:24 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 89200CB787C;
 Thu, 19 Jan 2017 05:39:24 +0000 (UTC)
 (envelope-from jbeich@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 5873A132F;
 Thu, 19 Jan 2017 05:39:24 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0J5dNPv049243;
 Thu, 19 Jan 2017 05:39:23 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0J5dNJ4049242;
 Thu, 19 Jan 2017 05:39:23 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201701190539.v0J5dNJ4049242@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 19 Jan 2017 05:39:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r431851 - branches/2017Q1/multimedia/x265/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-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Jan 2017 05:39:24 -0000

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)