Date: Wed, 15 Aug 2018 22:40:06 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> 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 Message-ID: <201808152240.w7FMe6WX023401@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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<InputFile *> BitcodeCompiler::compile() { + return Ret; + } + +-template void BitcodeCompiler::template add<ELF32LE>(BitcodeFile &); +-template void BitcodeCompiler::template add<ELF32BE>(BitcodeFile &); +-template void BitcodeCompiler::template add<ELF64LE>(BitcodeFile &); +-template void BitcodeCompiler::template add<ELF64BE>(BitcodeFile &); ++template void BitcodeCompiler::add<ELF32LE>(BitcodeFile &); ++template void BitcodeCompiler::add<ELF32BE>(BitcodeFile &); ++template void BitcodeCompiler::add<ELF64LE>(BitcodeFile &); ++template void BitcodeCompiler::add<ELF64BE>(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<ELF32BE>() const; + template bool SymbolBody::hasThunk<ELF64LE>() const; + template bool SymbolBody::hasThunk<ELF64BE>() const; + +-template uint32_t SymbolBody::template getVA<ELF32LE>(uint32_t) const; +-template uint32_t SymbolBody::template getVA<ELF32BE>(uint32_t) const; +-template uint64_t SymbolBody::template getVA<ELF64LE>(uint64_t) const; +-template uint64_t SymbolBody::template getVA<ELF64BE>(uint64_t) const; ++template uint32_t SymbolBody::getVA<ELF32LE>(uint32_t) const; ++template uint32_t SymbolBody::getVA<ELF32BE>(uint32_t) const; ++template uint64_t SymbolBody::getVA<ELF64LE>(uint64_t) const; ++template uint64_t SymbolBody::getVA<ELF64BE>(uint64_t) const; + +-template uint32_t SymbolBody::template getGotVA<ELF32LE>() const; +-template uint32_t SymbolBody::template getGotVA<ELF32BE>() const; +-template uint64_t SymbolBody::template getGotVA<ELF64LE>() const; +-template uint64_t SymbolBody::template getGotVA<ELF64BE>() const; ++template uint32_t SymbolBody::getGotVA<ELF32LE>() const; ++template uint32_t SymbolBody::getGotVA<ELF32BE>() const; ++template uint64_t SymbolBody::getGotVA<ELF64LE>() const; ++template uint64_t SymbolBody::getGotVA<ELF64BE>() const; + +-template uint32_t SymbolBody::template getGotOffset<ELF32LE>() const; +-template uint32_t SymbolBody::template getGotOffset<ELF32BE>() const; +-template uint64_t SymbolBody::template getGotOffset<ELF64LE>() const; +-template uint64_t SymbolBody::template getGotOffset<ELF64BE>() const; ++template uint32_t SymbolBody::getGotOffset<ELF32LE>() const; ++template uint32_t SymbolBody::getGotOffset<ELF32BE>() const; ++template uint64_t SymbolBody::getGotOffset<ELF64LE>() const; ++template uint64_t SymbolBody::getGotOffset<ELF64BE>() const; + +-template uint32_t SymbolBody::template getGotPltVA<ELF32LE>() const; +-template uint32_t SymbolBody::template getGotPltVA<ELF32BE>() const; +-template uint64_t SymbolBody::template getGotPltVA<ELF64LE>() const; +-template uint64_t SymbolBody::template getGotPltVA<ELF64BE>() const; ++template uint32_t SymbolBody::getGotPltVA<ELF32LE>() const; ++template uint32_t SymbolBody::getGotPltVA<ELF32BE>() const; ++template uint64_t SymbolBody::getGotPltVA<ELF64LE>() const; ++template uint64_t SymbolBody::getGotPltVA<ELF64BE>() const; + +-template uint32_t SymbolBody::template getThunkVA<ELF32LE>() const; +-template uint32_t SymbolBody::template getThunkVA<ELF32BE>() const; +-template uint64_t SymbolBody::template getThunkVA<ELF64LE>() const; +-template uint64_t SymbolBody::template getThunkVA<ELF64BE>() const; ++template uint32_t SymbolBody::getThunkVA<ELF32LE>() const; ++template uint32_t SymbolBody::getThunkVA<ELF32BE>() const; ++template uint64_t SymbolBody::getThunkVA<ELF64LE>() const; ++template uint64_t SymbolBody::getThunkVA<ELF64BE>() const; + +-template uint32_t SymbolBody::template getGotPltOffset<ELF32LE>() const; +-template uint32_t SymbolBody::template getGotPltOffset<ELF32BE>() const; +-template uint64_t SymbolBody::template getGotPltOffset<ELF64LE>() const; +-template uint64_t SymbolBody::template getGotPltOffset<ELF64BE>() const; ++template uint32_t SymbolBody::getGotPltOffset<ELF32LE>() const; ++template uint32_t SymbolBody::getGotPltOffset<ELF32BE>() const; ++template uint64_t SymbolBody::getGotPltOffset<ELF64LE>() const; ++template uint64_t SymbolBody::getGotPltOffset<ELF64BE>() const; + +-template uint32_t SymbolBody::template getPltVA<ELF32LE>() const; +-template uint32_t SymbolBody::template getPltVA<ELF32BE>() const; +-template uint64_t SymbolBody::template getPltVA<ELF64LE>() const; +-template uint64_t SymbolBody::template getPltVA<ELF64BE>() const; ++template uint32_t SymbolBody::getPltVA<ELF32LE>() const; ++template uint32_t SymbolBody::getPltVA<ELF32BE>() const; ++template uint64_t SymbolBody::getPltVA<ELF64LE>() const; ++template uint64_t SymbolBody::getPltVA<ELF64BE>() const; + +-template uint32_t SymbolBody::template getSize<ELF32LE>() const; +-template uint32_t SymbolBody::template getSize<ELF32BE>() const; +-template uint64_t SymbolBody::template getSize<ELF64LE>() const; +-template uint64_t SymbolBody::template getSize<ELF64BE>() const; ++template uint32_t SymbolBody::getSize<ELF32LE>() const; ++template uint32_t SymbolBody::getSize<ELF32BE>() const; ++template uint64_t SymbolBody::getSize<ELF64LE>() const; ++template uint64_t SymbolBody::getSize<ELF64BE>() const; + + template class elf::Undefined<ELF32LE>; + template class elf::Undefined<ELF32BE>; 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<ELF32LE>() const; +-template uint32_t SymbolBody::template getSize<ELF32BE>() const; +-template uint64_t SymbolBody::template getSize<ELF64LE>() const; +-template uint64_t SymbolBody::template getSize<ELF64BE>() const; ++template uint32_t SymbolBody::getSize<ELF32LE>() const; ++template uint32_t SymbolBody::getSize<ELF32BE>() const; ++template uint64_t SymbolBody::getSize<ELF64LE>() const; ++template uint64_t SymbolBody::getSize<ELF64BE>() const; + +-template bool DefinedRegular::template isMipsPIC<ELF32LE>() const; +-template bool DefinedRegular::template isMipsPIC<ELF32BE>() const; +-template bool DefinedRegular::template isMipsPIC<ELF64LE>() const; +-template bool DefinedRegular::template isMipsPIC<ELF64BE>() const; ++template bool DefinedRegular::isMipsPIC<ELF32LE>() const; ++template bool DefinedRegular::isMipsPIC<ELF32BE>() const; ++template bool DefinedRegular::isMipsPIC<ELF64LE>() const; ++template bool DefinedRegular::isMipsPIC<ELF64BE>() const; + +-template uint32_t SharedSymbol::template getAlignment<ELF32LE>() const; +-template uint32_t SharedSymbol::template getAlignment<ELF32BE>() const; +-template uint32_t SharedSymbol::template getAlignment<ELF64LE>() const; +-template uint32_t SharedSymbol::template getAlignment<ELF64BE>() const; ++template uint32_t SharedSymbol::getAlignment<ELF32LE>() const; ++template uint32_t SharedSymbol::getAlignment<ELF32BE>() const; ++template uint32_t SharedSymbol::getAlignment<ELF64LE>() const; ++template uint32_t SharedSymbol::getAlignment<ELF64BE>() const;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808152240.w7FMe6WX023401>