From owner-svn-ports-head@freebsd.org Wed Aug 15 22:40:08 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0A1B1072E3A; Wed, 15 Aug 2018 22:40:07 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9452780182; Wed, 15 Aug 2018 22:40:07 +0000 (UTC) (envelope-from brooks@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6FFEC10CA9; Wed, 15 Aug 2018 22:40:07 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7FMe7Mg023408; Wed, 15 Aug 2018 22:40:07 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7FMe6WX023401; Wed, 15 Aug 2018 22:40:06 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201808152240.w7FMe6WX023401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 15 Aug 2018 22:40:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477293 - in head/devel: llvm40 llvm40/files/lld llvm50 llvm50/files/lld X-SVN-Group: ports-head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/devel: llvm40 llvm40/files/lld llvm50 llvm50/files/lld X-SVN-Commit-Revision: 477293 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.27 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: Wed, 15 Aug 2018 22:40:08 -0000 Author: brooks Date: Wed Aug 15 22:40:06 2018 New Revision: 477293 URL: https://svnweb.freebsd.org/changeset/ports/477293 Log: Fix build with clang 7.0. PR: 230463 Submitted by: dim Added: head/devel/llvm40/files/lld/ head/devel/llvm40/files/lld/patch-tools_lld_ELF_LTO.cpp (contents, props changed) head/devel/llvm40/files/lld/patch-tools_lld_ELF_Symbols.cpp (contents, props changed) head/devel/llvm50/files/lld/ head/devel/llvm50/files/lld/patch-tools_lld_ELF_Symbols.cpp (contents, props changed) Modified: head/devel/llvm40/Makefile head/devel/llvm50/Makefile Modified: head/devel/llvm40/Makefile ============================================================================== --- head/devel/llvm40/Makefile Wed Aug 15 21:59:13 2018 (r477292) +++ head/devel/llvm40/Makefile Wed Aug 15 22:40:06 2018 (r477293) @@ -89,6 +89,7 @@ LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:2.7 LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} +LLD_EXTRA_PATCHES= ${PATCHDIR}/lld LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} Added: head/devel/llvm40/files/lld/patch-tools_lld_ELF_LTO.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm40/files/lld/patch-tools_lld_ELF_LTO.cpp Wed Aug 15 22:40:06 2018 (r477293) @@ -0,0 +1,14 @@ +--- tools/lld/ELF/LTO.cpp.orig 2017-01-04 09:45:45 UTC ++++ tools/lld/ELF/LTO.cpp +@@ -158,7 +158,7 @@ std::vector BitcodeCompiler::compile() { + return Ret; + } + +-template void BitcodeCompiler::template add(BitcodeFile &); +-template void BitcodeCompiler::template add(BitcodeFile &); +-template void BitcodeCompiler::template add(BitcodeFile &); +-template void BitcodeCompiler::template add(BitcodeFile &); ++template void BitcodeCompiler::add(BitcodeFile &); ++template void BitcodeCompiler::add(BitcodeFile &); ++template void BitcodeCompiler::add(BitcodeFile &); ++template void BitcodeCompiler::add(BitcodeFile &); Added: head/devel/llvm40/files/lld/patch-tools_lld_ELF_Symbols.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm40/files/lld/patch-tools_lld_ELF_Symbols.cpp Wed Aug 15 22:40:06 2018 (r477293) @@ -0,0 +1,80 @@ +--- tools/lld/ELF/Symbols.cpp.orig 2017-02-01 22:45:57 UTC ++++ tools/lld/ELF/Symbols.cpp +@@ -343,45 +343,45 @@ template bool SymbolBody::hasThunk() const; + template bool SymbolBody::hasThunk() const; + template bool SymbolBody::hasThunk() const; + +-template uint32_t SymbolBody::template getVA(uint32_t) const; +-template uint32_t SymbolBody::template getVA(uint32_t) const; +-template uint64_t SymbolBody::template getVA(uint64_t) const; +-template uint64_t SymbolBody::template getVA(uint64_t) const; ++template uint32_t SymbolBody::getVA(uint32_t) const; ++template uint32_t SymbolBody::getVA(uint32_t) const; ++template uint64_t SymbolBody::getVA(uint64_t) const; ++template uint64_t SymbolBody::getVA(uint64_t) const; + +-template uint32_t SymbolBody::template getGotVA() const; +-template uint32_t SymbolBody::template getGotVA() const; +-template uint64_t SymbolBody::template getGotVA() const; +-template uint64_t SymbolBody::template getGotVA() const; ++template uint32_t SymbolBody::getGotVA() const; ++template uint32_t SymbolBody::getGotVA() const; ++template uint64_t SymbolBody::getGotVA() const; ++template uint64_t SymbolBody::getGotVA() const; + +-template uint32_t SymbolBody::template getGotOffset() const; +-template uint32_t SymbolBody::template getGotOffset() const; +-template uint64_t SymbolBody::template getGotOffset() const; +-template uint64_t SymbolBody::template getGotOffset() const; ++template uint32_t SymbolBody::getGotOffset() const; ++template uint32_t SymbolBody::getGotOffset() const; ++template uint64_t SymbolBody::getGotOffset() const; ++template uint64_t SymbolBody::getGotOffset() const; + +-template uint32_t SymbolBody::template getGotPltVA() const; +-template uint32_t SymbolBody::template getGotPltVA() const; +-template uint64_t SymbolBody::template getGotPltVA() const; +-template uint64_t SymbolBody::template getGotPltVA() const; ++template uint32_t SymbolBody::getGotPltVA() const; ++template uint32_t SymbolBody::getGotPltVA() const; ++template uint64_t SymbolBody::getGotPltVA() const; ++template uint64_t SymbolBody::getGotPltVA() const; + +-template uint32_t SymbolBody::template getThunkVA() const; +-template uint32_t SymbolBody::template getThunkVA() const; +-template uint64_t SymbolBody::template getThunkVA() const; +-template uint64_t SymbolBody::template getThunkVA() const; ++template uint32_t SymbolBody::getThunkVA() const; ++template uint32_t SymbolBody::getThunkVA() const; ++template uint64_t SymbolBody::getThunkVA() const; ++template uint64_t SymbolBody::getThunkVA() const; + +-template uint32_t SymbolBody::template getGotPltOffset() const; +-template uint32_t SymbolBody::template getGotPltOffset() const; +-template uint64_t SymbolBody::template getGotPltOffset() const; +-template uint64_t SymbolBody::template getGotPltOffset() const; ++template uint32_t SymbolBody::getGotPltOffset() const; ++template uint32_t SymbolBody::getGotPltOffset() const; ++template uint64_t SymbolBody::getGotPltOffset() const; ++template uint64_t SymbolBody::getGotPltOffset() const; + +-template uint32_t SymbolBody::template getPltVA() const; +-template uint32_t SymbolBody::template getPltVA() const; +-template uint64_t SymbolBody::template getPltVA() const; +-template uint64_t SymbolBody::template getPltVA() const; ++template uint32_t SymbolBody::getPltVA() const; ++template uint32_t SymbolBody::getPltVA() const; ++template uint64_t SymbolBody::getPltVA() const; ++template uint64_t SymbolBody::getPltVA() const; + +-template uint32_t SymbolBody::template getSize() const; +-template uint32_t SymbolBody::template getSize() const; +-template uint64_t SymbolBody::template getSize() const; +-template uint64_t SymbolBody::template getSize() const; ++template uint32_t SymbolBody::getSize() const; ++template uint32_t SymbolBody::getSize() const; ++template uint64_t SymbolBody::getSize() const; ++template uint64_t SymbolBody::getSize() const; + + template class elf::Undefined; + template class elf::Undefined; Modified: head/devel/llvm50/Makefile ============================================================================== --- head/devel/llvm50/Makefile Wed Aug 15 21:59:13 2018 (r477292) +++ head/devel/llvm50/Makefile Wed Aug 15 22:40:06 2018 (r477293) @@ -3,7 +3,6 @@ PORTNAME= llvm DISTVERSION= 5.0.2 PORTREVISION= 1 -PORTREVISON= 1 CATEGORIES= devel lang MASTER_SITES= https://releases.llvm.org/${LLVM_RELEASE}/${RCDIR} LOCAL/brooks PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -91,6 +90,7 @@ LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:2.7 LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} +LLD_EXTRA_PATCHES= ${PATCHDIR}/lld LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PY_ENUM34} LLDB_DESC= Install lldb, the LLVM debugger Added: head/devel/llvm50/files/lld/patch-tools_lld_ELF_Symbols.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm50/files/lld/patch-tools_lld_ELF_Symbols.cpp Wed Aug 15 22:40:06 2018 (r477293) @@ -0,0 +1,32 @@ +--- tools/lld/ELF/Symbols.cpp.orig 2017-07-14 00:22:46 UTC ++++ tools/lld/ELF/Symbols.cpp +@@ -383,17 +383,17 @@ std::string lld::toString(const SymbolBody &B) { + return B.getName(); + } + +-template uint32_t SymbolBody::template getSize() const; +-template uint32_t SymbolBody::template getSize() const; +-template uint64_t SymbolBody::template getSize() const; +-template uint64_t SymbolBody::template getSize() const; ++template uint32_t SymbolBody::getSize() const; ++template uint32_t SymbolBody::getSize() const; ++template uint64_t SymbolBody::getSize() const; ++template uint64_t SymbolBody::getSize() const; + +-template bool DefinedRegular::template isMipsPIC() const; +-template bool DefinedRegular::template isMipsPIC() const; +-template bool DefinedRegular::template isMipsPIC() const; +-template bool DefinedRegular::template isMipsPIC() const; ++template bool DefinedRegular::isMipsPIC() const; ++template bool DefinedRegular::isMipsPIC() const; ++template bool DefinedRegular::isMipsPIC() const; ++template bool DefinedRegular::isMipsPIC() const; + +-template uint32_t SharedSymbol::template getAlignment() const; +-template uint32_t SharedSymbol::template getAlignment() const; +-template uint32_t SharedSymbol::template getAlignment() const; +-template uint32_t SharedSymbol::template getAlignment() const; ++template uint32_t SharedSymbol::getAlignment() const; ++template uint32_t SharedSymbol::getAlignment() const; ++template uint32_t SharedSymbol::getAlignment() const; ++template uint32_t SharedSymbol::getAlignment() const;