Page MenuHomeFreeBSD
Files F133205140

D12735.diff
No OneTemporary
Actions

D12735.diff
View Options

Index: head/devel/flang-clang/Makefile
===================================================================
--- head/devel/flang-clang/Makefile
+++ head/devel/flang-clang/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flang-clang
-DISTVERSION= 4.0-20171019
+DISTVERSION= 5.0-20171019
PORTREVISION= 1
CATEGORIES= devel lang
@@ -14,8 +14,8 @@
LICENSE_FILE= ${WRKSRC}/LICENSE.TXT
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BUILD_DEPENDS= llvm40>=0:devel/llvm40
-RUN_DEPENDS= llvm40>=0:devel/llvm40
+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
@@ -33,9 +33,9 @@
USE_GITHUB= yes
GH_ACCOUNT= flang-compiler
GH_PROJECT= clang
-GH_TAGNAME= 70938ea
+GH_TAGNAME= b11539a
-CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40
+CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config50
CMAKE_INSTALL_PREFIX= ${PREFIX}/flang
Index: head/devel/flang-clang/distinfo
===================================================================
--- head/devel/flang-clang/distinfo
+++ head/devel/flang-clang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508451770
-SHA256 (flang-compiler-clang-4.0-20171019-70938ea_GH0.tar.gz) = 6b462819323e3dcd0a34a844582adbfd47936d108be66850bb2e75853c66e354
-SIZE (flang-compiler-clang-4.0-20171019-70938ea_GH0.tar.gz) = 15209610
+TIMESTAMP = 1508463463
+SHA256 (flang-compiler-clang-5.0-20171019-b11539a_GH0.tar.gz) = d7fe7f2189c113a16bac0605e75c87863ad61db2e9930ec64c7abb2b47a5d392
+SIZE (flang-compiler-clang-5.0-20171019-b11539a_GH0.tar.gz) = 16003010
Index: head/devel/flang-clang/pkg-plist
===================================================================
--- head/devel/flang-clang/pkg-plist
+++ head/devel/flang-clang/pkg-plist
@@ -1,13 +1,14 @@
flang/bin/c-index-test
flang/bin/clang
flang/bin/clang++
-flang/bin/clang-4.0
+flang/bin/clang-5.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/clang-rename
flang/bin/flang
flang/bin/git-clang-format
flang/bin/scan-build
@@ -31,6 +32,7 @@
flang/include/clang/AST/ASTImporter.h
flang/include/clang/AST/ASTLambda.h
flang/include/clang/AST/ASTMutationListener.h
+flang/include/clang/AST/ASTStructuralEquivalence.h
flang/include/clang/AST/ASTTypeTraits.h
flang/include/clang/AST/ASTUnresolvedSet.h
flang/include/clang/AST/ASTVector.h
@@ -80,6 +82,7 @@
flang/include/clang/AST/ExprCXX.h
flang/include/clang/AST/ExprObjC.h
flang/include/clang/AST/ExprOpenMP.h
+flang/include/clang/AST/ExternalASTMerger.h
flang/include/clang/AST/ExternalASTSource.h
flang/include/clang/AST/GlobalDecl.h
flang/include/clang/AST/LambdaCapture.h
@@ -88,6 +91,7 @@
flang/include/clang/AST/MangleNumberingContext.h
flang/include/clang/AST/NSAPI.h
flang/include/clang/AST/NestedNameSpecifier.h
+flang/include/clang/AST/ODRHash.h
flang/include/clang/AST/OpenMPClause.h
flang/include/clang/AST/OperationKinds.def
flang/include/clang/AST/OperationKinds.h
@@ -161,6 +165,8 @@
flang/include/clang/Basic/AttrHasAttributeImpl.inc
flang/include/clang/Basic/AttrKinds.h
flang/include/clang/Basic/AttrList.inc
+flang/include/clang/Basic/AttrSubMatchRulesList.inc
+flang/include/clang/Basic/AttrSubjectMatchRules.h
flang/include/clang/Basic/Attributes.h
flang/include/clang/Basic/Builtins.def
flang/include/clang/Basic/Builtins.h
@@ -172,6 +178,7 @@
flang/include/clang/Basic/BuiltinsMips.def
flang/include/clang/Basic/BuiltinsNEON.def
flang/include/clang/Basic/BuiltinsNVPTX.def
+flang/include/clang/Basic/BuiltinsNios2.def
flang/include/clang/Basic/BuiltinsPPC.def
flang/include/clang/Basic/BuiltinsSystemZ.def
flang/include/clang/Basic/BuiltinsWebAssembly.def
@@ -212,6 +219,7 @@
flang/include/clang/Basic/LangOptions.h
flang/include/clang/Basic/Linkage.h
flang/include/clang/Basic/MacroBuilder.h
+flang/include/clang/Basic/MemoryBufferCache.h
flang/include/clang/Basic/Module.h
flang/include/clang/Basic/ObjCRuntime.h
flang/include/clang/Basic/OpenCLExtensions.def
@@ -246,11 +254,14 @@
flang/include/clang/Basic/VersionTuple.h
flang/include/clang/Basic/VirtualFileSystem.h
flang/include/clang/Basic/Visibility.h
+flang/include/clang/Basic/XRayLists.h
flang/include/clang/Basic/arm_neon.inc
flang/include/clang/CodeGen/BackendUtil.h
flang/include/clang/CodeGen/CGFunctionInfo.h
flang/include/clang/CodeGen/CodeGenABITypes.h
flang/include/clang/CodeGen/CodeGenAction.h
+flang/include/clang/CodeGen/ConstantInitBuilder.h
+flang/include/clang/CodeGen/ConstantInitFuture.h
flang/include/clang/CodeGen/ModuleBuilder.h
flang/include/clang/CodeGen/ObjectFilePCHContainerOperations.h
flang/include/clang/CodeGen/SwiftCallingConv.h
@@ -271,6 +282,7 @@
flang/include/clang/Driver/Types.def
flang/include/clang/Driver/Types.h
flang/include/clang/Driver/Util.h
+flang/include/clang/Driver/XRayArgs.h
flang/include/clang/Edit/Commit.h
flang/include/clang/Edit/EditedSource.h
flang/include/clang/Edit/EditsReceiver.h
@@ -299,6 +311,7 @@
flang/include/clang/Frontend/MigratorOptions.h
flang/include/clang/Frontend/MultiplexConsumer.h
flang/include/clang/Frontend/PCHContainerOperations.h
+flang/include/clang/Frontend/PrecompiledPreamble.h
flang/include/clang/Frontend/PreprocessorOutputOptions.h
flang/include/clang/Frontend/SerializedDiagnosticPrinter.h
flang/include/clang/Frontend/SerializedDiagnosticReader.h
@@ -344,9 +357,11 @@
flang/include/clang/Lex/TokenConcatenation.h
flang/include/clang/Lex/TokenLexer.h
flang/include/clang/Parse/AttrParserStringSwitches.inc
+flang/include/clang/Parse/AttrSubMatchRulesParserStringSwitches.inc
flang/include/clang/Parse/ParseAST.h
flang/include/clang/Parse/ParseDiagnostic.h
flang/include/clang/Parse/Parser.h
+flang/include/clang/Parse/RAIIObjectsForParser.h
flang/include/clang/Rewrite/Core/DeltaTree.h
flang/include/clang/Rewrite/Core/HTMLRewrite.h
flang/include/clang/Rewrite/Core/RewriteBuffer.h
@@ -450,6 +465,7 @@
flang/include/clang/StaticAnalyzer/Core/PathSensitive/SValVisitor.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.def
flang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
+flang/include/clang/StaticAnalyzer/Core/PathSensitive/SimpleConstraintManager.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/StoreRef.h
flang/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
@@ -477,108 +493,117 @@
flang/include/clang/Tooling/FixIt.h
flang/include/clang/Tooling/JSONCompilationDatabase.h
flang/include/clang/Tooling/Refactoring.h
+flang/include/clang/Tooling/Refactoring/AtomicChange.h
+flang/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
+flang/include/clang/Tooling/Refactoring/Rename/RenamingAction.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/Tooling.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/clang/5.0.0/include/__clang_cuda_builtin_vars.h
+flang/lib/clang/5.0.0/include/__clang_cuda_cmath.h
+flang/lib/clang/5.0.0/include/__clang_cuda_complex_builtins.h
+flang/lib/clang/5.0.0/include/__clang_cuda_intrinsics.h
+flang/lib/clang/5.0.0/include/__clang_cuda_math_forward_declares.h
+flang/lib/clang/5.0.0/include/__clang_cuda_runtime_wrapper.h
+flang/lib/clang/5.0.0/include/__stddef_max_align_t.h
+flang/lib/clang/5.0.0/include/__wmmintrin_aes.h
+flang/lib/clang/5.0.0/include/__wmmintrin_pclmul.h
+flang/lib/clang/5.0.0/include/adxintrin.h
+flang/lib/clang/5.0.0/include/altivec.h
+flang/lib/clang/5.0.0/include/ammintrin.h
+flang/lib/clang/5.0.0/include/arm_acle.h
+flang/lib/clang/5.0.0/include/arm_neon.h
+flang/lib/clang/5.0.0/include/armintr.h
+flang/lib/clang/5.0.0/include/avx2intrin.h
+flang/lib/clang/5.0.0/include/avx512bwintrin.h
+flang/lib/clang/5.0.0/include/avx512cdintrin.h
+flang/lib/clang/5.0.0/include/avx512dqintrin.h
+flang/lib/clang/5.0.0/include/avx512erintrin.h
+flang/lib/clang/5.0.0/include/avx512fintrin.h
+flang/lib/clang/5.0.0/include/avx512ifmaintrin.h
+flang/lib/clang/5.0.0/include/avx512ifmavlintrin.h
+flang/lib/clang/5.0.0/include/avx512pfintrin.h
+flang/lib/clang/5.0.0/include/avx512vbmiintrin.h
+flang/lib/clang/5.0.0/include/avx512vbmivlintrin.h
+flang/lib/clang/5.0.0/include/avx512vlbwintrin.h
+flang/lib/clang/5.0.0/include/avx512vlcdintrin.h
+flang/lib/clang/5.0.0/include/avx512vldqintrin.h
+flang/lib/clang/5.0.0/include/avx512vlintrin.h
+flang/lib/clang/5.0.0/include/avx512vpopcntdqintrin.h
+flang/lib/clang/5.0.0/include/avxintrin.h
+flang/lib/clang/5.0.0/include/bmi2intrin.h
+flang/lib/clang/5.0.0/include/bmiintrin.h
+flang/lib/clang/5.0.0/include/clflushoptintrin.h
+flang/lib/clang/5.0.0/include/clzerointrin.h
+flang/lib/clang/5.0.0/include/cpuid.h
+flang/lib/clang/5.0.0/include/cuda_wrappers/algorithm
+flang/lib/clang/5.0.0/include/cuda_wrappers/complex
+flang/lib/clang/5.0.0/include/cuda_wrappers/new
+flang/lib/clang/5.0.0/include/emmintrin.h
+flang/lib/clang/5.0.0/include/f16cintrin.h
+flang/lib/clang/5.0.0/include/float.h
+flang/lib/clang/5.0.0/include/fma4intrin.h
+flang/lib/clang/5.0.0/include/fmaintrin.h
+flang/lib/clang/5.0.0/include/fxsrintrin.h
+flang/lib/clang/5.0.0/include/htmintrin.h
+flang/lib/clang/5.0.0/include/htmxlintrin.h
+flang/lib/clang/5.0.0/include/ia32intrin.h
+flang/lib/clang/5.0.0/include/immintrin.h
+flang/lib/clang/5.0.0/include/intrin.h
+flang/lib/clang/5.0.0/include/inttypes.h
+flang/lib/clang/5.0.0/include/iso646.h
+flang/lib/clang/5.0.0/include/limits.h
+flang/lib/clang/5.0.0/include/lwpintrin.h
+flang/lib/clang/5.0.0/include/lzcntintrin.h
+flang/lib/clang/5.0.0/include/mm3dnow.h
+flang/lib/clang/5.0.0/include/mm_malloc.h
+flang/lib/clang/5.0.0/include/mmintrin.h
+flang/lib/clang/5.0.0/include/module.modulemap
+flang/lib/clang/5.0.0/include/msa.h
+flang/lib/clang/5.0.0/include/mwaitxintrin.h
+flang/lib/clang/5.0.0/include/nmmintrin.h
+flang/lib/clang/5.0.0/include/opencl-c.h
+flang/lib/clang/5.0.0/include/pkuintrin.h
+flang/lib/clang/5.0.0/include/pmmintrin.h
+flang/lib/clang/5.0.0/include/popcntintrin.h
+flang/lib/clang/5.0.0/include/prfchwintrin.h
+flang/lib/clang/5.0.0/include/rdseedintrin.h
+flang/lib/clang/5.0.0/include/rtmintrin.h
+flang/lib/clang/5.0.0/include/s390intrin.h
+flang/lib/clang/5.0.0/include/shaintrin.h
+flang/lib/clang/5.0.0/include/smmintrin.h
+flang/lib/clang/5.0.0/include/stdalign.h
+flang/lib/clang/5.0.0/include/stdarg.h
+flang/lib/clang/5.0.0/include/stdatomic.h
+flang/lib/clang/5.0.0/include/stdbool.h
+flang/lib/clang/5.0.0/include/stddef.h
+flang/lib/clang/5.0.0/include/stdint.h
+flang/lib/clang/5.0.0/include/stdnoreturn.h
+flang/lib/clang/5.0.0/include/tbmintrin.h
+flang/lib/clang/5.0.0/include/tgmath.h
+flang/lib/clang/5.0.0/include/tmmintrin.h
+flang/lib/clang/5.0.0/include/unwind.h
+flang/lib/clang/5.0.0/include/vadefs.h
+flang/lib/clang/5.0.0/include/varargs.h
+flang/lib/clang/5.0.0/include/vecintrin.h
+flang/lib/clang/5.0.0/include/wmmintrin.h
+flang/lib/clang/5.0.0/include/x86intrin.h
+flang/lib/clang/5.0.0/include/xmmintrin.h
+flang/lib/clang/5.0.0/include/xopintrin.h
+flang/lib/clang/5.0.0/include/xsavecintrin.h
+flang/lib/clang/5.0.0/include/xsaveintrin.h
+flang/lib/clang/5.0.0/include/xsaveoptintrin.h
+flang/lib/clang/5.0.0/include/xsavesintrin.h
+flang/lib/clang/5.0.0/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.4
-flang/lib/libclang.so.4.0
+flang/lib/libclang.so.5
+flang/lib/libclang.so.5.0
flang/lib/libclangARCMigrate.a
flang/lib/libclangAST.a
flang/lib/libclangASTMatchers.a
@@ -603,14 +628,18 @@
flang/lib/libclangStaticAnalyzerFrontend.a
flang/lib/libclangTooling.a
flang/lib/libclangToolingCore.a
+flang/lib/libclangToolingRefactor.a
flang/libexec/c++-analyzer
flang/libexec/ccc-analyzer
flang/man/man1/scan-build.1.gz
+flang/share/clang/bash-autocomplete.sh
flang/share/clang/clang-format-bbedit.applescript
flang/share/clang/clang-format-diff.py
flang/share/clang/clang-format-sublime.py
flang/share/clang/clang-format.el
flang/share/clang/clang-format.py
+flang/share/clang/clang-rename.el
+flang/share/clang/clang-rename.py
flang/share/scan-build/scanview.css
flang/share/scan-build/sorttable.js
flang/share/scan-view/FileRadar.scpt
Index: head/devel/flang/Makefile
===================================================================
--- head/devel/flang/Makefile
+++ head/devel/flang/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flang
-DISTVERSION= 4.0-20171019
+DISTVERSION= 5.0-20171019
PORTREVISION= 1
CATEGORIES= devel
@@ -12,9 +12,9 @@
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-BUILD_DEPENDS= llvm40>=0:devel/llvm40 \
+BUILD_DEPENDS= llvm50>=0:devel/llvm50 \
flang-clang>=0:devel/flang-clang
-RUN_DEPENDS= llvm40>=0:devel/llvm40 \
+RUN_DEPENDS= llvm50>=0:devel/llvm50 \
flang-clang>=0:devel/flang-clang
ONLY_FOR_ARCHS= amd64
@@ -33,11 +33,11 @@
GH_ACCOUNT= flang-compiler
GH_TAGNAME= e68c31f
-CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40 \
+CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config50 \
-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \
-DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang \
- -DFLANG_LIBOMP=${LOCALBASE}/llvm40/lib/libomp.so
+ -DFLANG_LIBOMP=${LOCALBASE}/llvm50/lib/libomp.so
CMAKE_INSTALL_PREFIX= ${PREFIX}/flang
Index: head/devel/flang/distinfo
===================================================================
--- head/devel/flang/distinfo
+++ head/devel/flang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508451863
-SHA256 (flang-compiler-flang-4.0-20171019-e68c31f_GH0.tar.gz) = 5797b5ea4f97f80428c3e918ed4579044a42a94550af5d3ab6603020ed3b9499
-SIZE (flang-compiler-flang-4.0-20171019-e68c31f_GH0.tar.gz) = 3926694
+TIMESTAMP = 1508552101
+SHA256 (flang-compiler-flang-5.0-20171019-e68c31f_GH0.tar.gz) = 5797b5ea4f97f80428c3e918ed4579044a42a94550af5d3ab6603020ed3b9499
+SIZE (flang-compiler-flang-5.0-20171019-e68c31f_GH0.tar.gz) = 3926694
Index: head/devel/flang/files/patch-runtime_flang_cdcos.c
===================================================================
--- head/devel/flang/files/patch-runtime_flang_cdcos.c
+++ head/devel/flang/files/patch-runtime_flang_cdcos.c
@@ -0,0 +1,14 @@
+--- runtime/flang/cdcos.c.orig 2017-10-23 04:19:13 UTC
++++ runtime/flang/cdcos.c
+@@ -25,9 +25,8 @@ ZMPLXFUNC_Z(__mth_i_cdcos)
+ x = cos(real) * cosh(imag);
+ y = -sin(real) * sinh(imag);
+ */
+- // x = cos(real);
+- // y = sin(real);
+- __mth_dsincos(real, &y, &x);
++ x = cos(real);
++ y = sin(real);
+ x = x * cosh(imag);
+ y = -y * sinh(imag);
+ ZRETURN_D_D(x, y);
Index: head/devel/flang/files/patch-runtime_flang_cdexp.c
===================================================================
--- head/devel/flang/files/patch-runtime_flang_cdexp.c
+++ head/devel/flang/files/patch-runtime_flang_cdexp.c
@@ -0,0 +1,12 @@
+--- runtime/flang/cdexp.c.orig 2017-10-19 11:03:03 UTC
++++ runtime/flang/cdexp.c
+@@ -24,7 +24,8 @@ ZMPLXFUNC_Z(__mth_i_cdexp)
+ ZMPLXARGS_Z;
+ double x, y, z;
+ x = exp(real);
+- __mth_dsincos(imag, &z, &y);
++ z = sin(imag);
++ y = cos(imag);
+ y *= x;
+ z *= x;
+ ZRETURN_D_D(y, z); /* should leave y & z in appropriate
Index: head/devel/flang/files/patch-runtime_flang_cexp.c
===================================================================
--- head/devel/flang/files/patch-runtime_flang_cexp.c
+++ head/devel/flang/files/patch-runtime_flang_cexp.c
@@ -0,0 +1,12 @@
+--- runtime/flang/cexp.c.orig 2017-10-19 11:03:03 UTC
++++ runtime/flang/cexp.c
+@@ -22,7 +22,8 @@ CMPLXFUNC_C(__mth_i_cexp)
+ CMPLXARGS_C;
+ float x, y, z;
+ x = EXPF(real);
+- __mth_sincos(imag, &z, &y);
++ z = sinf(imag);
++ y = cosf(imag);
+ y *= x;
+ z *= x;
+ CRETURN_F_F(y, z); /* should leave y & z in appropriate
Index: head/devel/flang/files/patch-runtime_include_mthdecls.h
===================================================================
--- head/devel/flang/files/patch-runtime_include_mthdecls.h
+++ head/devel/flang/files/patch-runtime_include_mthdecls.h
@@ -0,0 +1,29 @@
+--- runtime/include/mthdecls.h.orig 2017-10-19 11:03:03 UTC
++++ runtime/include/mthdecls.h
+@@ -536,19 +536,6 @@ double __mth_i_dbessel_y1(double arg);
+ double __mth_i_dbessel_yn(int n, double arg);
+ double __f90_dbessel_yn(int n1, int n, double d);
+
+-#if ! defined (TARGET_X8664) && ! defined(LINUX8664)
+-/*
+- * See explanation below for rationale behind the two flavors of __mth_sincos.
+- */
+-static inline void __mth_sincos(float angle, float *s, float *c)
+- __attribute__((always_inline));
+-static inline void __mth_dsincos(double angle, double *s, double *c)
+- __attribute__((always_inline));
+-#else /* ! defined (TARGET_X8664) && ! defined(LINUX8664) */
+-void __mth_sincos(float, float *, float *);
+-void __mth_dsincos(double, double *, double *);
+-#endif /* ! defined (TARGET_X8664) && ! defined(LINUX8664) */
+-
+ FLTDECL_C(__mth_i_cabs);
+ CMPLXDECL_C(__mth_i_cacos);
+ CMPLXDECL_C(__mth_i_casin);
+@@ -657,6 +644,3 @@ extern complex double ctan(complex double);
+ * have a version of __mth_sincos, even if it is not external available
+ * during the build process.
+ */
+-
+-#define __mth_sincos(_a,_s,_c) sincosf(_a,_s,_c)
+-#define __mth_dsincos(_a,_s,_c) sincos(_a,_s,_c)

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 24, 11:09 PM (9 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24148858
Default Alt Text
D12735.diff (21 KB)

Event Timeline