Index: share/mk/bsd.own.mk =================================================================== RCS file: /cvsroot/src/share/mk/bsd.own.mk,v retrieving revision 1.1112 diff -p -u -r1.1112 bsd.own.mk --- share/mk/bsd.own.mk 11 Mar 2019 09:20:14 -0000 1.1112 +++ share/mk/bsd.own.mk 20 Mar 2019 11:02:49 -0000 @@ -1072,7 +1072,7 @@ _MKVARS.yes= \ MKGCC MKGDB MKGROFF \ MKHESIOD MKHTML \ MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \ - MKKERBEROS \ + MKKERBEROS MKLLVMCMDS \ MKKMOD \ MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \ MKMAN MKMANDOC \ @@ -1233,6 +1233,16 @@ MKXORG_SERVER=yes .endif # +# MesaLib.old and MesaLib7 go together, and MesaLib is alone. +# +HAVE_MESA_VER?= 10 +.if ${HAVE_MESA_VER} == "10" +EXTERNAL_MESALIB_DIR?= MesaLib.old +.else +EXTERNAL_MESALIB_DIR?= MesaLib +.endif + +# # Force some options off if their dependencies are off. # @@ -1295,6 +1305,23 @@ MKLIBCXX:= yes .endif # +# If we're building X11 (not the default) on x86, and we're using +# Mesa >= 18, turn on LLVM libs, and maybe turn off building clang. +# +.if ${HAVE_MESA_VER} == "18" +_NEEDS_LLVMLIB.x86_64= yes +_NEEDS_LLVMLIB.i386= yes +.endif + +.if ${MKX11} != "no" && ${_NEEDS_LLVMLIB.${MACHINE_ARCH}:Uno} == "yes" +MKLLVM:= yes +.endif + +.if ${HAVE_LLVM:Uno} != "yes" +MKLLVMCMDS:= no +.endif + +# # install(1) parameters. # COPY?= -c @@ -1466,14 +1493,6 @@ HAVE_XORG_SERVER_VER?=110 HAVE_XORG_SERVER_VER?=120 .endif -# MesaLib.old and MesaLib7 go together, and MesaLib is alone. -HAVE_MESA_VER?= 10 -.if ${HAVE_MESA_VER} == "10" -EXTERNAL_MESALIB_DIR?= MesaLib.old -.else -EXTERNAL_MESALIB_DIR?= MesaLib -.endif - .if ${HAVE_XORG_SERVER_VER} == "120" XORG_SERVER_SUBDIR?=xorg-server . if ${MACHINE} == "amd64" || ${MACHINE} == "i386" Index: tools/Makefile =================================================================== RCS file: /cvsroot/src/tools/Makefile,v retrieving revision 1.198 diff -p -u -r1.198 Makefile --- tools/Makefile 2 Jan 2019 13:29:22 -0000 1.198 +++ tools/Makefile 20 Mar 2019 11:02:49 -0000 @@ -130,8 +130,10 @@ SUBDIR+= \ .if ${MKLLVM} != "no" && !defined(EXTERNAL_TOOLCHAIN) SUBDIR+= \ .WAIT llvm-include .WAIT \ - llvm-lib .WAIT \ - llvm-clang + llvm-lib +. if ${MKLLVMCMDS} != "no" +SUBDIR+= .WAIT llvm-clang +. endif . if ${MKLLD} != "no" SUBDIR+= llvm-lld . endif Index: distrib/sets/lists/comp/md.amd64 =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/comp/md.amd64,v retrieving revision 1.269 diff -p -u -r1.269 md.amd64 --- distrib/sets/lists/comp/md.amd64 14 Feb 2019 20:42:40 -0000 1.269 +++ distrib/sets/lists/comp/md.amd64 20 Mar 2019 11:02:49 -0000 @@ -332,85 +332,85 @@ ./usr/include/clang-5.0/xsaveoptintrin.h comp-obsolete obsolete ./usr/include/clang-5.0/xsavesintrin.h comp-obsolete obsolete ./usr/include/clang-5.0/xtestintrin.h comp-obsolete obsolete -./usr/include/clang-7.0/__wmmintrin_aes.h comp-c-include llvm -./usr/include/clang-7.0/__wmmintrin_pclmul.h comp-c-include llvm -./usr/include/clang-7.0/adxintrin.h comp-c-include llvm -./usr/include/clang-7.0/ammintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx2intrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512bitalgintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512bwintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512cdintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512dqintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512erintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512fintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512ifmaintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512ifmavlintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512pfintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vbmi2intrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vbmiintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vbmivlintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlbitalgintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlbwintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlcdintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vldqintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlvbmi2intrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlvnniintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vnniintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vpopcntdqintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vpopcntdqvlintrin.h comp-c-include llvm -./usr/include/clang-7.0/avxintrin.h comp-c-include llvm -./usr/include/clang-7.0/bmi2intrin.h comp-c-include llvm -./usr/include/clang-7.0/bmiintrin.h comp-c-include llvm -./usr/include/clang-7.0/cetintrin.h comp-c-include llvm -./usr/include/clang-7.0/cldemoteintrin.h comp-c-include llvm -./usr/include/clang-7.0/clflushoptintrin.h comp-c-include llvm -./usr/include/clang-7.0/clwbintrin.h comp-c-include llvm -./usr/include/clang-7.0/clzerointrin.h comp-c-include llvm -./usr/include/clang-7.0/cpuid.h comp-c-include llvm -./usr/include/clang-7.0/emmintrin.h comp-c-include llvm -./usr/include/clang-7.0/f16cintrin.h comp-c-include llvm -./usr/include/clang-7.0/fma4intrin.h comp-c-include llvm -./usr/include/clang-7.0/fmaintrin.h comp-c-include llvm -./usr/include/clang-7.0/fxsrintrin.h comp-c-include llvm -./usr/include/clang-7.0/gfniintrin.h comp-c-include llvm -./usr/include/clang-7.0/ia32intrin.h comp-c-include llvm -./usr/include/clang-7.0/immintrin.h comp-c-include llvm -./usr/include/clang-7.0/invpcidintrin.h comp-c-include llvm -./usr/include/clang-7.0/lwpintrin.h comp-c-include llvm -./usr/include/clang-7.0/lzcntintrin.h comp-c-include llvm -./usr/include/clang-7.0/mm3dnow.h comp-c-include llvm -./usr/include/clang-7.0/mm_malloc.h comp-c-include llvm -./usr/include/clang-7.0/mmintrin.h comp-c-include llvm -./usr/include/clang-7.0/movdirintrin.h comp-c-include llvm -./usr/include/clang-7.0/mwaitxintrin.h comp-c-include llvm -./usr/include/clang-7.0/nmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/pconfigintrin.h comp-c-include llvm -./usr/include/clang-7.0/pkuintrin.h comp-c-include llvm -./usr/include/clang-7.0/pmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/popcntintrin.h comp-c-include llvm -./usr/include/clang-7.0/prfchwintrin.h comp-c-include llvm -./usr/include/clang-7.0/ptwriteintrin.h comp-c-include llvm -./usr/include/clang-7.0/rdseedintrin.h comp-c-include llvm -./usr/include/clang-7.0/rtmintrin.h comp-c-include llvm -./usr/include/clang-7.0/sgxintrin.h comp-c-include llvm -./usr/include/clang-7.0/shaintrin.h comp-c-include llvm -./usr/include/clang-7.0/smmintrin.h comp-c-include llvm -./usr/include/clang-7.0/tbmintrin.h comp-c-include llvm -./usr/include/clang-7.0/tmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/vaesintrin.h comp-c-include llvm -./usr/include/clang-7.0/vpclmulqdqintrin.h comp-c-include llvm -./usr/include/clang-7.0/waitpkgintrin.h comp-c-include llvm -./usr/include/clang-7.0/wbnoinvdintrin.h comp-c-include llvm -./usr/include/clang-7.0/wmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/x86intrin.h comp-c-include llvm -./usr/include/clang-7.0/xmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/xopintrin.h comp-c-include llvm -./usr/include/clang-7.0/xsavecintrin.h comp-c-include llvm -./usr/include/clang-7.0/xsaveintrin.h comp-c-include llvm -./usr/include/clang-7.0/xsaveoptintrin.h comp-c-include llvm -./usr/include/clang-7.0/xsavesintrin.h comp-c-include llvm -./usr/include/clang-7.0/xtestintrin.h comp-c-include llvm +./usr/include/clang-7.0/__wmmintrin_aes.h comp-c-include llvmcmds +./usr/include/clang-7.0/__wmmintrin_pclmul.h comp-c-include llvmcmds +./usr/include/clang-7.0/adxintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/ammintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx2intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512bitalgintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512bwintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512cdintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512dqintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512erintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512fintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512ifmaintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512ifmavlintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512pfintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vbmi2intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vbmiintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vbmivlintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlbitalgintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlbwintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlcdintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vldqintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlvbmi2intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlvnniintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vnniintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vpopcntdqintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vpopcntdqvlintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avxintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/bmi2intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/bmiintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/cetintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/cldemoteintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/clflushoptintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/clwbintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/clzerointrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/cpuid.h comp-c-include llvmcmds +./usr/include/clang-7.0/emmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/f16cintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/fma4intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/fmaintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/fxsrintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/gfniintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/ia32intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/immintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/invpcidintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/lwpintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/lzcntintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/mm3dnow.h comp-c-include llvmcmds +./usr/include/clang-7.0/mm_malloc.h comp-c-include llvmcmds +./usr/include/clang-7.0/mmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/movdirintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/mwaitxintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/nmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/pconfigintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/pkuintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/pmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/popcntintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/prfchwintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/ptwriteintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/rdseedintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/rtmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/sgxintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/shaintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/smmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/tbmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/tmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/vaesintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/vpclmulqdqintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/waitpkgintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/wbnoinvdintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/wmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/x86intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xopintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xsavecintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xsaveintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xsaveoptintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xsavesintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xtestintrin.h comp-c-include llvmcmds ./usr/include/dev/nvmm comp-c-include ./usr/include/dev/nvmm/nvmm.h comp-c-include ./usr/include/dev/nvmm/nvmm_ioctl.h comp-c-include Index: distrib/sets/lists/comp/md.i386 =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/comp/md.i386,v retrieving revision 1.185 diff -p -u -r1.185 md.i386 --- distrib/sets/lists/comp/md.i386 2 Feb 2019 22:39:32 -0000 1.185 +++ distrib/sets/lists/comp/md.i386 20 Mar 2019 11:02:49 -0000 @@ -261,85 +261,85 @@ ./usr/include/clang-5.0/xsaveoptintrin.h comp-obsolete obsolete ./usr/include/clang-5.0/xsavesintrin.h comp-obsolete obsolete ./usr/include/clang-5.0/xtestintrin.h comp-obsolete obsolete -./usr/include/clang-7.0/adxintrin.h comp-c-include llvm -./usr/include/clang-7.0/ammintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx2intrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512bitalgintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512bwintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512cdintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512dqintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512erintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512fintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512ifmaintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512ifmavlintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512pfintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vbmi2intrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vbmiintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vbmivlintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlbitalgintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlbwintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlcdintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vldqintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlvbmi2intrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vlvnniintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vnniintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vpopcntdqintrin.h comp-c-include llvm -./usr/include/clang-7.0/avx512vpopcntdqvlintrin.h comp-c-include llvm -./usr/include/clang-7.0/avxintrin.h comp-c-include llvm -./usr/include/clang-7.0/bmi2intrin.h comp-c-include llvm -./usr/include/clang-7.0/bmiintrin.h comp-c-include llvm -./usr/include/clang-7.0/cetintrin.h comp-c-include llvm -./usr/include/clang-7.0/cldemoteintrin.h comp-c-include llvm -./usr/include/clang-7.0/clflushoptintrin.h comp-c-include llvm -./usr/include/clang-7.0/clwbintrin.h comp-c-include llvm -./usr/include/clang-7.0/clzerointrin.h comp-c-include llvm -./usr/include/clang-7.0/cpuid.h comp-c-include llvm -./usr/include/clang-7.0/emmintrin.h comp-c-include llvm -./usr/include/clang-7.0/f16cintrin.h comp-c-include llvm -./usr/include/clang-7.0/fma4intrin.h comp-c-include llvm -./usr/include/clang-7.0/fmaintrin.h comp-c-include llvm -./usr/include/clang-7.0/fxsrintrin.h comp-c-include llvm -./usr/include/clang-7.0/gfniintrin.h comp-c-include llvm -./usr/include/clang-7.0/ia32intrin.h comp-c-include llvm -./usr/include/clang-7.0/immintrin.h comp-c-include llvm -./usr/include/clang-7.0/invpcidintrin.h comp-c-include llvm -./usr/include/clang-7.0/lwpintrin.h comp-c-include llvm -./usr/include/clang-7.0/lzcntintrin.h comp-c-include llvm -./usr/include/clang-7.0/mm3dnow.h comp-c-include llvm -./usr/include/clang-7.0/mmintrin.h comp-c-include llvm -./usr/include/clang-7.0/mm_malloc.h comp-c-include llvm -./usr/include/clang-7.0/movdirintrin.h comp-c-include llvm -./usr/include/clang-7.0/mwaitxintrin.h comp-c-include llvm -./usr/include/clang-7.0/nmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/pconfigintrin.h comp-c-include llvm -./usr/include/clang-7.0/pkuintrin.h comp-c-include llvm -./usr/include/clang-7.0/pmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/popcntintrin.h comp-c-include llvm -./usr/include/clang-7.0/prfchwintrin.h comp-c-include llvm -./usr/include/clang-7.0/ptwriteintrin.h comp-c-include llvm -./usr/include/clang-7.0/rdseedintrin.h comp-c-include llvm -./usr/include/clang-7.0/rtmintrin.h comp-c-include llvm -./usr/include/clang-7.0/sgxintrin.h comp-c-include llvm -./usr/include/clang-7.0/shaintrin.h comp-c-include llvm -./usr/include/clang-7.0/smmintrin.h comp-c-include llvm -./usr/include/clang-7.0/tbmintrin.h comp-c-include llvm -./usr/include/clang-7.0/tmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/vaesintrin.h comp-c-include llvm -./usr/include/clang-7.0/vpclmulqdqintrin.h comp-c-include llvm -./usr/include/clang-7.0/waitpkgintrin.h comp-c-include llvm -./usr/include/clang-7.0/wbnoinvdintrin.h comp-c-include llvm -./usr/include/clang-7.0/__wmmintrin_aes.h comp-c-include llvm -./usr/include/clang-7.0/wmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/__wmmintrin_pclmul.h comp-c-include llvm -./usr/include/clang-7.0/x86intrin.h comp-c-include llvm -./usr/include/clang-7.0/xmmintrin.h comp-c-include llvm -./usr/include/clang-7.0/xopintrin.h comp-c-include llvm -./usr/include/clang-7.0/xsavecintrin.h comp-c-include llvm -./usr/include/clang-7.0/xsaveintrin.h comp-c-include llvm -./usr/include/clang-7.0/xsaveoptintrin.h comp-c-include llvm -./usr/include/clang-7.0/xsavesintrin.h comp-c-include llvm -./usr/include/clang-7.0/xtestintrin.h comp-c-include llvm +./usr/include/clang-7.0/adxintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/ammintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx2intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512bitalgintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512bwintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512cdintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512dqintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512erintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512fintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512ifmaintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512ifmavlintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512pfintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vbmi2intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vbmiintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vbmivlintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlbitalgintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlbwintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlcdintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vldqintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlvbmi2intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vlvnniintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vnniintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vpopcntdqintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avx512vpopcntdqvlintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/avxintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/bmi2intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/bmiintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/cetintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/cldemoteintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/clflushoptintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/clwbintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/clzerointrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/cpuid.h comp-c-include llvmcmds +./usr/include/clang-7.0/emmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/f16cintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/fma4intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/fmaintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/fxsrintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/gfniintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/ia32intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/immintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/invpcidintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/lwpintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/lzcntintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/mm3dnow.h comp-c-include llvmcmds +./usr/include/clang-7.0/mmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/mm_malloc.h comp-c-include llvmcmds +./usr/include/clang-7.0/movdirintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/mwaitxintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/nmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/pconfigintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/pkuintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/pmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/popcntintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/prfchwintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/ptwriteintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/rdseedintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/rtmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/sgxintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/shaintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/smmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/tbmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/tmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/vaesintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/vpclmulqdqintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/waitpkgintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/wbnoinvdintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/__wmmintrin_aes.h comp-c-include llvmcmds +./usr/include/clang-7.0/wmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/__wmmintrin_pclmul.h comp-c-include llvmcmds +./usr/include/clang-7.0/x86intrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xmmintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xopintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xsavecintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xsaveintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xsaveoptintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xsavesintrin.h comp-c-include llvmcmds +./usr/include/clang-7.0/xtestintrin.h comp-c-include llvmcmds ./usr/include/emmintrin.h comp-obsolete obsolete ./usr/include/gcc-4.1/emmintrin.h comp-obsolete obsolete ./usr/include/gcc-4.1/mm_malloc.h comp-obsolete obsolete Index: distrib/sets/lists/comp/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v retrieving revision 1.2263 diff -p -u -r1.2263 mi --- distrib/sets/lists/comp/mi 12 Mar 2019 23:51:40 -0000 1.2263 +++ distrib/sets/lists/comp/mi 20 Mar 2019 11:02:49 -0000 @@ -13,10 +13,10 @@ ./usr/bin/c89 comp-c-bin ./usr/bin/c99 comp-c-bin ./usr/bin/cc comp-c-bin gcccmds -./usr/bin/clang comp-c-bin llvm -./usr/bin/clang++ comp-c-bin llvm -./usr/bin/clang-cpp comp-c-bin llvm -./usr/bin/clang-tblgen comp-c-bin llvm +./usr/bin/clang comp-c-bin llvmcmds +./usr/bin/clang++ comp-c-bin llvmcmds +./usr/bin/clang-cpp comp-c-bin llvmcmds +./usr/bin/clang-tblgen comp-c-bin llvmcmds ./usr/bin/config comp-util-bin ./usr/bin/crunchgen comp-c-bin ./usr/bin/crunchide comp-c-bin @@ -364,7 +364,7 @@ ./usr/include/clang-4.0/stdatomic.h comp-obsolete obsolete ./usr/include/clang-4.0/stdnoreturn.h comp-obsolete obsolete ./usr/include/clang-5.0/stdatomic.h comp-obsolete obsolete -./usr/include/clang-7.0/stdatomic.h comp-c-include llvm +./usr/include/clang-7.0/stdatomic.h comp-c-include llvmcmds ./usr/include/complex.h comp-c-include ./usr/include/cpio.h comp-c-include ./usr/include/crypto/cryptodev.h comp-c-include Index: distrib/sets/lists/debug/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/debug/mi,v retrieving revision 1.279 diff -p -u -r1.279 mi --- distrib/sets/lists/debug/mi 12 Mar 2019 15:10:44 -0000 1.279 +++ distrib/sets/lists/debug/mi 20 Mar 2019 11:02:49 -0000 @@ -487,8 +487,8 @@ ./usr/libdata/debug/usr/bin/chpass.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/ci.debug comp-rcs-debug debug ./usr/libdata/debug/usr/bin/cksum.debug comp-util-debug debug -./usr/libdata/debug/usr/bin/clang-tblgen.debug comp-c-debug llvm,debug -./usr/libdata/debug/usr/bin/clang.debug comp-c-debug llvm,debug +./usr/libdata/debug/usr/bin/clang-tblgen.debug comp-c-debug llvmcmds,debug +./usr/libdata/debug/usr/bin/clang.debug comp-c-debug llvmcmds,debug ./usr/libdata/debug/usr/bin/cmp.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/co.debug comp-rcs-debug debug ./usr/libdata/debug/usr/bin/col.debug comp-util-debug debug Index: external/bsd/llvm/bin/Makefile =================================================================== RCS file: /cvsroot/src/external/bsd/llvm/bin/Makefile,v retrieving revision 1.17 diff -p -u -r1.17 Makefile --- external/bsd/llvm/bin/Makefile 1 Aug 2017 20:07:37 -0000 1.17 +++ external/bsd/llvm/bin/Makefile 20 Mar 2019 11:02:49 -0000 @@ -2,9 +2,13 @@ .include -SUBDIR= clang \ - clang-tblgen \ - tblgen +SUBDIR= tblgen + +.if ${MKLLVMCMDS} != "no" +SUBDIR+= \ + clang \ + clang-tblgen +.endif .if ${MKLLD} != "no" SUBDIR+= \ Index: external/bsd/llvm/include/Makefile =================================================================== RCS file: /cvsroot/src/external/bsd/llvm/include/Makefile,v retrieving revision 1.46 diff -p -u -r1.46 Makefile --- external/bsd/llvm/include/Makefile 3 Mar 2019 17:46:01 -0000 1.46 +++ external/bsd/llvm/include/Makefile 20 Mar 2019 11:02:53 -0000 @@ -4,7 +4,7 @@ .PATH: ${CLANG_SRCDIR}/lib/Headers - +.if ${MKLLVMCMDS} != "no" .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" INCS= adxintrin.h \ ammintrin.h \ @@ -101,22 +101,11 @@ INCS= msa.h .endif INCS+= stdatomic.h INCSDIR= /usr/include/clang-${CLANG_VERSION:R} - -.PATH: ${LLVM_SRCDIR}/include/llvm/IR \ - ${CLANG_SRCDIR}/include/clang/AST \ +.PATH: ${CLANG_SRCDIR}/include/clang/AST \ ${CLANG_SRCDIR}/include/clang/Basic \ ${CLANG_SRCDIR}/include/clang/Driver \ ${CLANG_SRCDIR}/include/clang/StaticAnalyzer/Checkers -TABLEGEN_SRC= Attributes.td Intrinsics.td Options.td - -TABLEGEN_OUTPUT.Attributes.td= \ - llvm/IR/Attributes.inc|-gen-attrs - -TABLEGEN_OUTPUT.Intrinsics.td= \ - llvm/IR/IntrinsicEnums.inc|-gen-intrinsic-enums \ - llvm/IR/IntrinsicImpl.inc|-gen-intrinsic-impl - CLANG_TABLEGEN_SRC= \ arm_fp16.td \ arm_neon.td \ @@ -206,10 +195,24 @@ CLANG_TABLEGEN_INCLUDES.Checkers.td= \ CLANG_TABLEGEN_OUTPUT.Checkers.td= \ clang/StaticAnalyzer/Checkers/Checkers.inc|-gen-clang-sa-checkers +TABLEGEN_SRC+= Options.td + TABLEGEN_INCLUDES.Options.td= -I${CLANG_SRCDIR}/include/clang/Driver TABLEGEN_OUTPUT.Options.td= \ clang/Driver/Options.inc|-gen-opt-parser-defs +.endif + +.PATH: ${LLVM_SRCDIR}/include/llvm/IR +TABLEGEN_SRC+= Attributes.td Intrinsics.td #Options.td + +TABLEGEN_OUTPUT.Attributes.td= \ + llvm/IR/Attributes.inc|-gen-attrs + +TABLEGEN_OUTPUT.Intrinsics.td= \ + llvm/IR/IntrinsicEnums.inc|-gen-intrinsic-enums \ + llvm/IR/IntrinsicImpl.inc|-gen-intrinsic-impl + .include "${.PARSEDIR}/../tablegen.mk" DPSRCS+= clang/Basic/Version.inc llvm/Support/VCSRevision.h Index: external/bsd/llvm/lib/Makefile =================================================================== RCS file: /cvsroot/src/external/bsd/llvm/lib/Makefile,v retrieving revision 1.47 diff -p -u -r1.47 Makefile --- external/bsd/llvm/lib/Makefile 17 Jul 2018 18:55:27 -0000 1.47 +++ external/bsd/llvm/lib/Makefile 20 Mar 2019 11:02:53 -0000 @@ -121,6 +121,7 @@ SUBDIR+= \ libLLVMXRay .endif +.if ${MKLLVMCMDS} != "no" SUBDIR+= \ libclangAnalysis \ libclangARCMigrate \ @@ -144,6 +145,7 @@ SUBDIR+= \ libclangStaticAnalyzerCore \ .WAIT \ libclangStaticAnalyzerFrontend +.endif .if ${NO_LLVM_DEVELOPER:Uno} == "no" && ${LLVM_DEVELOPER:U} == "yes" SUBDIR+= \