From owner-svn-ports-head@FreeBSD.ORG Tue Oct 8 14:54:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2FAF4D68; Tue, 8 Oct 2013 14:54:41 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1BD172887; Tue, 8 Oct 2013 14:54:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98EseYV069847; Tue, 8 Oct 2013 14:54:40 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98EseC1069845; Tue, 8 Oct 2013 14:54:40 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201310081454.r98EseC1069845@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 8 Oct 2013 14:54:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329790 - in head/devel/llvm: . files X-SVN-Group: ports-head 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.14 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: Tue, 08 Oct 2013 14:54:41 -0000 Author: tijl Date: Tue Oct 8 14:54:40 2013 New Revision: 329790 URL: http://svnweb.freebsd.org/changeset/ports/329790 Log: Fix build with libc++ by importing upstream r178240. Approved by: brooks (maintainer) Added: head/devel/llvm/files/patch-svn-r178240 (contents, props changed) Modified: head/devel/llvm/Makefile Modified: head/devel/llvm/Makefile ============================================================================== --- head/devel/llvm/Makefile Tue Oct 8 14:37:22 2013 (r329789) +++ head/devel/llvm/Makefile Tue Oct 8 14:54:40 2013 (r329790) @@ -26,11 +26,6 @@ USES= gmake perl5 USE_LDCONFIG= yes USE_PYTHON_BUILD= yes -_CCVERSION= ${CC} --version -.if ${_CCVERSION:Mclang} -USE_CXXSTD= c++11 -.endif - # Suggested tweaks from http://llvm.org/docs/Packaging.html CONFIGURE_ARGS+= --enable-shared MAKE_ARGS+= REQUIRES_RTTI=1 Added: head/devel/llvm/files/patch-svn-r178240 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm/files/patch-svn-r178240 Tue Oct 8 14:54:40 2013 (r329790) @@ -0,0 +1,62 @@ +--- include/llvm/Support/CFG.h 2013/01/02 11:36:10 171366 ++++ include/llvm/Support/CFG.h 2013/03/28 15:47:50 178240 +@@ -27,8 +27,9 @@ + + template // Predecessor Iterator + class PredIterator : public std::iterator { +- typedef std::iterator super; ++ Ptr, ptrdiff_t, Ptr*, Ptr*> { ++ typedef std::iterator super; + typedef PredIterator Self; + USE_iterator It; + +@@ -40,6 +41,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + + PredIterator() {} + explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) { +@@ -50,7 +52,7 @@ + inline bool operator==(const Self& x) const { return It == x.It; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { ++ inline reference operator*() const { + assert(!It.atEnd() && "pred_iterator out of range!"); + return cast(*It)->getParent(); + } +@@ -100,10 +102,11 @@ + + template // Successor Iterator + class SuccIterator : public std::iterator { ++ BB_, ptrdiff_t, BB_*, BB_*> { + const Term_ Term; + unsigned idx; +- typedef std::iterator super; ++ typedef std::iterator super; + typedef SuccIterator Self; + + inline bool index_is_valid(int idx) { +@@ -112,6 +115,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + // TODO: This can be random access iterator, only operator[] missing. + + explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator +@@ -142,7 +146,7 @@ + inline bool operator==(const Self& x) const { return idx == x.idx; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { return Term->getSuccessor(idx); } ++ inline reference operator*() const { return Term->getSuccessor(idx); } + inline pointer operator->() const { return operator*(); } + + inline Self& operator++() { ++idx; return *this; } // Preincrement