Index: head/devel/llvm90/Makefile =================================================================== --- head/devel/llvm90/Makefile (revision 514193) +++ head/devel/llvm90/Makefile (revision 514194) @@ -1,601 +1,602 @@ # $FreeBSD$ PORTNAME= llvm DISTVERSION= 9.0.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang .if ${DISTVERSION:M*rc*} -MASTER_SITES= http://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR} +MASTER_SITES= https://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR} .else -MASTER_SITES= http://releases.llvm.org/${LLVM_RELEASE}/ +MASTER_SITES= https://releases.llvm.org/${LLVM_RELEASE}/ .endif PKGNAMESUFFIX= ${LLVM_SUFFIX} DISTNAME= ${PORTNAME}-${DISTVERSION}.src DISTFILES= ${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX} MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE+= LLVM2 LICENSE_FILE_LLVM2= ${WRKSRC}/LICENSE.TXT LICENSE_NAME_LLVM2= Apache License 2.0 with LLVM Exceptions LICENSE_PERMS_LLVM2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE:= ${LICENSE:NARM} LLVM_RELEASE= ${DISTVERSION:C/rc.*//} LLVM_MAJOR= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]$//:C/\.//} RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} USES= cmake compiler:c++11-lib libedit perl5 tar:xz \ shebangfix _USES_PYTHON?= python:3.6+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ tools/opt-viewer/optrecord.py \ tools/opt-viewer/opt-diff.py \ tools/opt-viewer/opt-stats.py \ tools/opt-viewer/opt-viewer.py SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON CMAKE_ARGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} # Following commit https://github.com/kitware/cmake/commit/956054 # we need to either change the whole man-shuffle below, or simply # redefine CMAKE_INSTALL_MANDIR CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \ -DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}${PYTHON_ABIVER}.so # Disable assertions. They should be disabled by cmake, but USES=cmake # overrides -DCMAKE_*_FLAGS_RELEASE. CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG OPTIONS_DEFINE= BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFINE_powerpc64= OPENMP OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP OPTIONS_DEFAULT_powerpc64= OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes BE_AMDGPU_DESC= AMD GPU backend (required by mesa) BE_FREEBSD_DESC= Backends for FreeBSD architectures BE_FREEBSD_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}" BE_NATIVE_DESC= Backend(s) for this architecture (${_NATIVE_BACKENDS}) BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends .for BE in FREEBSD NATIVE STANDARD BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|} .endfor CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang CLANG_DISTFILES= cfe-${DISTVERSION}.src${EXTRACT_SUFX} CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp CLANG_PORTDOCS= clang CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= commonmark-cmark-* DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ -DLLVM_BUILD_DOCS=ON DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} EXTRAS_DESC= Extra clang tools EXTRAS_EXTRA_PATCHES= ${PATCHDIR}/extras EXTRAS_IMPLIES= CLANG EXTRAS_DISTFILES= clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX} 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 LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:3.6+ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} +LLD_EXTRA_PATCHES= ${PATCHDIR}/lld LLD_LINK_DESC= Link ld.lld as ld to clang uses it LLD_LINK_IMPLIES= LLD LLDB_BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PY_ENUM34} LLDB_DESC= Install lldb, the LLVM debugger LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb LLDB_IMPLIES= CLANG LLDB_PORTDOCS= lldb LLDB_VARS= _USES_PYTHON=python:3.6+ OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG PYCLANG_VARS= _USES_PYTHON=python:3.6+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} .if defined(WITH_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP WRKSRC_${option:tl}= ${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//} .endfor PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} \ LLVM_SUFFIX=${LLVM_SUFFIX} \ LLVM_MAJOR=${LLVM_MAJOR} COMMANDS= ${LLVM_COMMANDS} FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} MAN1SRCS+= bugpoint.1 \ dsymutil.1 \ llc.1 \ lli.1 \ llvm-addr2line.1 \ llvm-ar.1 \ llvm-as.1 \ llvm-bcanalyzer.1 \ llvm-build.1 \ llvm-config.1 \ llvm-cov.1 \ llvm-cxxfilt.1 \ llvm-cxxmap.1 \ llvm-diff.1 \ llvm-dis.1 \ llvm-dwarfdump.1 \ llvm-exegesis.1 \ llvm-extract.1 \ llvm-lib.1 \ llvm-lipo.1 \ llvm-link.1 \ llvm-mca.1 \ llvm-nm.1 \ llvm-objcopy.1 \ llvm-objdump.1 \ llvm-pdbutil.1 \ llvm-profdata.1 \ llvm-ranlib.1 \ llvm-readelf.1 \ llvm-readobj.1 \ llvm-size.1 \ llvm-stress.1 \ llvm-strings.1 \ llvm-strip.1 \ llvm-symbolizer.1 \ opt.1 \ tblgen.1 STRIP_LIBS= BugpointPasses.so \ LLVMHello.so \ ${LIBNAME}.0 \ libLTO.so EXTRAS_LIBS= libclangApplyReplacements \ libclangChangeNamespace \ libclangDaemon \ libclangDoc \ libclangIncludeFixer \ libclangMove \ libclangQuery \ libclangRename \ libclangReorderFields \ libclangTidy \ libclangTidyGoogleModule \ libclangTidyLLVMModule \ libclangTidyMiscModule \ libclangTidyReadabilityModule \ libclangTidyUtils \ libfindAllSymbols \ libmodernizeCore EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g} .include # 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. # arm (for armv4 and armv5 CPUs) always uses the soft float ABI. # For all other targets, we stick with 'unknown'. .if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") TARGET_ABI= -gnueabihf .elif ${ARCH:Marm*} TARGET_ABI= -gnueabi .else TARGET_ABI= .endif CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI} # ----------- end of sync block -------------------- .if ${PORT_OPTIONS:MCLANG} COMMANDS+= ${CLANG_COMMANDS} MAN1SRCS+= clang.1 \ diagtool.1 \ scan-build.1 CLANG_PATTERN= (c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer) SHEBANG_FILES+= tools/clang/tools/scan-view/bin/scan-view \ tools/clang/tools/clang-format/clang-format-diff.py \ tools/clang/tools/clang-format/git-clang-format \ tools/clang/utils/hmaptool/hmaptool USES+= gnome .endif .if ${PORT_OPTIONS:MCOMPILER_RT} COMPILER_RT_PATTERN= (_blacklist.txt|sanitizer|include.xray) .endif .if ${PORT_OPTIONS:MEXTRAS} COMMANDS+= ${EXTRAS_COMMANDS} MAN1SRCS+= extraclangtools.1 PORTDOCS+= clang-tools SHEBANG_FILES+= tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \ tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \ tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py .endif .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= lit.1 FileCheck.1 .endif .if ${PORT_OPTIONS:MLLD} COMMANDS+= ${LLD_COMMANDS} PORTDOCS+= lld .endif .if ${PORT_OPTIONS:MLLDB} COMMANDS+= ${LLDB_COMMANDS} .endif .if ${PORT_OPTIONS:MPYCLANG} PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$ .endif .include .include "${.CURDIR}/Makefile.COMMANDS" _FREEBSD_BACKENDS= AArch64 ARM Mips PowerPC RISCV Sparc X86 FREEBSD_BACKENDS= ${_FREEBSD_BACKENDS} .if ${ARCH} == amd64 _NATIVE_BACKENDS= X86 .elif ${ARCH} == arm64 _NATIVE_BACKENDS= AAarch64 .elif ${ARCH:Marmv*} _NATIVE_BACKENDS= ARM .elif ${ARCH} == i386 _NATIVE_BACKENDS= X86 .elif ${ARCH:Mmips*} _NATIVE_BACKENDS= Mips .elif ${ARCH:Mpowerpc*} _NATIVE_BACKENDS= PowerPC .elif ${ARCH:Mriscv*} _NATIVE_BACKENDS= RISCV .endif NATIVE_BACKENDS= ${_NATIVE_BACKENDS} .if ${PORT_OPTIONS:MBE_AMDGPU} FREEBSD_BACKENDS+= AMDGPU NATIVE_BACKENDS+= AMDGPU .endif STANDARD_BACKENDS= ${_FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \ NVPTX SystemZ WebAssembly XCore _BE_LIBS_COMMON= CodeGen Desc Info _BE_LIBS_AArch64= AsmParser Disassembler Utils _BE_LIBS_AMDGPU= AsmParser Disassembler Utils _BE_LIBS_ARM= AsmParser Disassembler Utils _BE_LIBS_BPF= AsmParser Disassembler _BE_LIBS_Hexagon= AsmParser Disassembler _BE_LIBS_Lanai= AsmParser Disassembler _BE_LIBS_MSP430= AsmParser Disassembler _BE_LIBS_Mips= AsmParser Disassembler _BE_LIBS_PowerPC= AsmParser Disassembler _BE_LIBS_RISCV= AsmParser Disassembler Utils _BE_LIBS_Sparc= AsmParser Disassembler _BE_LIBS_SystemZ= AsmParser Disassembler _BE_LIBS_WebAssembly= AsmParser Disassembler _BE_LIBS_X86= AsmParser Disassembler Utils _BE_LIBS_XCore= Disassembler .for BE in FREEBSD NATIVE STANDARD .for BE_ARCH in ${${BE}_BACKENDS} _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ ${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/} .endfor .endfor BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} _CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd _CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt _COMPILER_RT_BLACKLISTS+= msan_blacklist.txt _COMPILER_RT_LIBS= \ libclang_rt.asan-preinit-x86_64.a \ libclang_rt.asan-x86_64.a \ libclang_rt.asan-x86_64.a.syms \ libclang_rt.asan-x86_64.so \ libclang_rt.asan_cxx-x86_64.a \ libclang_rt.asan_cxx-x86_64.a.syms \ libclang_rt.builtins-x86_64.a \ libclang_rt.cfi-x86_64.a \ libclang_rt.cfi_diag-x86_64.a \ libclang_rt.dd-x86_64.a \ libclang_rt.dyndd-x86_64.so \ libclang_rt.fuzzer-x86_64.a \ libclang_rt.fuzzer_no_main-x86_64.a \ libclang_rt.msan-x86_64.a \ libclang_rt.msan-x86_64.a.syms \ libclang_rt.msan_cxx-x86_64.a \ libclang_rt.msan_cxx-x86_64.a.syms \ libclang_rt.profile-x86_64.a \ libclang_rt.safestack-x86_64.a \ libclang_rt.stats-x86_64.a \ libclang_rt.stats_client-x86_64.a \ libclang_rt.tsan-x86_64.a \ libclang_rt.tsan-x86_64.a.syms \ libclang_rt.tsan_cxx-x86_64.a \ libclang_rt.tsan_cxx-x86_64.a.syms \ libclang_rt.ubsan_minimal-x86_64.a \ libclang_rt.ubsan_minimal-x86_64.a.syms \ libclang_rt.ubsan_minimal-x86_64.so \ libclang_rt.ubsan_standalone-x86_64.a \ libclang_rt.ubsan_standalone-x86_64.a.syms \ libclang_rt.ubsan_standalone-x86_64.so \ libclang_rt.ubsan_standalone_cxx-x86_64.a \ libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \ libclang_rt.xray-basic-x86_64.a \ libclang_rt.xray-fdr-x86_64.a \ libclang_rt.xray-profiling-x86_64.a \ libclang_rt.xray-x86_64.a .endif .if ${ARCH} == "i386" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt _COMPILER_RT_LIBS+= \ libclang_rt.asan-i386.a \ libclang_rt.asan-i386.so \ libclang_rt.asan-preinit-i386.a \ libclang_rt.asan_cxx-i386.a \ libclang_rt.builtins-i386.a \ libclang_rt.cfi-i386.a \ libclang_rt.cfi_diag-i386.a \ libclang_rt.profile-i386.a \ libclang_rt.safestack-i386.a \ libclang_rt.stats-i386.a \ libclang_rt.stats_client-i386.a \ libclang_rt.ubsan_minimal-i386.a \ libclang_rt.ubsan_minimal-i386.so \ libclang_rt.ubsan_standalone-i386.a \ libclang_rt.ubsan_standalone-i386.so \ libclang_rt.ubsan_standalone_cxx-i386.a .endif # Use lld for armv6 on clang 7 and up to avoid binutils ld issues # PR: 235282 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70 LDFLAGS_armv6=-fuse-ld=lld .endif .if ${ARCH} == "armv6" BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .if ! ${OPTIONS_DEFINE:MCOMPILER_RT} # Hack to disable COMPILER_RT in plist of unsupported architectures PLIST_SUB+= COMPILER_RT="@comment " .else .endif .if ! ${OPTIONS_DEFINE:MGOLD} # Hack to disable GOLD in plist of unsupported architectures PLIST_SUB+= GOLD="@comment " .else .endif .if ! ${OPTIONS_DEFINE:MOPENMP} # Hack to disable OPENMP in plist of unsupported architectures PLIST_SUB+= OPENMP="@comment " .else .endif post-extract-CLANG-on: ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang post-extract-EXTRAS-on: ${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra post-extract-LLD-on: ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld post-extract-LLDB-on: ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb post-extract-OPENMP-on: ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \ ${WRKSRC}/utils/lit/lit/formats/*.py ${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \ ${WRKSRC}/CMakeLists.txt post-patch-CLANG-on: ${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \ ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp ${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build cd ${WRKDIR}/compiler-rt-build && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \ ${WRKSRC_compiler_rt} && \ ${MAKE_ENV} ${MAKE_CMD} post-install: ${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*} ${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \ ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX} .endfor post-install-DOCS-on: ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR} .for _man in ${MAN1SRCS} ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \ ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1 .endfor .if ! ${PORT_OPTIONS:MLIT} ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1 ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1 .endif ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ .if ${PORT_OPTIONS:MCLANG} post-install-DOCS-off: ${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1 ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ .endif post-install-LLD-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/llvm/BinaryFormat/WasmRelocs post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \ ${STAGEDIR}${LLVM_PREFIX}/bin/ post-install-COMPILER_RT-on: cd ${WRKDIR}/compiler-rt-build && \ ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} .if ${ARCH} == "amd64" ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386* .endif ${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} ${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/* \ ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd post-install-LIT-on: ${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \ ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX} ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/builtin_commands/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \ ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX} post-install-LLD_LINK-on: ${LN} -s ld.lld ${STAGEDIR}${LOCALBASE}/llvm${LLVM_SUFFIX}/bin/ld TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)' do-test: if [ `${ID} -u` = 0 ]; then \ ${CHOWN} -R nobody ${WRKSRC}/test; \ su -m nobody -c ${TEST_CMD}; \ else \ ${SH} -c ${TEST_CMD}; \ fi build-plist: ${RM} ${PLIST} ${PLIST}.tmp ${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp ${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp .for command in ${COMMANDS} ${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp .endfor .for command in ${LIT_COMMANDS} ${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ ${GREP} -v '_blacklist.txt$$' | \ ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \ -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \ -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \ -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \ | ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \ -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \ -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \ | ${SORT} >> ${PLIST}.tmp ${AWK} '{ \ if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(omp.h|ompt.h|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \ if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ if ($$0 ~ /(lld|wasm-ld)/ && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(bin\/ld$$)/) {printf "%%%%LLD_LINK%%%%"} \ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \ if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \ if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \ if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST} ${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} ${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} ${RM} ${PLIST}.tmp check-commands: .for command in ${COMMANDS} test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command} .endfor .include Index: head/devel/llvm90/files/clang/patch-freebsd-r352030 =================================================================== --- head/devel/llvm90/files/clang/patch-freebsd-r352030 (nonexistent) +++ head/devel/llvm90/files/clang/patch-freebsd-r352030 (revision 514194) @@ -0,0 +1,36 @@ +commit 5f6a983e7fba98335e2863fe31305e895545ebb2 +Author: dim +Date: Sun Sep 8 10:31:34 2019 +0000 + + Target i586 by default on the i386 architecture, since after upstream's + change https://reviews.llvm.org/rL356631 ("[X86] Add CMPXCHG8B feature + flag. Set it for all CPUs except i386/i486 including 'generic'. Disable + use of CMPXCHG8B when this flag isn't set"), clang now correctly emits + calls to __atomic_load_8, __atomic_store_8, etc. when targeting i486, + and this means we can no longer link most modern programs, because we do + not have a libatomic, nor support for atomic functions in libc. See + also PR 230888, 220822, 233725, 234976, and more probably duplicates. + + Note that in practice, clang has been incorrectly generating cmpxchg8b + instructions for years now, when targeting i486. So de facto nothing + really changes by doing this. + +Notes: + svn path=/projects/clang900-import/; revision=352030 + +diff --git tools/clang/lib/Driver/ToolChains/Arch/X86.cpp tools/clang/lib/Driver/ToolChains/Arch/X86.cpp +index 34be226b69e9..9a5c0aa28c7f 100644 +--- tools/clang/lib/Driver/ToolChains/Arch/X86.cpp ++++ tools/clang/lib/Driver/ToolChains/Arch/X86.cpp +@@ -93,10 +93,10 @@ const char *x86::getX86TargetCPU(const ArgList &Args, + return "x86-64"; + + switch (Triple.getOS()) { +- case llvm::Triple::FreeBSD: + case llvm::Triple::NetBSD: + case llvm::Triple::OpenBSD: + return "i486"; ++ case llvm::Triple::FreeBSD: + case llvm::Triple::Haiku: + return "i586"; + default: Property changes on: head/devel/llvm90/files/clang/patch-freebsd-r352030 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/llvm90/files/clang/patch-freebsd-r352539 =================================================================== --- head/devel/llvm90/files/clang/patch-freebsd-r352539 (nonexistent) +++ head/devel/llvm90/files/clang/patch-freebsd-r352539 (revision 514194) @@ -0,0 +1,102 @@ +commit 053368e30489fc77ab06ee7954df3719af2548c2 +Author: dim +Date: Thu Sep 19 19:42:59 2019 +0000 + + Pull in r371066 from upstream clang trunk (by Justin Hibbits): + + Add -m(no)-spe to clang + + Summary: + r337347 added support for the Signal Processing Engine (SPE) to LLVM. + This follows that up with the clang side. + + This adds -mspe and -mno-spe, to match GCC. + + Subscribers: nemanjai, kbarton, cfe-commits + + Differential Revision: https://reviews.llvm.org/D49754 + +Notes: + svn path=/projects/clang900-import/; revision=352539 + +diff --git tools/clang/include/clang/Driver/Options.td tools/clang/include/clang/Driver/Options.td +index 4ea8bfff0973..508d046dbb91 100644 +--- tools/clang/include/clang/Driver/Options.td ++++ tools/clang/include/clang/Driver/Options.td +@@ -2241,6 +2241,8 @@ def faltivec : Flag<["-"], "faltivec">, Group, Flags<[DriverOption]>; + def fno_altivec : Flag<["-"], "fno-altivec">, Group, Flags<[DriverOption]>; + def maltivec : Flag<["-"], "maltivec">, Group; + def mno_altivec : Flag<["-"], "mno-altivec">, Group; ++def mspe : Flag<["-"], "mspe">, Group; ++def mno_spe : Flag<["-"], "mno-spe">, Group; + def mvsx : Flag<["-"], "mvsx">, Group; + def mno_vsx : Flag<["-"], "mno-vsx">, Group; + def msecure_plt : Flag<["-"], "msecure-plt">, Group; +diff --git tools/clang/lib/Basic/Targets/PPC.cpp tools/clang/lib/Basic/Targets/PPC.cpp +index 2a773d999286..a40991048873 100644 +--- tools/clang/lib/Basic/Targets/PPC.cpp ++++ tools/clang/lib/Basic/Targets/PPC.cpp +@@ -54,6 +54,10 @@ bool PPCTargetInfo::handleTargetFeatures(std::vector &Features, + HasFloat128 = true; + } else if (Feature == "+power9-vector") { + HasP9Vector = true; ++ } else if (Feature == "+spe") { ++ HasSPE = true; ++ LongDoubleWidth = LongDoubleAlign = 64; ++ LongDoubleFormat = &llvm::APFloat::IEEEdouble(); + } else if (Feature == "-hard-float") { + FloatABI = SoftFloat; + } +@@ -165,6 +169,10 @@ void PPCTargetInfo::getTargetDefines(const LangOptions &Opts, + Builder.defineMacro("__VEC__", "10206"); + Builder.defineMacro("__ALTIVEC__"); + } ++ if (HasSPE) { ++ Builder.defineMacro("__SPE__"); ++ Builder.defineMacro("__NO_FPRS__"); ++ } + if (HasVSX) + Builder.defineMacro("__VSX__"); + if (HasP8Vector) +@@ -203,7 +211,6 @@ void PPCTargetInfo::getTargetDefines(const LangOptions &Opts, + // __CMODEL_LARGE__ + // _CALL_SYSV + // _CALL_DARWIN +- // __NO_FPRS__ + } + + // Handle explicit options being passed to the compiler here: if we've +@@ -332,6 +339,7 @@ bool PPCTargetInfo::hasFeature(StringRef Feature) const { + .Case("extdiv", HasExtDiv) + .Case("float128", HasFloat128) + .Case("power9-vector", HasP9Vector) ++ .Case("spe", HasSPE) + .Default(false); + } + +diff --git tools/clang/lib/Basic/Targets/PPC.h tools/clang/lib/Basic/Targets/PPC.h +index 6e5df097921b..6c6421c28e23 100644 +--- tools/clang/lib/Basic/Targets/PPC.h ++++ tools/clang/lib/Basic/Targets/PPC.h +@@ -66,6 +66,7 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetInfo : public TargetInfo { + bool HasBPERMD = false; + bool HasExtDiv = false; + bool HasP9Vector = false; ++ bool HasSPE = false; + + protected: + std::string ABI; +diff --git tools/clang/lib/CodeGen/TargetInfo.cpp tools/clang/lib/CodeGen/TargetInfo.cpp +index 1e1038dbfe95..81f40011f11c 100644 +--- tools/clang/lib/CodeGen/TargetInfo.cpp ++++ tools/clang/lib/CodeGen/TargetInfo.cpp +@@ -9716,7 +9716,8 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() { + + case llvm::Triple::ppc: + return SetCGInfo( +- new PPC32TargetCodeGenInfo(Types, CodeGenOpts.FloatABI == "soft")); ++ new PPC32TargetCodeGenInfo(Types, CodeGenOpts.FloatABI == "soft" || ++ getTarget().hasFeature("spe"))); + case llvm::Triple::ppc64: + if (Triple.isOSBinFormatELF()) { + PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv1; Property changes on: head/devel/llvm90/files/clang/patch-freebsd-r352539 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/llvm90/files/clang/patch-freebsd-r352586 =================================================================== --- head/devel/llvm90/files/clang/patch-freebsd-r352586 (nonexistent) +++ head/devel/llvm90/files/clang/patch-freebsd-r352586 (revision 514194) @@ -0,0 +1,300 @@ +commit 96f7d6cb2727d1d08e1e460f6606a2a11673b292 +Author: dim +Date: Sat Sep 21 21:01:38 2019 +0000 + + Pull in r371557 from upstream clang trunk (by Richard Smith): + + When evaluating a __builtin_constant_p conditional, always enter + constant-folding mode regardless of the original evaluation mode. + + In order for this to be correct, we need to track whether we're + checking for a potential constant expression or checking for + undefined behavior separately from the evaluation mode enum, since we + don't want to clobber those states when entering constant-folding + mode. + + This should fix "ld: error: undefined symbol: ix86_isa_flags" (and many + other symbol names) during the initial stages of the lang/gcc* ports. + + The issue was that without optimization, the __builtin_constant_p() + expressions generated in gencondmd.c would emit references to global + variables that were undefined, such as ix86_isa_flags. + + PR: 240629 + +Notes: + svn path=/projects/clang900-import/; revision=352586 + +diff --git tools/clang/lib/AST/ExprConstant.cpp tools/clang/lib/AST/ExprConstant.cpp +index f01b42e7ff76..26163c6143e6 100644 +--- tools/clang/lib/AST/ExprConstant.cpp ++++ tools/clang/lib/AST/ExprConstant.cpp +@@ -794,58 +794,47 @@ namespace { + /// constant value. + bool InConstantContext; + ++ /// Whether we're checking that an expression is a potential constant ++ /// expression. If so, do not fail on constructs that could become constant ++ /// later on (such as a use of an undefined global). ++ bool CheckingPotentialConstantExpression = false; ++ ++ /// Whether we're checking for an expression that has undefined behavior. ++ /// If so, we will produce warnings if we encounter an operation that is ++ /// always undefined. ++ bool CheckingForUndefinedBehavior = false; ++ + enum EvaluationMode { + /// Evaluate as a constant expression. Stop if we find that the expression + /// is not a constant expression. + EM_ConstantExpression, + +- /// Evaluate as a potential constant expression. Keep going if we hit a +- /// construct that we can't evaluate yet (because we don't yet know the +- /// value of something) but stop if we hit something that could never be +- /// a constant expression. +- EM_PotentialConstantExpression, ++ /// Evaluate as a constant expression. Stop if we find that the expression ++ /// is not a constant expression. Some expressions can be retried in the ++ /// optimizer if we don't constant fold them here, but in an unevaluated ++ /// context we try to fold them immediately since the optimizer never ++ /// gets a chance to look at it. ++ EM_ConstantExpressionUnevaluated, + + /// Fold the expression to a constant. Stop if we hit a side-effect that + /// we can't model. + EM_ConstantFold, + +- /// Evaluate the expression looking for integer overflow and similar +- /// issues. Don't worry about side-effects, and try to visit all +- /// subexpressions. +- EM_EvaluateForOverflow, +- + /// Evaluate in any way we know how. Don't worry about side-effects that + /// can't be modeled. + EM_IgnoreSideEffects, +- +- /// Evaluate as a constant expression. Stop if we find that the expression +- /// is not a constant expression. Some expressions can be retried in the +- /// optimizer if we don't constant fold them here, but in an unevaluated +- /// context we try to fold them immediately since the optimizer never +- /// gets a chance to look at it. +- EM_ConstantExpressionUnevaluated, +- +- /// Evaluate as a potential constant expression. Keep going if we hit a +- /// construct that we can't evaluate yet (because we don't yet know the +- /// value of something) but stop if we hit something that could never be +- /// a constant expression. Some expressions can be retried in the +- /// optimizer if we don't constant fold them here, but in an unevaluated +- /// context we try to fold them immediately since the optimizer never +- /// gets a chance to look at it. +- EM_PotentialConstantExpressionUnevaluated, + } EvalMode; + + /// Are we checking whether the expression is a potential constant + /// expression? + bool checkingPotentialConstantExpression() const { +- return EvalMode == EM_PotentialConstantExpression || +- EvalMode == EM_PotentialConstantExpressionUnevaluated; ++ return CheckingPotentialConstantExpression; + } + + /// Are we checking an expression for overflow? + // FIXME: We should check for any kind of undefined or suspicious behavior + // in such constructs, not just overflow. +- bool checkingForOverflow() { return EvalMode == EM_EvaluateForOverflow; } ++ bool checkingForUndefinedBehavior() { return CheckingForUndefinedBehavior; } + + EvalInfo(const ASTContext &C, Expr::EvalStatus &S, EvaluationMode Mode) + : Ctx(const_cast(C)), EvalStatus(S), CurrentCall(nullptr), +@@ -932,15 +921,12 @@ namespace { + switch (EvalMode) { + case EM_ConstantFold: + case EM_IgnoreSideEffects: +- case EM_EvaluateForOverflow: + if (!HasFoldFailureDiagnostic) + break; + // We've already failed to fold something. Keep that diagnostic. + LLVM_FALLTHROUGH; + case EM_ConstantExpression: +- case EM_PotentialConstantExpression: + case EM_ConstantExpressionUnevaluated: +- case EM_PotentialConstantExpressionUnevaluated: + HasActiveDiagnostic = false; + return OptionalDiagnostic(); + } +@@ -986,8 +972,8 @@ namespace { + /// Diagnose that the evaluation does not produce a C++11 core constant + /// expression. + /// +- /// FIXME: Stop evaluating if we're in EM_ConstantExpression or +- /// EM_PotentialConstantExpression mode and we produce one of these. ++ /// FIXME: Stop evaluating if we're in EM_ConstantExpression mode ++ /// and we produce one of these. + OptionalDiagnostic CCEDiag(SourceLocation Loc, diag::kind DiagId + = diag::note_invalid_subexpr_in_const_expr, + unsigned ExtraNotes = 0) { +@@ -1023,16 +1009,16 @@ namespace { + /// couldn't model? + bool keepEvaluatingAfterSideEffect() { + switch (EvalMode) { +- case EM_PotentialConstantExpression: +- case EM_PotentialConstantExpressionUnevaluated: +- case EM_EvaluateForOverflow: + case EM_IgnoreSideEffects: + return true; + + case EM_ConstantExpression: + case EM_ConstantExpressionUnevaluated: + case EM_ConstantFold: +- return false; ++ // By default, assume any side effect might be valid in some other ++ // evaluation of this expression from a different context. ++ return checkingPotentialConstantExpression() || ++ checkingForUndefinedBehavior(); + } + llvm_unreachable("Missed EvalMode case"); + } +@@ -1047,16 +1033,13 @@ namespace { + /// Should we continue evaluation after encountering undefined behavior? + bool keepEvaluatingAfterUndefinedBehavior() { + switch (EvalMode) { +- case EM_EvaluateForOverflow: + case EM_IgnoreSideEffects: + case EM_ConstantFold: + return true; + +- case EM_PotentialConstantExpression: +- case EM_PotentialConstantExpressionUnevaluated: + case EM_ConstantExpression: + case EM_ConstantExpressionUnevaluated: +- return false; ++ return checkingForUndefinedBehavior(); + } + llvm_unreachable("Missed EvalMode case"); + } +@@ -1076,16 +1059,12 @@ namespace { + return false; + + switch (EvalMode) { +- case EM_PotentialConstantExpression: +- case EM_PotentialConstantExpressionUnevaluated: +- case EM_EvaluateForOverflow: +- return true; +- + case EM_ConstantExpression: + case EM_ConstantExpressionUnevaluated: + case EM_ConstantFold: + case EM_IgnoreSideEffects: +- return false; ++ return checkingPotentialConstantExpression() || ++ checkingForUndefinedBehavior(); + } + llvm_unreachable("Missed EvalMode case"); + } +@@ -1142,9 +1121,7 @@ namespace { + Info.EvalStatus.Diag->empty() && + !Info.EvalStatus.HasSideEffects), + OldMode(Info.EvalMode) { +- if (Enabled && +- (Info.EvalMode == EvalInfo::EM_ConstantExpression || +- Info.EvalMode == EvalInfo::EM_ConstantExpressionUnevaluated)) ++ if (Enabled) + Info.EvalMode = EvalInfo::EM_ConstantFold; + } + void keepDiagnostics() { Enabled = false; } +@@ -1163,8 +1140,7 @@ namespace { + EvalInfo::EvaluationMode OldMode; + explicit IgnoreSideEffectsRAII(EvalInfo &Info) + : Info(Info), OldMode(Info.EvalMode) { +- if (!Info.checkingPotentialConstantExpression()) +- Info.EvalMode = EvalInfo::EM_IgnoreSideEffects; ++ Info.EvalMode = EvalInfo::EM_IgnoreSideEffects; + } + + ~IgnoreSideEffectsRAII() { Info.EvalMode = OldMode; } +@@ -2323,7 +2299,7 @@ static bool CheckedIntArithmetic(EvalInfo &Info, const Expr *E, + APSInt Value(Op(LHS.extend(BitWidth), RHS.extend(BitWidth)), false); + Result = Value.trunc(LHS.getBitWidth()); + if (Result.extend(BitWidth) != Value) { +- if (Info.checkingForOverflow()) ++ if (Info.checkingForUndefinedBehavior()) + Info.Ctx.getDiagnostics().Report(E->getExprLoc(), + diag::warn_integer_constant_overflow) + << Result.toString(10) << E->getType(); +@@ -6047,6 +6023,8 @@ class ExprEvaluatorBase + + // Always assume __builtin_constant_p(...) ? ... : ... is a potential + // constant expression; we can't check whether it's potentially foldable. ++ // FIXME: We should instead treat __builtin_constant_p as non-constant if ++ // it would return 'false' in this mode. + if (Info.checkingPotentialConstantExpression() && IsBcpCall) + return false; + +@@ -6329,7 +6307,7 @@ class ExprEvaluatorBase + bool VisitStmtExpr(const StmtExpr *E) { + // We will have checked the full-expressions inside the statement expression + // when they were completed, and don't need to check them again now. +- if (Info.checkingForOverflow()) ++ if (Info.checkingForUndefinedBehavior()) + return Error(E); + + BlockScopeRAII Scope(Info); +@@ -9499,14 +9477,11 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E, + // size of the referenced object. + switch (Info.EvalMode) { + case EvalInfo::EM_ConstantExpression: +- case EvalInfo::EM_PotentialConstantExpression: + case EvalInfo::EM_ConstantFold: +- case EvalInfo::EM_EvaluateForOverflow: + case EvalInfo::EM_IgnoreSideEffects: + // Leave it to IR generation. + return Error(E); + case EvalInfo::EM_ConstantExpressionUnevaluated: +- case EvalInfo::EM_PotentialConstantExpressionUnevaluated: + // Reduce it to a constant now. + return Success((Type & 2) ? 0 : -1, E); + } +@@ -12546,8 +12521,9 @@ APSInt Expr::EvaluateKnownConstIntCheckOverflow( + + EvalResult EVResult; + EVResult.Diag = Diag; +- EvalInfo Info(Ctx, EVResult, EvalInfo::EM_EvaluateForOverflow); ++ EvalInfo Info(Ctx, EVResult, EvalInfo::EM_IgnoreSideEffects); + Info.InConstantContext = true; ++ Info.CheckingForUndefinedBehavior = true; + + bool Result = ::EvaluateAsRValue(Info, this, EVResult.Val); + (void)Result; +@@ -12564,7 +12540,8 @@ void Expr::EvaluateForOverflow(const ASTContext &Ctx) const { + bool IsConst; + EvalResult EVResult; + if (!FastEvaluateAsRValue(this, EVResult, Ctx, IsConst)) { +- EvalInfo Info(Ctx, EVResult, EvalInfo::EM_EvaluateForOverflow); ++ EvalInfo Info(Ctx, EVResult, EvalInfo::EM_IgnoreSideEffects); ++ Info.CheckingForUndefinedBehavior = true; + (void)::EvaluateAsRValue(Info, this, EVResult.Val); + } + } +@@ -13178,9 +13155,9 @@ bool Expr::isPotentialConstantExpr(const FunctionDecl *FD, + Expr::EvalStatus Status; + Status.Diag = &Diags; + +- EvalInfo Info(FD->getASTContext(), Status, +- EvalInfo::EM_PotentialConstantExpression); ++ EvalInfo Info(FD->getASTContext(), Status, EvalInfo::EM_ConstantExpression); + Info.InConstantContext = true; ++ Info.CheckingPotentialConstantExpression = true; + + const CXXMethodDecl *MD = dyn_cast(FD); + const CXXRecordDecl *RD = MD ? MD->getParent()->getCanonicalDecl() : nullptr; +@@ -13219,8 +13196,9 @@ bool Expr::isPotentialConstantExprUnevaluated(Expr *E, + Status.Diag = &Diags; + + EvalInfo Info(FD->getASTContext(), Status, +- EvalInfo::EM_PotentialConstantExpressionUnevaluated); ++ EvalInfo::EM_ConstantExpressionUnevaluated); + Info.InConstantContext = true; ++ Info.CheckingPotentialConstantExpression = true; + + // Fabricate a call stack frame to give the arguments a plausible cover story. + ArrayRef Args; Property changes on: head/devel/llvm90/files/clang/patch-freebsd-r352586 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/llvm90/files/lld/patch-freebsd-r352600 =================================================================== --- head/devel/llvm90/files/lld/patch-freebsd-r352600 (nonexistent) +++ head/devel/llvm90/files/lld/patch-freebsd-r352600 (revision 514194) @@ -0,0 +1,54 @@ +commit 2dfd6210dcc3782d0f298b7bb996cc313d53c3a6 +Author: dim +Date: Sun Sep 22 17:31:27 2019 +0000 + + Pull in r372513 from upstream lld trunk (by Simon Atanasyan): + + [mips] Deduce MIPS specific ELF header flags from `emulation` + + In case of linking binary blobs which do not have any ELF headers, we + can deduce MIPS ABI ELF header flags from an `emulation` option. + + Patch by Kyle Evans. + + Requested by: kevans :) + +Notes: + svn path=/projects/clang900-import/; revision=352600 + +diff --git tools/lld/ELF/Arch/MipsArchTree.cpp tools/lld/ELF/Arch/MipsArchTree.cpp +index f64d03756457..20e07e1114eb 100644 +--- tools/lld/ELF/Arch/MipsArchTree.cpp ++++ tools/lld/ELF/Arch/MipsArchTree.cpp +@@ -294,12 +294,30 @@ static uint32_t getArchFlags(ArrayRef files) { + return ret; + } + ++// If we don't have any input files, we'll have to rely on the information we ++// can derive from emulation information, since this at least gets us ABI. ++static uint32_t getFlagsFromEmulation() { ++ uint32_t ret = 0; ++ ++ if (config->emulation.empty()) ++ return 0; ++ ++ if (config->ekind == ELF32BEKind || config->ekind == ELF32LEKind) { ++ if (config->mipsN32Abi) ++ ret |= EF_MIPS_ABI2; ++ else ++ ret |= EF_MIPS_ABI_O32; ++ } ++ ++ return ret; ++} ++ + template uint32_t elf::calcMipsEFlags() { + std::vector v; + for (InputFile *f : objectFiles) + v.push_back({f, cast>(f)->getObj().getHeader()->e_flags}); + if (v.empty()) +- return 0; ++ return getFlagsFromEmulation(); + checkFlags(v); + return getMiscFlags(v) | getPicFlags(v) | getArchFlags(v); + } Property changes on: head/devel/llvm90/files/lld/patch-freebsd-r352600 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/llvm90/files/patch-freebsd-r352318 =================================================================== --- head/devel/llvm90/files/patch-freebsd-r352318 (nonexistent) +++ head/devel/llvm90/files/patch-freebsd-r352318 (revision 514194) @@ -0,0 +1,93 @@ +commit 24b1a5b926832f68fa0a008b2484d4b44f58ee8e +Author: dim +Date: Sat Sep 14 10:55:33 2019 +0000 + + Revert commit from upstream llvm trunk (by Hans Wennborg): + + Re-commit r357452 (take 3): "SimplifyCFG + SinkCommonCodeFromPredecessors: Also sink function calls without used + results (PR41259)" + + Third time's the charm. + + This was reverted in r363220 due to being suspected of an internal + benchmark regression and a test failure, none of which turned out to + be caused by this. + + As reported in https://bugs.llvm.org/show_bug.cgi?id=43269, this causes + UNREACHABLE errors when compiling if_malo_pci.c for arm and aarch64. + +Notes: + svn path=/projects/clang900-import/; revision=352318 + +diff --git lib/Transforms/Utils/SimplifyCFG.cpp lib/Transforms/Utils/SimplifyCFG.cpp +index 11651d040dc0..6e2ef67408d9 100644 +--- lib/Transforms/Utils/SimplifyCFG.cpp ++++ lib/Transforms/Utils/SimplifyCFG.cpp +@@ -1428,10 +1428,9 @@ static bool HoistThenElseCodeToIf(BranchInst *BI, + static bool canSinkInstructions( + ArrayRef Insts, + DenseMap> &PHIOperands) { +- // Prune out obviously bad instructions to move. Each instruction must have +- // exactly zero or one use, and we check later that use is by a single, common +- // PHI instruction in the successor. +- bool HasUse = !Insts.front()->user_empty(); ++ // Prune out obviously bad instructions to move. Any non-store instruction ++ // must have exactly one use, and we check later that use is by a single, ++ // common PHI instruction in the successor. + for (auto *I : Insts) { + // These instructions may change or break semantics if moved. + if (isa(I) || I->isEHPad() || isa(I) || +@@ -1445,10 +1444,9 @@ static bool canSinkInstructions( + if (C->isInlineAsm()) + return false; + +- // Each instruction must have zero or one use. +- if (HasUse && !I->hasOneUse()) +- return false; +- if (!HasUse && !I->user_empty()) ++ // Everything must have only one use too, apart from stores which ++ // have no uses. ++ if (!isa(I) && !I->hasOneUse()) + return false; + } + +@@ -1457,11 +1455,11 @@ static bool canSinkInstructions( + if (!I->isSameOperationAs(I0)) + return false; + +- // All instructions in Insts are known to be the same opcode. If they have a +- // use, check that the only user is a PHI or in the same block as the +- // instruction, because if a user is in the same block as an instruction we're +- // contemplating sinking, it must already be determined to be sinkable. +- if (HasUse) { ++ // All instructions in Insts are known to be the same opcode. If they aren't ++ // stores, check the only user of each is a PHI or in the same block as the ++ // instruction, because if a user is in the same block as an instruction ++ // we're contemplating sinking, it must already be determined to be sinkable. ++ if (!isa(I0)) { + auto *PNUse = dyn_cast(*I0->user_begin()); + auto *Succ = I0->getParent()->getTerminator()->getSuccessor(0); + if (!all_of(Insts, [&PNUse,&Succ](const Instruction *I) -> bool { +@@ -1539,7 +1537,7 @@ static bool sinkLastInstruction(ArrayRef Blocks) { + // it is slightly over-aggressive - it gets confused by commutative instructions + // so double-check it here. + Instruction *I0 = Insts.front(); +- if (!I0->user_empty()) { ++ if (!isa(I0)) { + auto *PNUse = dyn_cast(*I0->user_begin()); + if (!all_of(Insts, [&PNUse](const Instruction *I) -> bool { + auto *U = cast(*I->user_begin()); +@@ -1597,10 +1595,11 @@ static bool sinkLastInstruction(ArrayRef Blocks) { + I0->andIRFlags(I); + } + +- if (!I0->user_empty()) { ++ if (!isa(I0)) { + // canSinkLastInstruction checked that all instructions were used by + // one and only one PHI node. Find that now, RAUW it to our common + // instruction and nuke it. ++ assert(I0->hasOneUse()); + auto *PN = cast(*I0->user_begin()); + PN->replaceAllUsesWith(I0); + PN->eraseFromParent(); Property changes on: head/devel/llvm90/files/patch-freebsd-r352318 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/llvm90/files/patch-freebsd-r352629 =================================================================== --- head/devel/llvm90/files/patch-freebsd-r352629 (nonexistent) +++ head/devel/llvm90/files/patch-freebsd-r352629 (revision 514194) @@ -0,0 +1,58 @@ +commit 3538987a800db5e174b3301b9bf70b955a349762 +Author: dim +Date: Mon Sep 23 17:05:46 2019 +0000 + + Pull in r372606 from upstream llvm trunk (by Sanjay Patel): + + [x86] fix assert with horizontal math + broadcast of vector (PR43402) + + https://bugs.llvm.org/show_bug.cgi?id=43402 + + This should fix 'Assertion failed: ((HOp.getValueType() == MVT::v2f64 || + HOp.getValueType() == MVT::v4f64) && HOp.getValueType() == VT && + "Unexpected type for h-op"), function foldShuffleOfHorizOp, file + contrib/llvm/lib/Target/X86/X86ISelLowering.cpp, line 33661' when + building the devel/llvm90 port with CPUTYPE=haswell. + + PR: 240759 + +Notes: + svn path=/projects/clang900-import/; revision=352629 + +diff --git lib/Target/X86/X86ISelLowering.cpp lib/Target/X86/X86ISelLowering.cpp +index 0c5b8a79dd62..1869cc9da017 100644 +--- lib/Target/X86/X86ISelLowering.cpp ++++ lib/Target/X86/X86ISelLowering.cpp +@@ -33651,14 +33651,14 @@ static SDValue foldShuffleOfHorizOp(SDNode *N, SelectionDAG &DAG) { + + // When the operands of a horizontal math op are identical, the low half of + // the result is the same as the high half. If a target shuffle is also +- // replicating low and high halves, we don't need the shuffle. ++ // replicating low and high halves (and without changing the type/length of ++ // the vector), we don't need the shuffle. + if (Opcode == X86ISD::MOVDDUP || Opcode == X86ISD::VBROADCAST) { +- if (HOp.getScalarValueSizeInBits() == 64) { ++ if (HOp.getScalarValueSizeInBits() == 64 && HOp.getValueType() == VT) { + // movddup (hadd X, X) --> hadd X, X + // broadcast (extract_vec_elt (hadd X, X), 0) --> hadd X, X + assert((HOp.getValueType() == MVT::v2f64 || +- HOp.getValueType() == MVT::v4f64) && HOp.getValueType() == VT && +- "Unexpected type for h-op"); ++ HOp.getValueType() == MVT::v4f64) && "Unexpected type for h-op"); + return updateHOp(HOp, DAG); + } + return SDValue(); +diff --git lib/Target/X86/X86ISelLowering.h lib/Target/X86/X86ISelLowering.h +index db36bcb929e3..d873edb857a8 100644 +--- lib/Target/X86/X86ISelLowering.h ++++ lib/Target/X86/X86ISelLowering.h +@@ -422,7 +422,8 @@ namespace llvm { + // Tests Types Of a FP Values for scalar types. + VFPCLASSS, + +- // Broadcast scalar to vector. ++ // Broadcast (splat) scalar or element 0 of a vector. If the operand is ++ // a vector, this node may change the vector length as part of the splat. + VBROADCAST, + // Broadcast mask to vector. + VBROADCASTM, Property changes on: head/devel/llvm90/files/patch-freebsd-r352629 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property