devel/flang and devel/flang-clang: Update to snapshots supporting llvm 4.0 and upgrade dependencies to this version.

PR:	220829
Submitted by:	Rainer Hurling (rhurlin@gwdg.de)
Reviewed by:	swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D11709
This commit is contained in:
Johannes M Dieterich 2017-07-31 02:33:09 +00:00
parent 0733d95289
commit 1cacd5c8ae
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=446946
6 changed files with 123 additions and 117 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flang-clang
DISTVERSION= 3.9-20170518
DISTVERSION= 4.0-20170612
CATEGORIES= devel lang
MAINTAINER= jmd@FreeBSD.org
@ -13,9 +13,9 @@ LICENSE_NAME= LLVM Release License
LICENSE_FILE= ${WRKSRC}/LICENSE.TXT
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= llvm39>=0:devel/llvm39 \
BUILD_DEPENDS= llvm40>=0:devel/llvm40 \
openmp>=0:devel/openmp
RUN_DEPENDS= llvm39>=0:devel/llvm39 \
RUN_DEPENDS= llvm40>=0:devel/llvm40 \
openmp>=0:devel/openmp
USE_LDCONFIG= ${PREFIX}/flang/lib
@ -31,9 +31,9 @@ SHEBANG_FILES= tools/scan-view/bin/scan-view \
USE_GITHUB= yes
GH_ACCOUNT= flang-compiler
GH_PROJECT= clang
GH_TAGNAME= edf56fd
GH_TAGNAME= 17f4427
CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config39
CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40
CMAKE_INSTALL_PREFIX= ${PREFIX}/flang

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1495120245
SHA256 (flang-compiler-clang-3.9-20170518-edf56fd_GH0.tar.gz) = ff5dfcc322ceb247dffe10300a0a6072face2ef458c413e2dd70fb5c8e51beaa
SIZE (flang-compiler-clang-3.9-20170518-edf56fd_GH0.tar.gz) = 14365634
TIMESTAMP = 1500381643
SHA256 (flang-compiler-clang-4.0-20170612-17f4427_GH0.tar.gz) = 71f00321c7bb2907623506b6f07ea8e9d19cb832f6cdeb99831ed64fd38307b0
SIZE (flang-compiler-clang-4.0-20170612-17f4427_GH0.tar.gz) = 15209622

View file

@ -1,10 +1,13 @@
flang/bin/c-index-test
flang/bin/clang
flang/bin/clang++
flang/bin/clang-3.9
flang/bin/clang-4.0
flang/bin/clang-check
flang/bin/clang-cl
flang/bin/clang-cpp
flang/bin/clang-format
flang/bin/clang-import-test
flang/bin/clang-offload-bundler
flang/bin/flang
flang/bin/git-clang-format
flang/bin/scan-build
@ -128,6 +131,7 @@ flang/include/clang/Analysis/Analyses/Consumed.h
flang/include/clang/Analysis/Analyses/Dominators.h
flang/include/clang/Analysis/Analyses/FormatString.h
flang/include/clang/Analysis/Analyses/LiveVariables.h
flang/include/clang/Analysis/Analyses/OSLog.h
flang/include/clang/Analysis/Analyses/PostOrderCFGView.h
flang/include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
flang/include/clang/Analysis/Analyses/ReachableCode.h
@ -144,6 +148,7 @@ flang/include/clang/Analysis/AnalysisDiagnostic.h
flang/include/clang/Analysis/CFG.h
flang/include/clang/Analysis/CFGStmtMap.h
flang/include/clang/Analysis/CallGraph.h
flang/include/clang/Analysis/CloneDetection.h
flang/include/clang/Analysis/CodeInjector.h
flang/include/clang/Analysis/DomainSpecific/CocoaConventions.h
flang/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
@ -171,6 +176,7 @@ flang/include/clang/Basic/BuiltinsPPC.def
flang/include/clang/Basic/BuiltinsSystemZ.def
flang/include/clang/Basic/BuiltinsWebAssembly.def
flang/include/clang/Basic/BuiltinsX86.def
flang/include/clang/Basic/BuiltinsX86_64.def
flang/include/clang/Basic/BuiltinsXCore.def
flang/include/clang/Basic/CapturedStmt.h
flang/include/clang/Basic/CharInfo.h
@ -251,6 +257,7 @@ flang/include/clang/CodeGen/SwiftCallingConv.h
flang/include/clang/Config/config.h
flang/include/clang/Driver/Action.h
flang/include/clang/Driver/Compilation.h
flang/include/clang/Driver/Distro.h
flang/include/clang/Driver/Driver.h
flang/include/clang/Driver/DriverDiagnostic.h
flang/include/clang/Driver/Job.h
@ -402,6 +409,7 @@ flang/include/clang/Serialization/SerializationDiagnostic.h
flang/include/clang/StaticAnalyzer/Checkers/Checkers.inc
flang/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
flang/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
flang/include/clang/StaticAnalyzer/Checkers/MPIFunctionClassifier.h
flang/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
flang/include/clang/StaticAnalyzer/Checkers/SValExplainer.h
flang/include/clang/StaticAnalyzer/Core/Analyses.def
@ -460,9 +468,11 @@ flang/include/clang/Tooling/ArgumentsAdjusters.h
flang/include/clang/Tooling/CommonOptionsParser.h
flang/include/clang/Tooling/CompilationDatabase.h
flang/include/clang/Tooling/CompilationDatabasePluginRegistry.h
flang/include/clang/Tooling/Core/Diagnostic.h
flang/include/clang/Tooling/Core/Lookup.h
flang/include/clang/Tooling/Core/QualTypeNames.h
flang/include/clang/Tooling/Core/Replacement.h
flang/include/clang/Tooling/DiagnosticsYaml.h
flang/include/clang/Tooling/FileMatchTrie.h
flang/include/clang/Tooling/FixIt.h
flang/include/clang/Tooling/JSONCompilationDatabase.h
@ -470,99 +480,105 @@ flang/include/clang/Tooling/Refactoring.h
flang/include/clang/Tooling/RefactoringCallbacks.h
flang/include/clang/Tooling/ReplacementsYaml.h
flang/include/clang/Tooling/Tooling.h
flang/lib/clang/3.9.1/include/__clang_cuda_cmath.h
flang/lib/clang/3.9.1/include/__clang_cuda_intrinsics.h
flang/lib/clang/3.9.1/include/__clang_cuda_math_forward_declares.h
flang/lib/clang/3.9.1/include/__clang_cuda_runtime_wrapper.h
flang/lib/clang/3.9.1/include/__stddef_max_align_t.h
flang/lib/clang/3.9.1/include/__wmmintrin_aes.h
flang/lib/clang/3.9.1/include/__wmmintrin_pclmul.h
flang/lib/clang/3.9.1/include/adxintrin.h
flang/lib/clang/3.9.1/include/altivec.h
flang/lib/clang/3.9.1/include/ammintrin.h
flang/lib/clang/3.9.1/include/arm_acle.h
flang/lib/clang/3.9.1/include/arm_neon.h
flang/lib/clang/3.9.1/include/avx2intrin.h
flang/lib/clang/3.9.1/include/avx512bwintrin.h
flang/lib/clang/3.9.1/include/avx512cdintrin.h
flang/lib/clang/3.9.1/include/avx512dqintrin.h
flang/lib/clang/3.9.1/include/avx512erintrin.h
flang/lib/clang/3.9.1/include/avx512fintrin.h
flang/lib/clang/3.9.1/include/avx512ifmaintrin.h
flang/lib/clang/3.9.1/include/avx512ifmavlintrin.h
flang/lib/clang/3.9.1/include/avx512pfintrin.h
flang/lib/clang/3.9.1/include/avx512vbmiintrin.h
flang/lib/clang/3.9.1/include/avx512vbmivlintrin.h
flang/lib/clang/3.9.1/include/avx512vlbwintrin.h
flang/lib/clang/3.9.1/include/avx512vlcdintrin.h
flang/lib/clang/3.9.1/include/avx512vldqintrin.h
flang/lib/clang/3.9.1/include/avx512vlintrin.h
flang/lib/clang/3.9.1/include/avxintrin.h
flang/lib/clang/3.9.1/include/bmi2intrin.h
flang/lib/clang/3.9.1/include/bmiintrin.h
flang/lib/clang/3.9.1/include/clflushoptintrin.h
flang/lib/clang/3.9.1/include/cpuid.h
flang/lib/clang/3.9.1/include/cuda_builtin_vars.h
flang/lib/clang/3.9.1/include/emmintrin.h
flang/lib/clang/3.9.1/include/f16cintrin.h
flang/lib/clang/3.9.1/include/float.h
flang/lib/clang/3.9.1/include/fma4intrin.h
flang/lib/clang/3.9.1/include/fmaintrin.h
flang/lib/clang/3.9.1/include/fxsrintrin.h
flang/lib/clang/3.9.1/include/htmintrin.h
flang/lib/clang/3.9.1/include/htmxlintrin.h
flang/lib/clang/3.9.1/include/ia32intrin.h
flang/lib/clang/3.9.1/include/immintrin.h
flang/lib/clang/3.9.1/include/intrin.h
flang/lib/clang/3.9.1/include/inttypes.h
flang/lib/clang/3.9.1/include/iso646.h
flang/lib/clang/3.9.1/include/limits.h
flang/lib/clang/3.9.1/include/lzcntintrin.h
flang/lib/clang/3.9.1/include/mm3dnow.h
flang/lib/clang/3.9.1/include/mm_malloc.h
flang/lib/clang/3.9.1/include/mmintrin.h
flang/lib/clang/3.9.1/include/module.modulemap
flang/lib/clang/3.9.1/include/msa.h
flang/lib/clang/3.9.1/include/mwaitxintrin.h
flang/lib/clang/3.9.1/include/nmmintrin.h
flang/lib/clang/3.9.1/include/opencl-c.h
flang/lib/clang/3.9.1/include/pkuintrin.h
flang/lib/clang/3.9.1/include/pmmintrin.h
flang/lib/clang/3.9.1/include/popcntintrin.h
flang/lib/clang/3.9.1/include/prfchwintrin.h
flang/lib/clang/3.9.1/include/rdseedintrin.h
flang/lib/clang/3.9.1/include/rtmintrin.h
flang/lib/clang/3.9.1/include/s390intrin.h
flang/lib/clang/3.9.1/include/shaintrin.h
flang/lib/clang/3.9.1/include/smmintrin.h
flang/lib/clang/3.9.1/include/stdalign.h
flang/lib/clang/3.9.1/include/stdarg.h
flang/lib/clang/3.9.1/include/stdatomic.h
flang/lib/clang/3.9.1/include/stdbool.h
flang/lib/clang/3.9.1/include/stddef.h
flang/lib/clang/3.9.1/include/stdint.h
flang/lib/clang/3.9.1/include/stdnoreturn.h
flang/lib/clang/3.9.1/include/tbmintrin.h
flang/lib/clang/3.9.1/include/tgmath.h
flang/lib/clang/3.9.1/include/tmmintrin.h
flang/lib/clang/3.9.1/include/unwind.h
flang/lib/clang/3.9.1/include/vadefs.h
flang/lib/clang/3.9.1/include/varargs.h
flang/lib/clang/3.9.1/include/vecintrin.h
flang/lib/clang/3.9.1/include/wmmintrin.h
flang/lib/clang/3.9.1/include/x86intrin.h
flang/lib/clang/3.9.1/include/xmmintrin.h
flang/lib/clang/3.9.1/include/xopintrin.h
flang/lib/clang/3.9.1/include/xsavecintrin.h
flang/lib/clang/3.9.1/include/xsaveintrin.h
flang/lib/clang/3.9.1/include/xsaveoptintrin.h
flang/lib/clang/3.9.1/include/xsavesintrin.h
flang/lib/clang/3.9.1/include/xtestintrin.h
flang/lib/clang/4.0.1/include/__clang_cuda_builtin_vars.h
flang/lib/clang/4.0.1/include/__clang_cuda_cmath.h
flang/lib/clang/4.0.1/include/__clang_cuda_complex_builtins.h
flang/lib/clang/4.0.1/include/__clang_cuda_intrinsics.h
flang/lib/clang/4.0.1/include/__clang_cuda_math_forward_declares.h
flang/lib/clang/4.0.1/include/__clang_cuda_runtime_wrapper.h
flang/lib/clang/4.0.1/include/__stddef_max_align_t.h
flang/lib/clang/4.0.1/include/__wmmintrin_aes.h
flang/lib/clang/4.0.1/include/__wmmintrin_pclmul.h
flang/lib/clang/4.0.1/include/adxintrin.h
flang/lib/clang/4.0.1/include/altivec.h
flang/lib/clang/4.0.1/include/ammintrin.h
flang/lib/clang/4.0.1/include/arm_acle.h
flang/lib/clang/4.0.1/include/arm_neon.h
flang/lib/clang/4.0.1/include/armintr.h
flang/lib/clang/4.0.1/include/avx2intrin.h
flang/lib/clang/4.0.1/include/avx512bwintrin.h
flang/lib/clang/4.0.1/include/avx512cdintrin.h
flang/lib/clang/4.0.1/include/avx512dqintrin.h
flang/lib/clang/4.0.1/include/avx512erintrin.h
flang/lib/clang/4.0.1/include/avx512fintrin.h
flang/lib/clang/4.0.1/include/avx512ifmaintrin.h
flang/lib/clang/4.0.1/include/avx512ifmavlintrin.h
flang/lib/clang/4.0.1/include/avx512pfintrin.h
flang/lib/clang/4.0.1/include/avx512vbmiintrin.h
flang/lib/clang/4.0.1/include/avx512vbmivlintrin.h
flang/lib/clang/4.0.1/include/avx512vlbwintrin.h
flang/lib/clang/4.0.1/include/avx512vlcdintrin.h
flang/lib/clang/4.0.1/include/avx512vldqintrin.h
flang/lib/clang/4.0.1/include/avx512vlintrin.h
flang/lib/clang/4.0.1/include/avxintrin.h
flang/lib/clang/4.0.1/include/bmi2intrin.h
flang/lib/clang/4.0.1/include/bmiintrin.h
flang/lib/clang/4.0.1/include/clflushoptintrin.h
flang/lib/clang/4.0.1/include/cpuid.h
flang/lib/clang/4.0.1/include/cuda_wrappers/algorithm
flang/lib/clang/4.0.1/include/cuda_wrappers/complex
flang/lib/clang/4.0.1/include/cuda_wrappers/new
flang/lib/clang/4.0.1/include/emmintrin.h
flang/lib/clang/4.0.1/include/f16cintrin.h
flang/lib/clang/4.0.1/include/float.h
flang/lib/clang/4.0.1/include/fma4intrin.h
flang/lib/clang/4.0.1/include/fmaintrin.h
flang/lib/clang/4.0.1/include/fxsrintrin.h
flang/lib/clang/4.0.1/include/htmintrin.h
flang/lib/clang/4.0.1/include/htmxlintrin.h
flang/lib/clang/4.0.1/include/ia32intrin.h
flang/lib/clang/4.0.1/include/immintrin.h
flang/lib/clang/4.0.1/include/intrin.h
flang/lib/clang/4.0.1/include/inttypes.h
flang/lib/clang/4.0.1/include/iso646.h
flang/lib/clang/4.0.1/include/limits.h
flang/lib/clang/4.0.1/include/lzcntintrin.h
flang/lib/clang/4.0.1/include/mm3dnow.h
flang/lib/clang/4.0.1/include/mm_malloc.h
flang/lib/clang/4.0.1/include/mmintrin.h
flang/lib/clang/4.0.1/include/module.modulemap
flang/lib/clang/4.0.1/include/msa.h
flang/lib/clang/4.0.1/include/mwaitxintrin.h
flang/lib/clang/4.0.1/include/nmmintrin.h
flang/lib/clang/4.0.1/include/opencl-c.h
flang/lib/clang/4.0.1/include/pkuintrin.h
flang/lib/clang/4.0.1/include/pmmintrin.h
flang/lib/clang/4.0.1/include/popcntintrin.h
flang/lib/clang/4.0.1/include/prfchwintrin.h
flang/lib/clang/4.0.1/include/rdseedintrin.h
flang/lib/clang/4.0.1/include/rtmintrin.h
flang/lib/clang/4.0.1/include/s390intrin.h
flang/lib/clang/4.0.1/include/shaintrin.h
flang/lib/clang/4.0.1/include/smmintrin.h
flang/lib/clang/4.0.1/include/stdalign.h
flang/lib/clang/4.0.1/include/stdarg.h
flang/lib/clang/4.0.1/include/stdatomic.h
flang/lib/clang/4.0.1/include/stdbool.h
flang/lib/clang/4.0.1/include/stddef.h
flang/lib/clang/4.0.1/include/stdint.h
flang/lib/clang/4.0.1/include/stdnoreturn.h
flang/lib/clang/4.0.1/include/tbmintrin.h
flang/lib/clang/4.0.1/include/tgmath.h
flang/lib/clang/4.0.1/include/tmmintrin.h
flang/lib/clang/4.0.1/include/unwind.h
flang/lib/clang/4.0.1/include/vadefs.h
flang/lib/clang/4.0.1/include/varargs.h
flang/lib/clang/4.0.1/include/vecintrin.h
flang/lib/clang/4.0.1/include/wmmintrin.h
flang/lib/clang/4.0.1/include/x86intrin.h
flang/lib/clang/4.0.1/include/xmmintrin.h
flang/lib/clang/4.0.1/include/xopintrin.h
flang/lib/clang/4.0.1/include/xsavecintrin.h
flang/lib/clang/4.0.1/include/xsaveintrin.h
flang/lib/clang/4.0.1/include/xsaveoptintrin.h
flang/lib/clang/4.0.1/include/xsavesintrin.h
flang/lib/clang/4.0.1/include/xtestintrin.h
flang/lib/cmake/clang/ClangConfig.cmake
flang/lib/cmake/clang/ClangTargets-%%CMAKE_BUILD_TYPE%%.cmake
flang/lib/cmake/clang/ClangTargets.cmake
flang/lib/libclang.so
flang/lib/libclang.so.3.9
flang/lib/libclang.so.4
flang/lib/libclang.so.4.0
flang/lib/libclangARCMigrate.a
flang/lib/libclangAST.a
flang/lib/libclangASTMatchers.a

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flang
DISTVERSION= 3.9-20170522
PORTREVISION= 1
DISTVERSION= 4.0-20170717
CATEGORIES= devel
MAINTAINER= jmd@FreeBSD.org
@ -12,10 +11,10 @@ COMMENT= Fortran compiler targeting LLVM
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= llvm39>=0:devel/llvm39 \
BUILD_DEPENDS= llvm40>=0:devel/llvm40 \
openmp>=0:devel/openmp \
flang-clang>=0:devel/flang-clang
RUN_DEPENDS= llvm39>=0:devel/llvm39 \
RUN_DEPENDS= llvm40>=0:devel/llvm40 \
openmp>=0:devel/openmp \
flang-clang>=0:devel/flang-clang
@ -33,9 +32,9 @@ USES+= ${_USES_PYTHON}
USE_GITHUB= yes
GH_ACCOUNT= flang-compiler
GH_TAGNAME= 5af07d4
GH_TAGNAME= cd44bcd
CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config39 \
CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40 \
-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \
-DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1495501996
SHA256 (flang-compiler-flang-3.9-20170522-5af07d4_GH0.tar.gz) = e0398ba2e01d14dbd23b6cd9f07b66c0072a23468a48490003bbb3dff49895e5
SIZE (flang-compiler-flang-3.9-20170522-5af07d4_GH0.tar.gz) = 3578945
TIMESTAMP = 1500383149
SHA256 (flang-compiler-flang-4.0-20170717-cd44bcd_GH0.tar.gz) = 6d88a8a04fa3897c2d90d556a1018eaed607b7cdb9242fbf54f1282e2d25d6c9
SIZE (flang-compiler-flang-4.0-20170717-cd44bcd_GH0.tar.gz) = 3582194

View file

@ -1,14 +1,5 @@
--- CMakeLists.txt.orig 2017-05-17 00:40:01 UTC
--- CMakeLists.txt.orig 2017-07-17 19:12:06 UTC
+++ CMakeLists.txt
@@ -23,7 +23,7 @@ cmake_minimum_required(VERSION 2.8)
SET(CMAKE_Fortran_COMPILER_WORKS 1)
if( NOT DEFINED TARGET_ARCHITECTURE )
- execute_process(COMMAND uname -i OUTPUT_STRIP_TRAILING_WHITESPACE
+ execute_process(COMMAND uname -m OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE TARGET_ARCHITECTURE)
execute_process(COMMAND uname -s OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE TARGET_OS)
@@ -48,6 +48,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )
message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
return()