cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r523228 r523234 r523575

Browse Source 
Update to a new snapshot (welcome to LLVM 11).

Fix plist when COMPILER_RT is disabled.

PR:		243371

Approved by:	portmgr (implicit: buildfix)
This commit is contained in:
Brooks Davis 2020-01-21 10:53:51 +00:00
parent 733278c924
commit d1cf6821ce
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q1/; revision=523714
7 changed files with 20 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/llvm-devel/Makefile
View File

@ -70,7 +70,7 @@ GH_TAGNAME= ${LLVM_PROJECT_COMMIT}
.include "Makefile.snapshot"
OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB ELFV2
OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD LLDB
OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP
OPTIONS_DEFINE_i386= COMPILER_RT OPENMP
OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD LLDB
@ -121,8 +121,6 @@ OPENMP_CONFLICTS_INSTALL= libiomp5-devel-*
GOLD_DESC= Build the LLVM Gold plugin for LTO
GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils
ELFV2_DESC= [PowerPC64] Use OpenPOWER ELF ABI v2 by default
ELFV2_EXTRA_PATCHES= ${PATCHDIR}/ppc64-elfv2
PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} \
LLVM_RELEASE=${LLVM_RELEASE}
@ -197,12 +195,6 @@ EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g}|${EX
.include <bsd.port.options.mk>
# PPC_ABI variable is only defined after including bsd.port.options.mk
.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
OPTIONS_DEFAULT_powerpc64= ELFV2
.endif
# keep in sync with /usr/src/lib/clang/clang.build.mk
# ----------- start of sync block ------------------
# Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
@ -235,7 +227,7 @@ USES+= gnome
.if ${PORT_OPTIONS:MCOMPILER_RT}
LLVM_ENABLE_PROJECTS+= compiler-rt
COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer)
COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
.endif
.if ${PORT_OPTIONS:MEXTRAS}

6
devel/llvm-devel/Makefile.snapshot
View File

@ -4,8 +4,8 @@
#
# Generated by: files/gen-Makefile.snapshot.sh.
#
LLVM_MAJOR= 10
LLVM_MAJOR= 11
LLVM_RELEASE= ${LLVM_MAJOR}.0.0
SNAPDATE= 20191218
SNAPDATE= 20200117
LLVM_PROJECT_COMMIT= 5789e83dedb97588ad75cca36d01ba6c5142d6d3
LLVM_PROJECT_COMMIT= f9c46229e4ac29053747c96e08c574c6c48d544b

6
devel/llvm-devel/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1576705258
SHA256 (llvm-llvm-project-10.0.d20191218-5789e83dedb97588ad75cca36d01ba6c5142d6d3_GH0.tar.gz) = 227799a56bc95b7b125e97113dc6aeb70114c5efdc72de6a1df8a5cb352657df
SIZE (llvm-llvm-project-10.0.d20191218-5789e83dedb97588ad75cca36d01ba6c5142d6d3_GH0.tar.gz) = 118025562
TIMESTAMP = 1579272116
SHA256 (llvm-llvm-project-11.0.d20200117-f9c46229e4ac29053747c96e08c574c6c48d544b_GH0.tar.gz) = 8c8abd3bad9c384b6c756fc0e7890e2a2c9dedbafeb6d9f8e56841d7a68c3dd0
SIZE (llvm-llvm-project-11.0.d20200117-f9c46229e4ac29053747c96e08c574c6c48d544b_GH0.tar.gz) = 120799517

2
devel/llvm-devel/files/gen-Makefile.snapshot.sh
View File

@ -17,7 +17,7 @@ cat <<EOF > Makefile.snapshot
#
# Generated by: files/gen-Makefile.snapshot.sh.
#
LLVM_MAJOR= 10
LLVM_MAJOR= 11
LLVM_RELEASE= \${LLVM_MAJOR}.0.0
SNAPDATE= $(date +%Y%m%d)

23
devel/llvm-devel/files/ppc64-elfv2/patch-lib_Target_PowerPC_PPCTargetMachine.cpp
View File

@ -1,23 +0,0 @@
--- llvm/lib/Target/PowerPC/PPCTargetMachine.cpp.orig 2019-07-04 07:43:51 UTC
+++ llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
@@ -209,6 +209,20 @@ static PPCTargetMachine::PPCABI computeTargetABI(const
if (TT.isMacOSX())
return PPCTargetMachine::PPC_ABI_UNKNOWN;
+ if (TT.isOSFreeBSD()) {
+ switch (TT.getArch()) {
+ case Triple::ppc64le:
+ case Triple::ppc64:
+ if (TT.getOSMajorVersion() >= 13)
+ return PPCTargetMachine::PPC_ABI_ELFv2;
+ else
+ return PPCTargetMachine::PPC_ABI_ELFv1;
+ case Triple::ppc:
+ default:
+ return PPCTargetMachine::PPC_ABI_UNKNOWN;
+ }
+ }
+
switch (TT.getArch()) {
case Triple::ppc64le:
return PPCTargetMachine::PPC_ABI_ELFv2;

34
devel/llvm-devel/files/ppc64-elfv2/patch-tools_clang_lib_Basic_Targets_PPC.h
View File

@ -1,34 +0,0 @@
--- clang/lib/Basic/Targets/PPC.h.orig 2019-07-09 13:32:26 UTC
+++ clang/lib/Basic/Targets/PPC.h
@@ -374,12 +374,29 @@ class LLVM_LIBRARY_VISIBILITY PPC64TargetInfo : public
IntMaxType = SignedLong;
Int64Type = SignedLong;
+ if (Triple.getEnvironment() != llvm::Triple::UnknownEnvironment) {
+ switch (Triple.getEnvironment()){
+ case llvm::Triple::ELFv1:
+ ABI = "elfv1";
+ break;
+ default:
+ ABI = "elfv2";
+ break;
+ }
+ } else {
+ if ((Triple.getOS() == llvm::Triple::FreeBSD) &&
+ (Triple.getOSMajorVersion() < 13)) {
+ ABI = "elfv1";
+ } else {
+ ABI = "elfv2";
+ }
+ }
+
+
if ((Triple.getArch() == llvm::Triple::ppc64le)) {
resetDataLayout("e-m:e-i64:64-n32:64");
- ABI = "elfv2";
} else {
resetDataLayout("E-m:e-i64:64-n32:64");
- ABI = Triple.getEnvironment() == llvm::Triple::ELFv2 ? "elfv2" : "elfv1";
}
if (Triple.getOS() == llvm::Triple::AIX)

12
devel/llvm-devel/pkg-plist
View File

@ -425,6 +425,7 @@ llvm-devel/bin/yaml2obj
%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsARM.def
%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsBPF.def
%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsHexagon.def
%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsHexagonDep.def
%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsLe64.def
%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsMips.def
%%CLANG%%llvm-devel/include/clang/Basic/BuiltinsNEON.def
@ -681,6 +682,7 @@ llvm-devel/bin/yaml2obj
%%CLANG%%llvm-devel/include/clang/Sema/Scope.h
%%CLANG%%llvm-devel/include/clang/Sema/ScopeInfo.h
%%CLANG%%llvm-devel/include/clang/Sema/Sema.h
%%CLANG%%llvm-devel/include/clang/Sema/SemaConcept.h
%%CLANG%%llvm-devel/include/clang/Sema/SemaConsumer.h
%%CLANG%%llvm-devel/include/clang/Sema/SemaDiagnostic.h
%%CLANG%%llvm-devel/include/clang/Sema/SemaFixItUtils.h
@ -1697,6 +1699,7 @@ llvm-devel/include/llvm/CodeGen/LiveStacks.h
llvm-devel/include/llvm/CodeGen/LiveVariables.h
llvm-devel/include/llvm/CodeGen/LoopTraversal.h
llvm-devel/include/llvm/CodeGen/LowLevelType.h
llvm-devel/include/llvm/CodeGen/MIRFormatter.h
llvm-devel/include/llvm/CodeGen/MIRParser/MIParser.h
llvm-devel/include/llvm/CodeGen/MIRParser/MIRParser.h
llvm-devel/include/llvm/CodeGen/MIRPrinter.h
@ -1798,6 +1801,9 @@ llvm-devel/include/llvm/Config/Disassemblers.def
llvm-devel/include/llvm/Config/Targets.def
llvm-devel/include/llvm/Config/abi-breaking.h
llvm-devel/include/llvm/Config/llvm-config.h
llvm-devel/include/llvm/DWARFLinker/DWARFLinker.h
llvm-devel/include/llvm/DWARFLinker/DWARFLinkerCompileUnit.h
llvm-devel/include/llvm/DWARFLinker/DWARFLinkerDeclContext.h
llvm-devel/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h
llvm-devel/include/llvm/DebugInfo/CodeView/CVRecord.h
llvm-devel/include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h
@ -2161,6 +2167,7 @@ llvm-devel/include/llvm/IR/IntrinsicsBPF.h
llvm-devel/include/llvm/IR/IntrinsicsBPF.td
llvm-devel/include/llvm/IR/IntrinsicsHexagon.h
llvm-devel/include/llvm/IR/IntrinsicsHexagon.td
llvm-devel/include/llvm/IR/IntrinsicsHexagonDep.td
llvm-devel/include/llvm/IR/IntrinsicsMips.h
llvm-devel/include/llvm/IR/IntrinsicsMips.td
llvm-devel/include/llvm/IR/IntrinsicsNVPTX.h
@ -2650,6 +2657,7 @@ llvm-devel/include/llvm/Transforms/IPO/InferFunctionAttrs.h
llvm-devel/include/llvm/Transforms/IPO/Inliner.h
llvm-devel/include/llvm/Transforms/IPO/Internalize.h
llvm-devel/include/llvm/Transforms/IPO/LowerTypeTests.h
llvm-devel/include/llvm/Transforms/IPO/MergeFunctions.h
llvm-devel/include/llvm/Transforms/IPO/PartialInlining.h
llvm-devel/include/llvm/Transforms/IPO/PassManagerBuilder.h
llvm-devel/include/llvm/Transforms/IPO/SCCP.h
@ -2738,6 +2746,7 @@ llvm-devel/include/llvm/Transforms/Scalar/SpeculativeExecution.h
llvm-devel/include/llvm/Transforms/Scalar/TailRecursionElimination.h
llvm-devel/include/llvm/Transforms/Scalar/WarnMissedTransforms.h
llvm-devel/include/llvm/Transforms/Utils.h
llvm-devel/include/llvm/Transforms/Utils/AMDGPUEmitPrintf.h
llvm-devel/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
llvm-devel/include/llvm/Transforms/Utils/AddDiscriminators.h
llvm-devel/include/llvm/Transforms/Utils/BasicBlockUtils.h
@ -2924,7 +2933,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/tmmintrin.h
%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/xmmintrin.h
%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/profile/InstrProfData.inc
%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/profile/InstrProfData.inc
%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
@ -3039,6 +3048,7 @@ llvm-devel/lib/libLLVMCodeGen.a
llvm-devel/lib/libLLVMCore.a
llvm-devel/lib/libLLVMCoroutines.a
llvm-devel/lib/libLLVMCoverage.a
llvm-devel/lib/libLLVMDWARFLinker.a
llvm-devel/lib/libLLVMDebugInfoCodeView.a
llvm-devel/lib/libLLVMDebugInfoDWARF.a
llvm-devel/lib/libLLVMDebugInfoGSYM.a