diff --git a/common/shlibs b/common/shlibs
index 5170229b4e2..4d886bd2143 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -982,15 +982,15 @@ libuchardet.so.0 uchardet-0.0.6_1
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.2 confuse-3.2.1_1
+liblldb.so.15 lldb-15.0.7_1
+libclang.so.15 libclang-15.0.7_1
+libclang-cpp.so.15 libclang-cpp-15.0.7_1
 liblldb.so.17 lldb17-17.0.6_1
-liblldb.so.15 lldb15-15.0.7_4
 libclang.so.17 libclang17-17.0.6_1
-libclang.so.15 libclang15-15.0.7_4
 libclang-cpp.so.17 libclang-cpp17-17.0.6_1
-libclang-cpp.so.15 libclang-cpp15-15.0.7_4
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
-libLLVM-15.so libllvm15-15.0.7_4
+libLLVM-15.so libllvm15-15.0.7_1
 libLLVM-17.so libllvm17-17.0.6_1
 libLLVMSPIRVLib.so.17 SPIRV-LLVM-Translator-17.0.0_1
 libomp.so.5 libomp-17.0.6_1
diff --git a/srcpkgs/clang-analyzer15 b/srcpkgs/clang-analyzer15
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/clang-analyzer15
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang-tools-extra15 b/srcpkgs/clang-tools-extra15
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/clang-tools-extra15
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang15 b/srcpkgs/clang15
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/clang15
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/libclang-cpp15 b/srcpkgs/libclang-cpp15
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/libclang-cpp15
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/libclang15 b/srcpkgs/libclang15
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/libclang15
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/lld15 b/srcpkgs/lld15
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/lld15
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/lld15-devel b/srcpkgs/lld15-devel
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/lld15-devel
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/lldb15 b/srcpkgs/lldb15
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/lldb15
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/lldb15-devel b/srcpkgs/lldb15-devel
deleted file mode 120000
index ad57a969b9f..00000000000
--- a/srcpkgs/lldb15-devel
+++ /dev/null
@@ -1 +0,0 @@
-llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template
index 6a939bb08fe..24f73810c3a 100644
--- a/srcpkgs/llvm15/template
+++ b/srcpkgs/llvm15/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm15'
 pkgname=llvm15
 version=15.0.7
-revision=4
+revision=3
 build_wrksrc=llvm
 build_style=cmake
 _ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
@@ -9,6 +9,15 @@ configure_args="
  -DCMAKE_BUILD_TYPE=Release -Wno-dev
  -DENABLE_LINKER_BUILD_ID=YES
  -DLLDB_USE_SYSTEM_SIX=YES
+ -DLIBCXX_CXX_ABI=libcxxabi
+ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES
+ -DLIBCXXABI_USE_LLVM_UNWINDER=YES
+ -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES
+ -DLIBOMP_ENABLE_SHARED=YES
+ -DLIBOMP_INSTALL_ALIASES=NO
+ -DLLVM_INCLUDE_DOCS=YES
+ -DLLVM_BUILD_DOCS=YES
+ -DLLVM_ENABLE_SPHINX=YES
  -DSPHINX_WARNINGS_AS_ERRORS=NO
  -DLLVM_INSTALL_UTILS=YES
  -DLLVM_BUILD_LLVM_DYLIB=YES
@@ -20,12 +29,13 @@ configure_args="
  -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages
  -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver}
  -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix"
-hostmakedepends="perl python3 zlib-devel libffi-devel swig"
+hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx
+ python3-recommonmark python3-sphinx-automodapi"
 makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel
  libxml2-devel binutils-devel"
 depends="libllvm15>=${version}_${revision}"
-short_desc="LLVM Compiler Infrastructure Project - Version 15"
-maintainer="Daniel Martinez <danielmartinez@cock.li>"
+short_desc="Low Level Virtual Machine"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.llvm.org"
 distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz"
@@ -44,26 +54,46 @@ case "$XBPS_TARGET_MACHINE" in
 	ppc*) configure_args+=" -DCLANG_ENABLE_CLANGD=OFF" ;;
 esac
 
-_enabled_projects="clang;clang-tools-extra;compiler-rt;lld"
+_enabled_projects="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;libunwind;lld"
 
 _lldb_enable=yes
+_libomp_enable=no
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64le*) ;;
 	ppc*|i686*|riscv64*) _lldb_enable=no ;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|aarch64*|ppc64*) _libomp_enable=yes;;
+esac
 
-subpackages="clang-tools-extra15 clang15 clang-analyzer15 libclang15 libclang-cpp15
- libllvm15"
+subpackages="clang-tools-extra"
+
+# must go before clang
+if [ "$_libomp_enable" = "yes" ]; then
+	_enabled_projects+=";openmp"
+	subpackages+=" libomp libomp-devel"
+	# because of cmake nonsense referencing libomptarget.so.*
+	depends+=" libomp>=${version}_${revision}"
+	if [ "$CROSS_BUILD" ]; then
+		# Seems to require a full host llvm/clang build
+		configure_args+=" -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF"
+		configure_args+=" -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF"
+	fi
+fi
+
+subpackages+=" clang clang-analyzer libclang libclang-cpp
+ llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel
+ libcxxabi libcxxabi-devel libllvm15"
 
 if [ "$_lldb_enable" = "yes" ]; then
 	# XXX fails to cross compile due to python
 	_enabled_projects+=";lldb"
-	subpackages+=" lldb15 lldb15-devel"
+	subpackages+=" lldb lldb-devel"
 fi
 
-subpackages+=" lld15 lld15-devel"
+subpackages+=" lld lld-devel"
 
 configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
 
@@ -73,11 +103,32 @@ post_patch() {
 			vsed -i 's|__ptrace_request|int|g' \
 				${wrksrc}/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
 		fi
+		# disable docs for lldb as they fail to generate
+		vsed -i '/add_subdirectory(docs)/d' \
+			${wrksrc}/lldb/CMakeLists.txt
 	fi
 
 	# update config.guess for better platform detection
 	cp $XBPS_COMMONDIR/environment/configure/automake/config.guess \
 		${wrksrc}/llvm/cmake
+
+	# fix linker failures on some archs
+	vsed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \
+		${wrksrc}/libcxxabi/cmake/config-ix.cmake
+	vsed -i 's,check_library_exists(gcc .*,set(LIBCXXABI_HAS_GCC_LIB ON),' \
+		${wrksrc}/libcxxabi/cmake/config-ix.cmake
+
+	# need libssp_nonshared on some musl platforms (because of nodefaultlibs)
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) ;;
+		ppc*-musl|i686-musl|mips*-musl)
+			vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \
+				${wrksrc}/libunwind/src/CMakeLists.txt
+			vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \
+				${wrksrc}/libcxxabi/src/CMakeLists.txt
+			vsed -i 's,#ssp,,' ${wrksrc}/libcxx/CMakeLists.txt
+			;;
+	esac
 }
 
 pre_configure() {
@@ -160,11 +211,22 @@ do_install() {
 	if [ "$CROSS_BUILD" ]; then
 		rm -f ${DESTDIR}/usr/bin/llvm-config-host
 	fi
+
+	# Install libcxxabi headers
+	vinstall ${wrksrc}/libcxxabi/include/__cxxabi_config.h 644 usr/include
+	vinstall ${wrksrc}/libcxxabi/include/cxxabi.h 644 usr/include
+
+	# Install libunwind headers
+	vinstall ${wrksrc}/libunwind/include/__libunwind_config.h 644 usr/include
+	vinstall ${wrksrc}/libunwind/include/libunwind.h 644 usr/include
+	vinstall ${wrksrc}/libunwind/include/unwind.h 644 usr/include
+	vinstall ${wrksrc}/libunwind/include/mach-o/compact_unwind_encoding.h \
+		644 usr/include/mach-o
 }
 
-clang-analyzer15_package() {
+clang-analyzer_package() {
 	pycompile_dirs="usr/share/scan-view"
-	depends="clang15-${version}_${revision} python3 perl"
+	depends="clang-${version}_${revision} python3 perl"
 	short_desc+=" - A source code analysis framework"
 	homepage="https://clang-analyzer.llvm.org/"
 	pkg_install() {
@@ -175,9 +237,9 @@ clang-analyzer15_package() {
 	}
 }
 
-clang-tools-extra15_package() {
+clang-tools-extra_package() {
 	lib32disabled=yes
-	depends="clang15-${version}_${revision} python3"
+	depends="clang-${version}_${revision} python3"
 	short_desc+=" - Extra Clang tools"
 	homepage="https://clang.llvm.org/extra/"
 	pkg_install() {
@@ -212,13 +274,15 @@ clang-tools-extra15_package() {
 		vmove "usr/share/clang/*find-all-symbols*"
 		vmove "usr/share/clang/*include-fixer*"
 		vmove "usr/share/clang/*tidy*"
+		vmove usr/share/doc/LLVM/clang-tools
+		vmove usr/share/man/man1/extraclangtools.1
 	}
 }
 
-clang15_package() {
+clang_package() {
 	lib32disabled=yes
 	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel
-	 libclang15-${version}_${revision}"
+	 libclang-${version}_${revision}"
 	short_desc+=" - C language family frontend"
 	homepage="https://clang.llvm.org/"
 	pkg_install() {
@@ -232,24 +296,27 @@ clang15_package() {
 		vmove "usr/lib/libclang*.a"
 		vmove "usr/lib/libclang*.so"
 		vmove usr/share/clang
+		vmove usr/share/doc/LLVM/clang
+		vmove usr/share/man/man1/clang.1
+		vmove usr/share/man/man1/diagtool.1
 	}
 }
 
-libclang15_package() {
+libclang_package() {
 	short_desc+=" - C frontend runtime library"
 	pkg_install() {
 		vmove "usr/lib/libclang.so.*"
 	}
 }
 
-libclang-cpp15_package() {
+libclang-cpp_package() {
 	short_desc+=" - C frontend runtime library (C++ interface)"
 	pkg_install() {
 		vmove "usr/lib/libclang-cpp.so.*"
 	}
 }
 
-lld15_package() {
+lld_package() {
 	lib32disabled=yes
 	short_desc+=" - linker"
 	homepage="https://lld.llvm.org"
@@ -258,14 +325,15 @@ lld15_package() {
 		vmove "usr/bin/ld64.lld*"
 		vmove "usr/bin/lld*"
 		vmove usr/bin/wasm-ld
+		vmove usr/share/doc/LLVM/lld
 	}
 }
 
-lld15-devel_package() {
+lld-devel_package() {
 	lib32disabled=yes
 	short_desc+=" - linker - development files"
 	homepage="https://lld.llvm.org"
-	depends="lld15>=${version}_${revision}"
+	depends="lld>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include/lld
 		vmove usr/lib/cmake/lld
@@ -273,7 +341,7 @@ lld15-devel_package() {
 	}
 }
 
-lldb15_package() {
+lldb_package() {
 	lib32disabled=yes
 	depends+=" python3-six"
 	short_desc+=" - LLDB debugger"
@@ -285,9 +353,9 @@ lldb15_package() {
 	}
 }
 
-lldb15-devel_package() {
+lldb-devel_package() {
 	lib32disabled=yes
-	depends="lldb15>=${version}_${revision}"
+	depends="lldb>=${version}_${revision}"
 	short_desc+=" - LLDB debugger - development files"
 	pkg_install() {
 		vmove usr/include/lldb
@@ -295,6 +363,86 @@ lldb15-devel_package() {
 	}
 }
 
+llvm-libunwind_package() {
+	short_desc+=" - libunwind"
+	pkg_install() {
+		vmove "usr/lib/libunwind.so.*"
+	}
+}
+
+llvm-libunwind-devel_package() {
+	short_desc+=" - libunwind - development files"
+	depends="llvm-libunwind>=${version}_${revision}"
+	conflicts="libunwind-devel>=0"
+	pkg_install() {
+		vmove usr/include/mach-o
+		vmove "usr/include/*unwind*"
+		vmove "usr/lib/libunwind.a"
+		vmove "usr/lib/libunwind.so"
+		vmove usr/share/doc/LLVM/libunwind
+	}
+}
+
+libcxxabi_package() {
+	short_desc+=" - low level support for libc++"
+	pkg_install() {
+		vmove "usr/lib/libc++abi.so.*"
+	}
+}
+
+libcxxabi-devel_package() {
+	short_desc+=" - low level support for libc++ - development files"
+	depends="libcxxabi>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/include/*cxxabi*"
+		vmove "usr/lib/libc++abi.so"
+		vmove "usr/lib/libc++abi.a"
+	}
+}
+
+libcxx_package() {
+	short_desc+=" - C++ standard library"
+	pkg_install() {
+		vmove "usr/lib/libc++.so.*"
+	}
+}
+
+libcxx-devel_package() {
+	short_desc+=" - C++ standard library - development files"
+	depends="libcxx>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/c++
+		vmove "usr/lib/libc++.so"
+		vmove "usr/lib/libc++.a"
+		vmove "usr/lib/libc++experimental.a"
+		vmove usr/share/doc/LLVM/libcxx
+	}
+}
+
+libomp_package() {
+	short_desc+=" - Clang OpenMP support library"
+	pkg_install() {
+		vmove usr/lib/libarcher.so
+		vmove usr/lib/libompd.so
+		vmove "usr/lib/libomptarget.rtl.*.so"
+		vmove "usr/lib/libomp*.so.*"
+	}
+}
+
+libomp-devel_package() {
+	short_desc+=" - Clang OpenMP support library - development files"
+	depends="libomp>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/include/omp*.h"
+		vmove "usr/lib/clang/${version}/include/omp*.h"
+		vmove "usr/lib/libarcher*"
+		vmove "usr/lib/libomp*.so"
+		vmove usr/lib/cmake/openmp
+		vmove usr/share/doc/LLVM/openmp
+		vmove usr/share/man/man1/llvmopenmp.1
+	}
+}
+
 libllvm15_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {