svn commit: r479159 - in head/devel: flang flang-clang flang-clang/files flang/files
Johannes M Dieterich
jmd at FreeBSD.org
Thu Sep 6 20:11:10 UTC 2018
Author: jmd
Date: Thu Sep 6 20:11:06 2018
New Revision: 479159
URL: https://svnweb.freebsd.org/changeset/ports/479159
Log:
devel/flang[-clang]: update to later snapshots
This introduces flang-driver, a clang6-derived driver / companion compiler, and
uses math/libpgmath as the math library backend. Notably, the latter currently
limits us to 12-CURRENT.
Patches are a combination of carry-over and adapted OpenBSD ones.
While there, pet portlint.
Reviewed by: zeising (mentor), mat
Approved by: zeising (mentor)
Obtained from: Brian Callahan (bcallah at openbsd.org) with adaptations
Differential Revision: https://reviews.freebsd.org/D17036
Added:
head/devel/flang/files/patch-runtime_flang_CMakeLists.txt (contents, props changed)
head/devel/flang/files/patch-tools_flang2_CMakeLists.txt (contents, props changed)
head/devel/flang/files/patch-tools_flang2_flang2exe_CMakeLists.txt (contents, props changed)
Deleted:
head/devel/flang-clang/files/
head/devel/flang/files/patch-runtime_flang_cdcos.c
head/devel/flang/files/patch-runtime_flang_cdexp.c
head/devel/flang/files/patch-runtime_flang_cexp.c
head/devel/flang/files/patch-runtime_include_mthdecls.h
Modified:
head/devel/flang-clang/Makefile
head/devel/flang-clang/distinfo
head/devel/flang-clang/pkg-descr
head/devel/flang-clang/pkg-plist
head/devel/flang/Makefile
head/devel/flang/distinfo
head/devel/flang/files/patch-CMakeLists.txt
head/devel/flang/files/patch-runtime_flangrti_trace__lin.c
head/devel/flang/pkg-descr
head/devel/flang/pkg-plist
Modified: head/devel/flang-clang/Makefile
==============================================================================
--- head/devel/flang-clang/Makefile Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang-clang/Makefile Thu Sep 6 20:11:06 2018 (r479159)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flang-clang
-DISTVERSION= 5.0-20180506
+DISTVERSION= 6.0-g20180904
PORTREVISION= 1
CATEGORIES= devel lang
@@ -14,28 +14,26 @@ LICENSE_NAME= LLVM Release License
LICENSE_FILE= ${WRKSRC}/LICENSE.TXT
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BUILD_DEPENDS= llvm50>=0:devel/llvm50
-RUN_DEPENDS= llvm50>=0:devel/llvm50
-
ONLY_FOR_ARCHS= amd64
-ONLY_FOR_ARCHS_REASON_amd64= for now only builds and is supported on amd64
-USE_LDCONFIG= ${PREFIX}/flang/lib
+BUILD_DEPENDS= llvm60>=0:devel/llvm60
+RUN_DEPENDS= llvm60>=0:devel/llvm60
+
USES= cmake:outsource compiler:c++11-lib libedit tar:xz perl5 \
python shebangfix
+USE_LDCONFIG= ${PREFIX}/flang/lib
+USE_GNOME= libxml2
-USE_GNOME+= libxml2
-
SHEBANG_FILES= tools/scan-view/bin/scan-view \
tools/clang-format/git-clang-format \
tools/clang-format/clang-format-diff.py
USE_GITHUB= yes
GH_ACCOUNT= flang-compiler
-GH_PROJECT= clang
-GH_TAGNAME= 64043d5
+GH_PROJECT= flang-driver
+GH_TAGNAME= 742de5f
-CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config50
+CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config60
CMAKE_INSTALL_PREFIX= ${PREFIX}/flang
Modified: head/devel/flang-clang/distinfo
==============================================================================
--- head/devel/flang-clang/distinfo Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang-clang/distinfo Thu Sep 6 20:11:06 2018 (r479159)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525637486
-SHA256 (flang-compiler-clang-5.0-20180506-64043d5_GH0.tar.gz) = 63f3b010bb90131099fe5f57e09e50e39aff37a1ac76fb0d1bb8d0ed7bf9e295
-SIZE (flang-compiler-clang-5.0-20180506-64043d5_GH0.tar.gz) = 16002999
+TIMESTAMP = 1536088760
+SHA256 (flang-compiler-flang-driver-6.0-g20180904-742de5f_GH0.tar.gz) = 1e80324da121211ea3389c445c3b387d587c6f4751a14285f2c6b3ea033e63da
+SIZE (flang-compiler-flang-driver-6.0-g20180904-742de5f_GH0.tar.gz) = 16771266
Modified: head/devel/flang-clang/pkg-descr
==============================================================================
--- head/devel/flang-clang/pkg-descr Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang-clang/pkg-descr Thu Sep 6 20:11:06 2018 (r479159)
@@ -1,3 +1,3 @@
Fortran compiler targeting LLVM (modified clang part)
-WWW: https://github.com/flang-compiler/clang
+WWW: https://github.com/flang-compiler/flang-driver
Modified: head/devel/flang-clang/pkg-plist
==============================================================================
--- head/devel/flang-clang/pkg-plist Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang-clang/pkg-plist Thu Sep 6 20:11:06 2018 (r479159)
@@ -1,13 +1,15 @@
flang/bin/c-index-test
flang/bin/clang
flang/bin/clang++
-flang/bin/clang-5.0
+flang/bin/clang-6.0
flang/bin/clang-check
flang/bin/clang-cl
flang/bin/clang-cpp
flang/bin/clang-format
+flang/bin/clang-func-mapping
flang/bin/clang-import-test
flang/bin/clang-offload-bundler
+flang/bin/clang-refactor
flang/bin/clang-rename
flang/bin/flang
flang/bin/git-clang-format
@@ -62,6 +64,7 @@ flang/include/clang/AST/CommentNodes.inc
flang/include/clang/AST/CommentParser.h
flang/include/clang/AST/CommentSema.h
flang/include/clang/AST/CommentVisitor.h
+flang/include/clang/AST/DataCollection.h
flang/include/clang/AST/Decl.h
flang/include/clang/AST/DeclAccessPair.h
flang/include/clang/AST/DeclBase.h
@@ -86,6 +89,7 @@ flang/include/clang/AST/ExternalASTMerger.h
flang/include/clang/AST/ExternalASTSource.h
flang/include/clang/AST/GlobalDecl.h
flang/include/clang/AST/LambdaCapture.h
+flang/include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h
flang/include/clang/AST/LocInfoType.h
flang/include/clang/AST/Mangle.h
flang/include/clang/AST/MangleNumberingContext.h
@@ -97,6 +101,7 @@ flang/include/clang/AST/OperationKinds.def
flang/include/clang/AST/OperationKinds.h
flang/include/clang/AST/ParentMap.h
flang/include/clang/AST/PrettyPrinter.h
+flang/include/clang/AST/QualTypeNames.h
flang/include/clang/AST/RawCommentList.h
flang/include/clang/AST/RecordLayout.h
flang/include/clang/AST/RecursiveASTVisitor.h
@@ -104,6 +109,7 @@ flang/include/clang/AST/Redeclarable.h
flang/include/clang/AST/SelectorLocationsKind.h
flang/include/clang/AST/Stmt.h
flang/include/clang/AST/StmtCXX.h
+flang/include/clang/AST/StmtDataCollectors.inc
flang/include/clang/AST/StmtGraphTraits.h
flang/include/clang/AST/StmtIterator.h
flang/include/clang/AST/StmtNodes.inc
@@ -147,8 +153,9 @@ flang/include/clang/Analysis/Analyses/ThreadSafetyTIL.
flang/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
flang/include/clang/Analysis/Analyses/ThreadSafetyUtil.h
flang/include/clang/Analysis/Analyses/UninitializedValues.h
-flang/include/clang/Analysis/AnalysisContext.h
+flang/include/clang/Analysis/AnalysisDeclContext.h
flang/include/clang/Analysis/AnalysisDiagnostic.h
+flang/include/clang/Analysis/BodyFarm.h
flang/include/clang/Analysis/CFG.h
flang/include/clang/Analysis/CFGStmtMap.h
flang/include/clang/Analysis/CallGraph.h
@@ -161,6 +168,7 @@ flang/include/clang/Analysis/ProgramPoint.h
flang/include/clang/Analysis/Support/BumpVector.h
flang/include/clang/Basic/ABI.h
flang/include/clang/Basic/AddressSpaces.h
+flang/include/clang/Basic/AlignedAllocation.h
flang/include/clang/Basic/AllDiagnostics.h
flang/include/clang/Basic/AttrHasAttributeImpl.inc
flang/include/clang/Basic/AttrKinds.h
@@ -196,7 +204,9 @@ flang/include/clang/Basic/DiagnosticAnalysisKinds.inc
flang/include/clang/Basic/DiagnosticCategories.h
flang/include/clang/Basic/DiagnosticCommentKinds.inc
flang/include/clang/Basic/DiagnosticCommonKinds.inc
+flang/include/clang/Basic/DiagnosticCrossTUKinds.inc
flang/include/clang/Basic/DiagnosticDriverKinds.inc
+flang/include/clang/Basic/DiagnosticError.h
flang/include/clang/Basic/DiagnosticFrontendKinds.inc
flang/include/clang/Basic/DiagnosticGroups.inc
flang/include/clang/Basic/DiagnosticIDs.h
@@ -205,6 +215,7 @@ flang/include/clang/Basic/DiagnosticLexKinds.inc
flang/include/clang/Basic/DiagnosticOptions.def
flang/include/clang/Basic/DiagnosticOptions.h
flang/include/clang/Basic/DiagnosticParseKinds.inc
+flang/include/clang/Basic/DiagnosticRefactoringKinds.inc
flang/include/clang/Basic/DiagnosticSemaKinds.inc
flang/include/clang/Basic/DiagnosticSerializationKinds.inc
flang/include/clang/Basic/ExceptionSpecificationType.h
@@ -235,12 +246,14 @@ flang/include/clang/Basic/PlistSupport.h
flang/include/clang/Basic/PragmaKinds.h
flang/include/clang/Basic/PrettyStackTrace.h
flang/include/clang/Basic/SanitizerBlacklist.h
+flang/include/clang/Basic/SanitizerSpecialCaseList.h
flang/include/clang/Basic/Sanitizers.def
flang/include/clang/Basic/Sanitizers.h
flang/include/clang/Basic/SourceLocation.h
flang/include/clang/Basic/SourceManager.h
flang/include/clang/Basic/SourceManagerInternals.h
flang/include/clang/Basic/Specifiers.h
+flang/include/clang/Basic/SyncScope.h
flang/include/clang/Basic/TargetBuiltins.h
flang/include/clang/Basic/TargetCXXABI.h
flang/include/clang/Basic/TargetInfo.h
@@ -254,6 +267,7 @@ flang/include/clang/Basic/Version.inc
flang/include/clang/Basic/VersionTuple.h
flang/include/clang/Basic/VirtualFileSystem.h
flang/include/clang/Basic/Visibility.h
+flang/include/clang/Basic/X86Target.def
flang/include/clang/Basic/XRayLists.h
flang/include/clang/Basic/arm_neon.inc
flang/include/clang/CodeGen/BackendUtil.h
@@ -266,6 +280,8 @@ flang/include/clang/CodeGen/ModuleBuilder.h
flang/include/clang/CodeGen/ObjectFilePCHContainerOperations.h
flang/include/clang/CodeGen/SwiftCallingConv.h
flang/include/clang/Config/config.h
+flang/include/clang/CrossTU/CrossTUDiagnostic.h
+flang/include/clang/CrossTU/CrossTranslationUnit.h
flang/include/clang/Driver/Action.h
flang/include/clang/Driver/Compilation.h
flang/include/clang/Driver/Distro.h
@@ -356,6 +372,7 @@ flang/include/clang/Lex/ScratchBuffer.h
flang/include/clang/Lex/Token.h
flang/include/clang/Lex/TokenConcatenation.h
flang/include/clang/Lex/TokenLexer.h
+flang/include/clang/Lex/VariadicMacroSupport.h
flang/include/clang/Parse/AttrParserStringSwitches.inc
flang/include/clang/Parse/AttrSubMatchRulesParserStringSwitches.inc
flang/include/clang/Parse/ParseAST.h
@@ -430,7 +447,7 @@ flang/include/clang/StaticAnalyzer/Checkers/SValExplai
flang/include/clang/StaticAnalyzer/Core/Analyses.def
flang/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
flang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
-flang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
+flang/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h
flang/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
flang/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h
flang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
@@ -455,6 +472,7 @@ flang/include/clang/StaticAnalyzer/Core/PathSensitive/
flang/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h
+flang/include/clang/StaticAnalyzer/Core/PathSensitive/LoopUnrolling.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/LoopWidening.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
@@ -480,142 +498,176 @@ flang/include/clang/StaticAnalyzer/Frontend/AnalysisCo
flang/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
flang/include/clang/StaticAnalyzer/Frontend/FrontendActions.h
flang/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
+flang/include/clang/Tooling/ASTDiff/ASTDiff.h
+flang/include/clang/Tooling/ASTDiff/ASTDiffInternal.h
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/Execution.h
flang/include/clang/Tooling/FileMatchTrie.h
flang/include/clang/Tooling/FixIt.h
flang/include/clang/Tooling/JSONCompilationDatabase.h
flang/include/clang/Tooling/Refactoring.h
+flang/include/clang/Tooling/Refactoring/ASTSelection.h
flang/include/clang/Tooling/Refactoring/AtomicChange.h
+flang/include/clang/Tooling/Refactoring/Extract/Extract.h
flang/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
+flang/include/clang/Tooling/Refactoring/RefactoringAction.h
+flang/include/clang/Tooling/Refactoring/RefactoringActionRule.h
+flang/include/clang/Tooling/Refactoring/RefactoringActionRuleRequirements.h
+flang/include/clang/Tooling/Refactoring/RefactoringActionRules.h
+flang/include/clang/Tooling/Refactoring/RefactoringActionRulesInternal.h
+flang/include/clang/Tooling/Refactoring/RefactoringDiagnostic.h
+flang/include/clang/Tooling/Refactoring/RefactoringOption.h
+flang/include/clang/Tooling/Refactoring/RefactoringOptionVisitor.h
+flang/include/clang/Tooling/Refactoring/RefactoringOptions.h
+flang/include/clang/Tooling/Refactoring/RefactoringResultConsumer.h
+flang/include/clang/Tooling/Refactoring/RefactoringRuleContext.h
flang/include/clang/Tooling/Refactoring/Rename/RenamingAction.h
+flang/include/clang/Tooling/Refactoring/Rename/SymbolName.h
+flang/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
flang/include/clang/Tooling/Refactoring/Rename/USRFinder.h
flang/include/clang/Tooling/Refactoring/Rename/USRFindingAction.h
flang/include/clang/Tooling/Refactoring/Rename/USRLocFinder.h
flang/include/clang/Tooling/RefactoringCallbacks.h
flang/include/clang/Tooling/ReplacementsYaml.h
+flang/include/clang/Tooling/StandaloneExecution.h
+flang/include/clang/Tooling/ToolExecutorPluginRegistry.h
flang/include/clang/Tooling/Tooling.h
-flang/lib/clang/5.0.2/include/__clang_cuda_builtin_vars.h
-flang/lib/clang/5.0.2/include/__clang_cuda_cmath.h
-flang/lib/clang/5.0.2/include/__clang_cuda_complex_builtins.h
-flang/lib/clang/5.0.2/include/__clang_cuda_intrinsics.h
-flang/lib/clang/5.0.2/include/__clang_cuda_math_forward_declares.h
-flang/lib/clang/5.0.2/include/__clang_cuda_runtime_wrapper.h
-flang/lib/clang/5.0.2/include/__stddef_max_align_t.h
-flang/lib/clang/5.0.2/include/__wmmintrin_aes.h
-flang/lib/clang/5.0.2/include/__wmmintrin_pclmul.h
-flang/lib/clang/5.0.2/include/adxintrin.h
-flang/lib/clang/5.0.2/include/altivec.h
-flang/lib/clang/5.0.2/include/ammintrin.h
-flang/lib/clang/5.0.2/include/arm_acle.h
-flang/lib/clang/5.0.2/include/arm_neon.h
-flang/lib/clang/5.0.2/include/armintr.h
-flang/lib/clang/5.0.2/include/avx2intrin.h
-flang/lib/clang/5.0.2/include/avx512bwintrin.h
-flang/lib/clang/5.0.2/include/avx512cdintrin.h
-flang/lib/clang/5.0.2/include/avx512dqintrin.h
-flang/lib/clang/5.0.2/include/avx512erintrin.h
-flang/lib/clang/5.0.2/include/avx512fintrin.h
-flang/lib/clang/5.0.2/include/avx512ifmaintrin.h
-flang/lib/clang/5.0.2/include/avx512ifmavlintrin.h
-flang/lib/clang/5.0.2/include/avx512pfintrin.h
-flang/lib/clang/5.0.2/include/avx512vbmiintrin.h
-flang/lib/clang/5.0.2/include/avx512vbmivlintrin.h
-flang/lib/clang/5.0.2/include/avx512vlbwintrin.h
-flang/lib/clang/5.0.2/include/avx512vlcdintrin.h
-flang/lib/clang/5.0.2/include/avx512vldqintrin.h
-flang/lib/clang/5.0.2/include/avx512vlintrin.h
-flang/lib/clang/5.0.2/include/avx512vpopcntdqintrin.h
-flang/lib/clang/5.0.2/include/avxintrin.h
-flang/lib/clang/5.0.2/include/bmi2intrin.h
-flang/lib/clang/5.0.2/include/bmiintrin.h
-flang/lib/clang/5.0.2/include/clflushoptintrin.h
-flang/lib/clang/5.0.2/include/clzerointrin.h
-flang/lib/clang/5.0.2/include/cpuid.h
-flang/lib/clang/5.0.2/include/cuda_wrappers/algorithm
-flang/lib/clang/5.0.2/include/cuda_wrappers/complex
-flang/lib/clang/5.0.2/include/cuda_wrappers/new
-flang/lib/clang/5.0.2/include/emmintrin.h
-flang/lib/clang/5.0.2/include/f16cintrin.h
-flang/lib/clang/5.0.2/include/float.h
-flang/lib/clang/5.0.2/include/fma4intrin.h
-flang/lib/clang/5.0.2/include/fmaintrin.h
-flang/lib/clang/5.0.2/include/fxsrintrin.h
-flang/lib/clang/5.0.2/include/htmintrin.h
-flang/lib/clang/5.0.2/include/htmxlintrin.h
-flang/lib/clang/5.0.2/include/ia32intrin.h
-flang/lib/clang/5.0.2/include/immintrin.h
-flang/lib/clang/5.0.2/include/intrin.h
-flang/lib/clang/5.0.2/include/inttypes.h
-flang/lib/clang/5.0.2/include/iso646.h
-flang/lib/clang/5.0.2/include/limits.h
-flang/lib/clang/5.0.2/include/lwpintrin.h
-flang/lib/clang/5.0.2/include/lzcntintrin.h
-flang/lib/clang/5.0.2/include/mm3dnow.h
-flang/lib/clang/5.0.2/include/mm_malloc.h
-flang/lib/clang/5.0.2/include/mmintrin.h
-flang/lib/clang/5.0.2/include/module.modulemap
-flang/lib/clang/5.0.2/include/msa.h
-flang/lib/clang/5.0.2/include/mwaitxintrin.h
-flang/lib/clang/5.0.2/include/nmmintrin.h
-flang/lib/clang/5.0.2/include/opencl-c.h
-flang/lib/clang/5.0.2/include/pkuintrin.h
-flang/lib/clang/5.0.2/include/pmmintrin.h
-flang/lib/clang/5.0.2/include/popcntintrin.h
-flang/lib/clang/5.0.2/include/prfchwintrin.h
-flang/lib/clang/5.0.2/include/rdseedintrin.h
-flang/lib/clang/5.0.2/include/rtmintrin.h
-flang/lib/clang/5.0.2/include/s390intrin.h
-flang/lib/clang/5.0.2/include/shaintrin.h
-flang/lib/clang/5.0.2/include/smmintrin.h
-flang/lib/clang/5.0.2/include/stdalign.h
-flang/lib/clang/5.0.2/include/stdarg.h
-flang/lib/clang/5.0.2/include/stdatomic.h
-flang/lib/clang/5.0.2/include/stdbool.h
-flang/lib/clang/5.0.2/include/stddef.h
-flang/lib/clang/5.0.2/include/stdint.h
-flang/lib/clang/5.0.2/include/stdnoreturn.h
-flang/lib/clang/5.0.2/include/tbmintrin.h
-flang/lib/clang/5.0.2/include/tgmath.h
-flang/lib/clang/5.0.2/include/tmmintrin.h
-flang/lib/clang/5.0.2/include/unwind.h
-flang/lib/clang/5.0.2/include/vadefs.h
-flang/lib/clang/5.0.2/include/varargs.h
-flang/lib/clang/5.0.2/include/vecintrin.h
-flang/lib/clang/5.0.2/include/wmmintrin.h
-flang/lib/clang/5.0.2/include/x86intrin.h
-flang/lib/clang/5.0.2/include/xmmintrin.h
-flang/lib/clang/5.0.2/include/xopintrin.h
-flang/lib/clang/5.0.2/include/xsavecintrin.h
-flang/lib/clang/5.0.2/include/xsaveintrin.h
-flang/lib/clang/5.0.2/include/xsaveoptintrin.h
-flang/lib/clang/5.0.2/include/xsavesintrin.h
-flang/lib/clang/5.0.2/include/xtestintrin.h
+flang/lib/clang/6.0.1/include/__clang_cuda_builtin_vars.h
+flang/lib/clang/6.0.1/include/__clang_cuda_cmath.h
+flang/lib/clang/6.0.1/include/__clang_cuda_complex_builtins.h
+flang/lib/clang/6.0.1/include/__clang_cuda_intrinsics.h
+flang/lib/clang/6.0.1/include/__clang_cuda_math_forward_declares.h
+flang/lib/clang/6.0.1/include/__clang_cuda_runtime_wrapper.h
+flang/lib/clang/6.0.1/include/__stddef_max_align_t.h
+flang/lib/clang/6.0.1/include/__wmmintrin_aes.h
+flang/lib/clang/6.0.1/include/__wmmintrin_pclmul.h
+flang/lib/clang/6.0.1/include/adxintrin.h
+flang/lib/clang/6.0.1/include/altivec.h
+flang/lib/clang/6.0.1/include/ammintrin.h
+flang/lib/clang/6.0.1/include/arm64intr.h
+flang/lib/clang/6.0.1/include/arm_acle.h
+flang/lib/clang/6.0.1/include/arm_neon.h
+flang/lib/clang/6.0.1/include/armintr.h
+flang/lib/clang/6.0.1/include/avx2intrin.h
+flang/lib/clang/6.0.1/include/avx512bitalgintrin.h
+flang/lib/clang/6.0.1/include/avx512bwintrin.h
+flang/lib/clang/6.0.1/include/avx512cdintrin.h
+flang/lib/clang/6.0.1/include/avx512dqintrin.h
+flang/lib/clang/6.0.1/include/avx512erintrin.h
+flang/lib/clang/6.0.1/include/avx512fintrin.h
+flang/lib/clang/6.0.1/include/avx512ifmaintrin.h
+flang/lib/clang/6.0.1/include/avx512ifmavlintrin.h
+flang/lib/clang/6.0.1/include/avx512pfintrin.h
+flang/lib/clang/6.0.1/include/avx512vbmi2intrin.h
+flang/lib/clang/6.0.1/include/avx512vbmiintrin.h
+flang/lib/clang/6.0.1/include/avx512vbmivlintrin.h
+flang/lib/clang/6.0.1/include/avx512vlbitalgintrin.h
+flang/lib/clang/6.0.1/include/avx512vlbwintrin.h
+flang/lib/clang/6.0.1/include/avx512vlcdintrin.h
+flang/lib/clang/6.0.1/include/avx512vldqintrin.h
+flang/lib/clang/6.0.1/include/avx512vlintrin.h
+flang/lib/clang/6.0.1/include/avx512vlvbmi2intrin.h
+flang/lib/clang/6.0.1/include/avx512vlvnniintrin.h
+flang/lib/clang/6.0.1/include/avx512vnniintrin.h
+flang/lib/clang/6.0.1/include/avx512vpopcntdqintrin.h
+flang/lib/clang/6.0.1/include/avx512vpopcntdqvlintrin.h
+flang/lib/clang/6.0.1/include/avxintrin.h
+flang/lib/clang/6.0.1/include/bmi2intrin.h
+flang/lib/clang/6.0.1/include/bmiintrin.h
+flang/lib/clang/6.0.1/include/cetintrin.h
+flang/lib/clang/6.0.1/include/clflushoptintrin.h
+flang/lib/clang/6.0.1/include/clwbintrin.h
+flang/lib/clang/6.0.1/include/clzerointrin.h
+flang/lib/clang/6.0.1/include/cpuid.h
+flang/lib/clang/6.0.1/include/cuda_wrappers/algorithm
+flang/lib/clang/6.0.1/include/cuda_wrappers/complex
+flang/lib/clang/6.0.1/include/cuda_wrappers/new
+flang/lib/clang/6.0.1/include/emmintrin.h
+flang/lib/clang/6.0.1/include/f16cintrin.h
+flang/lib/clang/6.0.1/include/float.h
+flang/lib/clang/6.0.1/include/fma4intrin.h
+flang/lib/clang/6.0.1/include/fmaintrin.h
+flang/lib/clang/6.0.1/include/fxsrintrin.h
+flang/lib/clang/6.0.1/include/gfniintrin.h
+flang/lib/clang/6.0.1/include/htmintrin.h
+flang/lib/clang/6.0.1/include/htmxlintrin.h
+flang/lib/clang/6.0.1/include/ia32intrin.h
+flang/lib/clang/6.0.1/include/immintrin.h
+flang/lib/clang/6.0.1/include/intrin.h
+flang/lib/clang/6.0.1/include/inttypes.h
+flang/lib/clang/6.0.1/include/iso646.h
+flang/lib/clang/6.0.1/include/limits.h
+flang/lib/clang/6.0.1/include/lwpintrin.h
+flang/lib/clang/6.0.1/include/lzcntintrin.h
+flang/lib/clang/6.0.1/include/mm3dnow.h
+flang/lib/clang/6.0.1/include/mm_malloc.h
+flang/lib/clang/6.0.1/include/mmintrin.h
+flang/lib/clang/6.0.1/include/module.modulemap
+flang/lib/clang/6.0.1/include/msa.h
+flang/lib/clang/6.0.1/include/mwaitxintrin.h
+flang/lib/clang/6.0.1/include/nmmintrin.h
+flang/lib/clang/6.0.1/include/opencl-c.h
+flang/lib/clang/6.0.1/include/pkuintrin.h
+flang/lib/clang/6.0.1/include/pmmintrin.h
+flang/lib/clang/6.0.1/include/popcntintrin.h
+flang/lib/clang/6.0.1/include/prfchwintrin.h
+flang/lib/clang/6.0.1/include/rdseedintrin.h
+flang/lib/clang/6.0.1/include/rtmintrin.h
+flang/lib/clang/6.0.1/include/s390intrin.h
+flang/lib/clang/6.0.1/include/shaintrin.h
+flang/lib/clang/6.0.1/include/smmintrin.h
+flang/lib/clang/6.0.1/include/stdalign.h
+flang/lib/clang/6.0.1/include/stdarg.h
+flang/lib/clang/6.0.1/include/stdatomic.h
+flang/lib/clang/6.0.1/include/stdbool.h
+flang/lib/clang/6.0.1/include/stddef.h
+flang/lib/clang/6.0.1/include/stdint.h
+flang/lib/clang/6.0.1/include/stdnoreturn.h
+flang/lib/clang/6.0.1/include/tbmintrin.h
+flang/lib/clang/6.0.1/include/tgmath.h
+flang/lib/clang/6.0.1/include/tmmintrin.h
+flang/lib/clang/6.0.1/include/unwind.h
+flang/lib/clang/6.0.1/include/vadefs.h
+flang/lib/clang/6.0.1/include/vaesintrin.h
+flang/lib/clang/6.0.1/include/varargs.h
+flang/lib/clang/6.0.1/include/vecintrin.h
+flang/lib/clang/6.0.1/include/vpclmulqdqintrin.h
+flang/lib/clang/6.0.1/include/wmmintrin.h
+flang/lib/clang/6.0.1/include/x86intrin.h
+flang/lib/clang/6.0.1/include/xmmintrin.h
+flang/lib/clang/6.0.1/include/xopintrin.h
+flang/lib/clang/6.0.1/include/xsavecintrin.h
+flang/lib/clang/6.0.1/include/xsaveintrin.h
+flang/lib/clang/6.0.1/include/xsaveoptintrin.h
+flang/lib/clang/6.0.1/include/xsavesintrin.h
+flang/lib/clang/6.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.5
-flang/lib/libclang.so.5.0
+flang/lib/libclang.so.6
+flang/lib/libclang.so.6.0
flang/lib/libclangARCMigrate.a
flang/lib/libclangAST.a
flang/lib/libclangASTMatchers.a
flang/lib/libclangAnalysis.a
flang/lib/libclangBasic.a
flang/lib/libclangCodeGen.a
+flang/lib/libclangCrossTU.a
flang/lib/libclangDriver.a
flang/lib/libclangDynamicASTMatchers.a
flang/lib/libclangEdit.a
flang/lib/libclangFormat.a
flang/lib/libclangFrontend.a
flang/lib/libclangFrontendTool.a
+flang/lib/libclangHandleCXX.a
flang/lib/libclangIndex.a
flang/lib/libclangLex.a
flang/lib/libclangParse.a
@@ -627,6 +679,7 @@ flang/lib/libclangStaticAnalyzerCheckers.a
flang/lib/libclangStaticAnalyzerCore.a
flang/lib/libclangStaticAnalyzerFrontend.a
flang/lib/libclangTooling.a
+flang/lib/libclangToolingASTDiff.a
flang/lib/libclangToolingCore.a
flang/lib/libclangToolingRefactor.a
flang/libexec/c++-analyzer
@@ -648,3 +701,4 @@ flang/share/scan-view/Reporter.py
flang/share/scan-view/ScanView.py
flang/share/scan-view/bugcatcher.ico
flang/share/scan-view/startfile.py
+libdata/ldconfig/flang-clang
Modified: head/devel/flang/Makefile
==============================================================================
--- head/devel/flang/Makefile Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang/Makefile Thu Sep 6 20:11:06 2018 (r479159)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= flang
-DISTVERSION= 5.0-20171225
-PORTREVISION= 2
+DISTVERSION= 6.0-g20180904
CATEGORIES= devel
MAINTAINER= jmd at FreeBSD.org
@@ -12,39 +11,39 @@ COMMENT= Fortran compiler targeting LLVM
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= llvm50>=0:devel/llvm50 \
+ONLY_FOR_ARCHS= amd64
+
+BUILD_DEPENDS= llvm60>=0:devel/llvm60 \
flang-clang>=0:devel/flang-clang
-RUN_DEPENDS= llvm50>=0:devel/llvm50 \
+RUN_DEPENDS= llvm60>=0:devel/llvm60 \
flang-clang>=0:devel/flang-clang
+LIB_DEPENDS= libpgmath.so:math/libpgmath
-ONLY_FOR_ARCHS= amd64
-ONLY_FOR_ARCHS_REASON_amd64= for now only builds and is supported on amd64
-
OPTIONS_DEFINE= TESTS
TESTS_DESC= build unit tests for flang
-USE_LDCONFIG= ${PREFIX}/flang/lib
USES= cmake:outsource,noninja compiler:c++11-lib libedit perl5 tar:xz \
shebangfix
_USES_PYTHON?= python:build
USES+= ${_USES_PYTHON}
+USE_LDCONFIG= ${PREFIX}/flang/lib
USE_GITHUB= yes
GH_ACCOUNT= flang-compiler
-GH_TAGNAME= 64189a1
+GH_TAGNAME= 53e368b
-CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config50 \
+CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config60 \
-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \
-DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang \
- -DFLANG_LIBOMP=${LOCALBASE}/llvm50/lib/libomp.so
+ -DFLANG_LIBOMP=${LOCALBASE}/llvm60/lib/libomp.so \
+ -DLIBPGMATH="${LOCALBASE}/lib/libpgmath.a" \
+ -WWITH_ERROR=OFF
CMAKE_INSTALL_PREFIX= ${PREFIX}/flang
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MTESTS}
-CMAKE_ARGS+= -DFLANG_INCLUDE_TESTS=ON
-.endif
+TESTS_CMAKE_ON= FLANG_INCLUDE_TESTS
MAKE_JOBS_UNSAFE= yes
Modified: head/devel/flang/distinfo
==============================================================================
--- head/devel/flang/distinfo Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang/distinfo Thu Sep 6 20:11:06 2018 (r479159)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514225293
-SHA256 (flang-compiler-flang-5.0-20171225-64189a1_GH0.tar.gz) = 7fbb927fffbb110bb0f5cdc1175537bf10f20fec5e7bd562d624529075e1bcab
-SIZE (flang-compiler-flang-5.0-20171225-64189a1_GH0.tar.gz) = 3940607
+TIMESTAMP = 1536093717
+SHA256 (flang-compiler-flang-6.0-g20180904-53e368b_GH0.tar.gz) = e9cf2589c6cbad3ec953f4622ee60f7746c6921518d6905aef0526705d83c888
+SIZE (flang-compiler-flang-6.0-g20180904-53e368b_GH0.tar.gz) = 4603486
Modified: head/devel/flang/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/flang/files/patch-CMakeLists.txt Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang/files/patch-CMakeLists.txt Thu Sep 6 20:11:06 2018 (r479159)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2017-10-19 11:03:03 UTC
+--- CMakeLists.txt.orig 2018-09-03 06:03:48 UTC
+++ CMakeLists.txt
-@@ -51,6 +51,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )
+@@ -49,6 +49,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )
message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
return()
endif()
@@ -20,7 +20,7 @@
else()
message("Unsupported OS: ${TARGET_OS}" )
return()
-@@ -59,7 +72,8 @@ endif()
+@@ -57,7 +70,8 @@ endif()
# The cmake documentation states that these are set. They are not so we
# set them here
set(CMAKE_HOST_SYSTEM_NAME ${TARGET_OS})
@@ -30,7 +30,7 @@
# If we are not building as a part of LLVM, build Flang as an
# standalone project, using LLVM as an external library:
-@@ -296,7 +310,7 @@ endif()
+@@ -289,7 +303,7 @@ endif()
# Add appropriate flags for GCC
if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings")
Added: head/devel/flang/files/patch-runtime_flang_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/flang/files/patch-runtime_flang_CMakeLists.txt Thu Sep 6 20:11:06 2018 (r479159)
@@ -0,0 +1,20 @@
+--- runtime/flang/CMakeLists.txt.orig 2018-09-04 22:33:13 UTC
++++ runtime/flang/CMakeLists.txt
+@@ -420,7 +420,7 @@ set(I8_FILES_DIR I8_sources)
+ # Fortran files with macros as module names need to be preprocessed.
+ add_custom_command(
+ OUTPUT "${I8_FILES_DIR}/ieee_arithmetic.F95"
+- COMMAND "${CMAKE_C_COMPILER}" -E
++ COMMAND "${CMAKE_C_COMPILER}" -E -x c
+ "${CMAKE_CURRENT_SOURCE_DIR}/ieee_arithmetic.F95" -DDESC_I8
+ > "${I8_FILES_DIR}/ieee_arithmetic.F95"
+ COMMENT "Preprocessing ieee_arithmetic.F95"
+@@ -429,7 +429,7 @@ add_custom_command(
+
+ add_custom_command(
+ OUTPUT "${I8_FILES_DIR}/ieee_exceptions.F95"
+- COMMAND "${CMAKE_C_COMPILER}" -E
++ COMMAND "${CMAKE_C_COMPILER}" -E -x c
+ "${CMAKE_CURRENT_SOURCE_DIR}/ieee_exceptions.F95" -DDESC_I8
+ > "${I8_FILES_DIR}/ieee_exceptions.F95"
+ COMMENT "Preprocessing ieee_exceptions.F95"
Modified: head/devel/flang/files/patch-runtime_flangrti_trace__lin.c
==============================================================================
--- head/devel/flang/files/patch-runtime_flangrti_trace__lin.c Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang/files/patch-runtime_flangrti_trace__lin.c Thu Sep 6 20:11:06 2018 (r479159)
@@ -1,15 +1,15 @@
---- runtime/flangrti/trace_lin.c.orig 2017-10-19 11:03:03 UTC
+--- runtime/flangrti/trace_lin.c.orig 2018-09-03 06:03:48 UTC
+++ runtime/flangrti/trace_lin.c
-@@ -85,7 +85,7 @@ static struct sigs sigs[] = {
+@@ -87,7 +87,7 @@ static struct sigs sigs[] = {
{0, CODNULL, NULL} /* end of list */
};
-static gregset_t *regs; /* pointer to regs at signal */
+static void *regs; /* pointer to regs at signal */
- /* walk the stack back */
-
-@@ -99,7 +99,7 @@ __abort_trace(int skip)
+ extern char **__io_get_argv();
+ static char ** saved_argv;
+@@ -143,7 +143,7 @@ __abort_trace(int skip)
char **strings;
size_t i;
Added: head/devel/flang/files/patch-tools_flang2_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/flang/files/patch-tools_flang2_CMakeLists.txt Thu Sep 6 20:11:06 2018 (r479159)
@@ -0,0 +1,13 @@
+--- tools/flang2/CMakeLists.txt.orig 2018-09-04 22:24:01 UTC
++++ tools/flang2/CMakeLists.txt
+@@ -33,8 +33,8 @@ set(FLANG2_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/
+
+ include_directories(${FLANG2_INCLUDE_DIR})
+
+-if( ${TARGET_OS} STREQUAL "Linux" )
+- if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" )
++if( ${TARGET_OS} STREQUAL "Linux|FreeBSD" )
++ if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64|amd64" )
+ set(X86_64 ON)
+ set(LINUX86 ON)
+ endif()
Added: head/devel/flang/files/patch-tools_flang2_flang2exe_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/flang/files/patch-tools_flang2_flang2exe_CMakeLists.txt Thu Sep 6 20:11:06 2018 (r479159)
@@ -0,0 +1,11 @@
+--- tools/flang2/flang2exe/CMakeLists.txt.orig 2018-09-04 22:25:18 UTC
++++ tools/flang2/flang2exe/CMakeLists.txt
+@@ -101,7 +101,7 @@ set(INCLUDE_DIRS
+ ${FLANG_SOURCE_DIR}/lib/scutil
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+- ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET_ARCHITECTURE}-${TARGET_OS}
++ ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET_ARCHITECTURE}-Linux
+ ${UTILS_SYMTAB_BIN_DIR} # Symbol table headers
+ ${UTILS_ILI_BIN_DIR} # ILI IR headers
+ ${UTILS_ILM_BIN_DIR} # ILM IR headers
Modified: head/devel/flang/pkg-descr
==============================================================================
--- head/devel/flang/pkg-descr Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang/pkg-descr Thu Sep 6 20:11:06 2018 (r479159)
@@ -1,3 +1,3 @@
Fortran compiler targeting LLVM (modified clang part)
-WWW: https://github.com/flang-compiler/clang
+WWW: https://github.com/flang-compiler/flang
Modified: head/devel/flang/pkg-plist
==============================================================================
--- head/devel/flang/pkg-plist Thu Sep 6 20:06:40 2018 (r479158)
+++ head/devel/flang/pkg-plist Thu Sep 6 20:11:06 2018 (r479159)
@@ -2,7 +2,9 @@ bin/flang
flang/bin/flang1
flang/bin/flang2
flang/include/ieee_arithmetic.mod
+flang/include/ieee_arithmetic_la.mod
flang/include/ieee_exceptions.mod
+flang/include/ieee_exceptions_la.mod
flang/include/ieee_features.mod
flang/include/iso_c_binding.mod
flang/include/iso_fortran_env.mod
More information about the svn-ports-head
mailing list