sync ports with The Matrix

devel/llvm/16/Makefile

@@ -2,7 +2,7 @@ LLVM_MAJOR =	16
 LLVM_VERSION =	${LLVM_MAJOR}.0.6
 LLVM_PKGSPEC =	>=16,<17
 
-REVISION-main =		5
+REVISION-main =		7
 REVISION-lldb =		1
 REVISION-python =	0
 

devel/llvm/16/patches/patch-lld_CMakeLists_txt

@@ -0,0 +1,35 @@
+Index: lld/CMakeLists.txt
+--- lld/CMakeLists.txt.orig
++++ lld/CMakeLists.txt
+@@ -161,6 +161,20 @@ list(INSERT CMAKE_MODULE_PATH 0
+ 
+ include(AddLLD)
+ 
++option(LLD_ENABLE_WASM
++       "Enable support for WASM."
++       OFF)
++if (LLD_ENABLE_WASM)
++  add_definitions("-DLLD_ENABLE_WASM=1")
++endif()
++
++option(LLD_ENABLE_MACHO
++       "Enable support for MachO."
++       OFF)
++if (LLD_ENABLE_MACHO)
++  add_definitions("-DLLD_ENABLE_MACHO=1")
++endif()
++
+ option(LLD_USE_VTUNE
+        "Enable VTune user task tracking."
+        OFF)
+@@ -210,7 +224,9 @@ endif()
+ add_subdirectory(docs)
+ add_subdirectory(COFF)
+ add_subdirectory(ELF)
+-add_subdirectory(MachO)
++if (LLD_ENABLE_MACHO)
++  add_subdirectory(MachO)
++endif()
+ add_subdirectory(MinGW)
+ add_subdirectory(wasm)
+ 

devel/llvm/16/patches/patch-lld_tools_lld_CMakeLists_txt

@@ -0,0 +1,20 @@
+Index: lld/tools/lld/CMakeLists.txt
+--- lld/tools/lld/CMakeLists.txt.orig
++++ lld/tools/lld/CMakeLists.txt
+@@ -23,10 +23,15 @@ lld_target_link_libraries(lld
+   lldCommon
+   lldCOFF
+   lldELF
+-  lldMachO
+   lldMinGW
+   lldWasm
+   )
++
++if (LLD_ENABLE_MACHO)
++  target_link_libraries(lld  
++    lldMachO
++    )
++endif() 
+ 
+ install(TARGETS lld
+   RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")

devel/llvm/16/patches/patch-lld_tools_lld_lld_cpp

@@ -1,35 +1,15 @@
 Index: lld/tools/lld/lld.cpp
 --- lld/tools/lld/lld.cpp.orig
 +++ lld/tools/lld/lld.cpp
-@@ -70,6 +70,7 @@ static Flavor getFlavor(StringRef s) {
-       .Default(Invalid);
- }
- 
-+#ifndef __OpenBSD__
- static cl::TokenizerCallback getDefaultQuotingStyle() {
-   if (Triple(sys::getProcessTriple()).getOS() == Triple::Win32)
-     return cl::TokenizeWindowsCommandLine;
-@@ -106,6 +107,7 @@ static bool isPETarget(std::vector<const char *> &v) {
-   return false;
- #endif
- }
-+#endif
- 
- static Flavor parseProgname(StringRef progname) {
-   // Use GNU driver for "ld" by default.
-@@ -149,6 +151,10 @@ static int lldMain(int argc, const char **argv, llvm::
-   std::vector<const char *> args(argv, argv + argc);
-   auto link = [&args]() {
-     Flavor f = parseFlavor(args);
-+#ifdef __OpenBSD__
-+    if (f == Gnu)
-+      return elf::link;
-+#else
-     if (f == Gnu && isPETarget(args))
-       return mingw::link;
-     else if (f == Gnu)
-@@ -159,6 +165,7 @@ static int lldMain(int argc, const char **argv, llvm::
+@@ -155,10 +155,14 @@ static int lldMain(int argc, const char **argv, llvm::
+       return elf::link;
+     else if (f == WinLink)
+       return coff::link;
++#ifdef LLD_ENABLE_MACHO
+     else if (f == Darwin)
        return macho::link;
++#endif
++#ifdef LLD_ENABLE_WASM
      else if (f == Wasm)
        return lld::wasm::link;
 +#endif

devel/llvm/16/pkg/PLIST-main

@@ -3059,7 +3059,7 @@ ${CLANG_INCLUDE_PATH}/cuda_wrappers/new
 ${CLANG_INCLUDE_PATH}/emmintrin.h
 ${CLANG_INCLUDE_PATH}/enqcmdintrin.h
 ${CLANG_INCLUDE_PATH}/f16cintrin.h
-${CLANG_INCLUDE_PATH}/float.h
+@comment ${CLANG_INCLUDE_PATH}/float.h
 ${CLANG_INCLUDE_PATH}/fma4intrin.h
 ${CLANG_INCLUDE_PATH}/fmaintrin.h
 ${CLANG_INCLUDE_PATH}/fxsrintrin.h
@@ -3074,12 +3074,12 @@ ${CLANG_INCLUDE_PATH}/hvx_hexagon_protos.h
 ${CLANG_INCLUDE_PATH}/ia32intrin.h
 ${CLANG_INCLUDE_PATH}/immintrin.h
 ${CLANG_INCLUDE_PATH}/intrin.h
-${CLANG_INCLUDE_PATH}/inttypes.h
+@comment ${CLANG_INCLUDE_PATH}/inttypes.h
 ${CLANG_INCLUDE_PATH}/invpcidintrin.h
-${CLANG_INCLUDE_PATH}/iso646.h
+@comment ${CLANG_INCLUDE_PATH}/iso646.h
 ${CLANG_INCLUDE_PATH}/keylockerintrin.h
 ${CLANG_INCLUDE_PATH}/larchintrin.h
-${CLANG_INCLUDE_PATH}/limits.h
+@comment ${CLANG_INCLUDE_PATH}/limits.h
 ${CLANG_INCLUDE_PATH}/lwpintrin.h
 ${CLANG_INCLUDE_PATH}/lzcntintrin.h
 ${CLANG_INCLUDE_PATH}/mm3dnow.h
@@ -3131,21 +3131,21 @@ ${CLANG_INCLUDE_PATH}/sgxintrin.h
 ${CLANG_INCLUDE_PATH}/shaintrin.h
 ${CLANG_INCLUDE_PATH}/smmintrin.h
 ${CLANG_INCLUDE_PATH}/stdalign.h
-${CLANG_INCLUDE_PATH}/stdarg.h
+@comment ${CLANG_INCLUDE_PATH}/stdarg.h
 ${CLANG_INCLUDE_PATH}/stdatomic.h
-${CLANG_INCLUDE_PATH}/stdbool.h
-${CLANG_INCLUDE_PATH}/stddef.h
-${CLANG_INCLUDE_PATH}/stdint.h
+@comment ${CLANG_INCLUDE_PATH}/stdbool.h
+@comment ${CLANG_INCLUDE_PATH}/stddef.h
+@comment ${CLANG_INCLUDE_PATH}/stdint.h
 ${CLANG_INCLUDE_PATH}/stdnoreturn.h
 ${CLANG_INCLUDE_PATH}/tbmintrin.h
-${CLANG_INCLUDE_PATH}/tgmath.h
+@comment ${CLANG_INCLUDE_PATH}/tgmath.h
 ${CLANG_INCLUDE_PATH}/tmmintrin.h
 ${CLANG_INCLUDE_PATH}/tsxldtrkintrin.h
 ${CLANG_INCLUDE_PATH}/uintrintrin.h
 ${CLANG_INCLUDE_PATH}/unwind.h
 ${CLANG_INCLUDE_PATH}/vadefs.h
 ${CLANG_INCLUDE_PATH}/vaesintrin.h
-${CLANG_INCLUDE_PATH}/varargs.h
+@comment ${CLANG_INCLUDE_PATH}/varargs.h
 ${CLANG_INCLUDE_PATH}/vecintrin.h
 ${CLANG_INCLUDE_PATH}/velintrin.h
 ${CLANG_INCLUDE_PATH}/velintrin_approx.h
@@ -3459,7 +3459,6 @@ ${LLVM_BASE}/lib/libear/ear.c
 @static-lib ${LLVM_BASE}/lib/liblldCOFF.a
 @static-lib ${LLVM_BASE}/lib/liblldCommon.a
 @static-lib ${LLVM_BASE}/lib/liblldELF.a
-@static-lib ${LLVM_BASE}/lib/liblldMachO.a
 @static-lib ${LLVM_BASE}/lib/liblldMinGW.a
 @static-lib ${LLVM_BASE}/lib/liblldWasm.a
 ${LLVM_BASE}/lib/libscanbuild/