Source Mage code commit list

[Conner Clere <scm AT sourcemage.org>]

GIT changes to devel-llvm-versioned grimoire by Conner Clere 
<xenanthropy AT sourcemage.org>:

 devel/llvm14/0001-Include-libunwind-from-source-directory.patch             
|   25 -------
 devel/llvm14/BUILD                                                          
|    8 --
 devel/llvm14/CONFIGURE                                                      
|   10 ---
 devel/llvm14/DEPENDS                                                        
|   21 ------
 devel/llvm14/DETAILS                                                        
|   10 ---
 devel/llvm14/HISTORY                                                        
|   11 ++-
 devel/llvm14/INSTALL                                                        
|   32 ----------
 devel/llvm14/PREPARE                                                        
|    1 
 devel/llvm14/PRE_BUILD                                                      
|   13 ----
 devel/llvm14/PRE_SUB_DEPENDS                                                
|    1 
 devel/llvm14/SUB_DEPENDS                                                    
|    4 -
 devel/llvm14/patches-libcxx/libcxx-musl.patch                               
|   28 --------
 devel/llvm14/patches-libcxx/libcxxabi-dl.patch                              
|   27 --------
 devel/llvm14/patches-lld/0001-Include-libunwind-from-source-directory.patch 
|   25 +++++++
 devel/llvm14/patches-lld/libcxx-musl.patch                                  
|   28 ++++++++
 devel/llvm14/patches-lld/libcxxabi-dl.patch                                 
|   27 ++++++++
 devel/llvm14/patches-lldb/lldb-musl.patch                                   
|   12 ---
 17 files changed, 100 insertions(+), 183 deletions(-)

New commits:
commit 6609092c354db23f289b90a9bada3842c90b03d3
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

    llvm14: remove lldb and analyzer, clean up files

diff --git a/devel/llvm14/0001-Include-libunwind-from-source-directory.patch 
b/devel/llvm14/0001-Include-libunwind-from-source-directory.patch
deleted file mode 100644
index 2b9bc64..0000000
--- a/devel/llvm14/0001-Include-libunwind-from-source-directory.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2cf2b1af0f0be6431c1e239d482056ef4d4ac17f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <Florian.Franzmann AT bandrate.org>
-Date: Sun, 2 May 2021 13:24:21 +0200
-Subject: [PATCH] Include libunwind from source directory
-
----
- lld/MachO/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lld/MachO/CMakeLists.txt b/lld/MachO/CMakeLists.txt
-index b76f37dcc6e6..69ca3fc6de67 100644
---- a/lld/MachO/CMakeLists.txt
-+++ b/lld/MachO/CMakeLists.txt
-@@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS Options.td)
- tablegen(LLVM Options.inc -gen-opt-parser-defs)
- add_public_tablegen_target(MachOOptionsTableGen)
- 
--include_directories(${LLVM_MAIN_SRC_DIR}/../libunwind/include)
-+include_directories(${LLVM_MAIN_SRC_DIR}/libunwind/include)
- 
- add_lld_library(lldMachO2
-   Arch/X86_64.cpp
--- 
-2.31.1
-
diff --git a/devel/llvm14/BUILD b/devel/llvm14/BUILD
index ec8a65d..ad8011c 100755
--- a/devel/llvm14/BUILD
+++ b/devel/llvm14/BUILD
@@ -12,11 +12,9 @@ OPTS+=" -DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS// /;}" &&
 # recommended by mesa project
 OPTS+=" -DLLVM_LINK_LLVM_DYLIB=1 -DCMAKE_BUILD_TYPE=RELEASE" &&
 # prevent unnecessary use of libedit and ncurses
-if ! is_depends_enabled $SPELL libedit;then
-  OPTS+=" -DLLVM_ENABLE_LIBEDIT=0" &&
-  OPTS+=" -DLLVM_ENABLE_TERMINFO=0" &&
-  OPTS+=" -DLLVM_ENABLE_BACKTRACES=0"
-fi &&
+OPTS+=" -DLLVM_ENABLE_LIBEDIT=0" &&
+OPTS+=" -DLLVM_ENABLE_TERMINFO=0" &&
+OPTS+=" -DLLVM_ENABLE_BACKTRACES=0" &&
 # Enable RTTI if requested, recommended, changing it breaks the ABI
 if [ y = "$LLVM_WITH_RTTI" ]; then
   OPTS+=" -DLLVM_ENABLE_RTTI=1"
diff --git a/devel/llvm14/CONFIGURE b/devel/llvm14/CONFIGURE
index b364b0d..f7543af 100755
--- a/devel/llvm14/CONFIGURE
+++ b/devel/llvm14/CONFIGURE
@@ -17,15 +17,9 @@ config_query_multi LLVM_TARGETS "which backend targets?" \
                   RISCV \
                   Sparc \
                   SystemZ \
-                  VE \
+       VE \
                   WebAssembly \
                   X86 \
                   XCore &&
 
-if [[ "$LLVM_WITH_CLANG" == "y" ]]
-then
-  config_query LLVM_WITH_ANALYZER \
-    "Install clang static analyzer (scan-build and scan-view)?" \
-    n
-fi  &&
-. $GRIMOIRE/CMAKE_CONFIGURE
+. "$GRIMOIRE"/CMAKE_CONFIGURE
diff --git a/devel/llvm14/DEPENDS b/devel/llvm14/DEPENDS
index 717e93d..c13cae0 100755
--- a/devel/llvm14/DEPENDS
+++ b/devel/llvm14/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
 case "$HOST" in
   (*-musl)
     depends libexecinfo &&
@@ -10,21 +10,6 @@ depends -sub CXX gcc &&
 depends PKG-CONFIG &&
 depends zlib  '-DLLVM_ENABLE_ZLIB=1' &&
 depends python3 &&
-if [[ "$LLVM_WITH_ANALYZER" == "y" ]]
-then
-  optional_depends z3 \
-                   -DCLANG_ANALYZER_ENABLE_Z3_SOLVER={1,0} \
-                   'for Z3 solver support in Clang Static Analyzer' &&
-  # perl is required for scan-build, which is the analyzer itself
-  runtime_depends perl
-fi &&
 
-optional_depends ocaml   '' '' 'build bindings for OCaml' &&
-optional_depends doxygen '' '' "build documentation?" &&
-optional_depends libffi  '-DLLVM_ENABLE_FFI=1 
-DFFI_INCLUDE_DIR=/usr/lib/libffi-3.2.1/include' '' 'use sytem FFI' &&
-if [[ "$LLVM_WITH_LLDB" == y ]]; then
-  depends six -DLLDB_USE_SYSTEM_SIX=YES &&
-  depends swig &&
-  depends libedit &&
-  depends ncurses
-fi
+optional_depends libffi -DLLVM_ENABLE_FFI={1,0} \
+                 'For FFI support in the LLVM interpreter'
diff --git a/devel/llvm14/DETAILS b/devel/llvm14/DETAILS
index c95be88..fa74d8a 100755
--- a/devel/llvm14/DETAILS
+++ b/devel/llvm14/DETAILS
@@ -1,7 +1,6 @@
            SPELL=llvm14
-          SPELLX=llvm
          VERSION=14.0.6
-          SOURCE="${SPELLX}-${VERSION}.src.tar.xz"
+          SOURCE="llvm-${VERSION}.src.tar.xz"
       
GITHUB_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$VERSION";
    SOURCE_URL[0]="${GITHUB_URI}/${SOURCE}"
      
SOURCE_HASH=sha256:050922ecaaca5781fdf6631ea92bc715183f202f9d2f15147226f023414f619a
@@ -16,11 +15,6 @@ if [[ "$LLVM_WITH_CLANG" == y ]]; then
   SOURCE9_URL[0]="${GITHUB_URI}/${SOURCE9}"
     
SOURCE9_HASH=sha256:7cf3b8ff56c65c4d1eae3c56883fc4a6cbc3ff9f3a1530a74d66e45d27271866
 fi
-if [[ "$LLVM_WITH_LLDB" == y ]]; then
-         SOURCE7="lldb-${VERSION}.src.tar.xz"
-  SOURCE7_URL[0]="${GITHUB_URI}/${SOURCE7}"
-    SOURCE7_HASH=sha256:
-fi
 if [[ "$LLVM_WITH_POLLY" == y ]]; then
          SOURCE11="polly-${VERSION}.src.tar.xz"
   SOURCE11_URL[0]="${GITHUB_URI}/${SOURCE11}"
@@ -40,7 +34,7 @@ if [[ "$LLVM_WITH_LLD" == y ]]; then
   SOURCE19_URL[0]="${GITHUB_URI}/${SOURCE19}"
     
SOURCE19_HASH=sha256:82fbe9033da986f6ff3092a9df31049b4b19cbe59a46c6ab54e0523b31550794
 fi
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}.src"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tar.xz}"
         WEB_SITE="https://llvm.org";
       LICENSE[0]=BSD
          ENTERED=20230330
diff --git a/devel/llvm14/HISTORY b/devel/llvm14/HISTORY
index 76097e0..3b440e8 100644
--- a/devel/llvm14/HISTORY
+++ b/devel/llvm14/HISTORY
@@ -1,6 +1,9 @@
 2023-03-30 Conner Clere <xenanthropy AT sourcemage.org>
-       * BUILD, CONFIGURE, DEPENDS, INSTALL, DETAILS: new spell, version 
14.0.6
-       * PRE_BUILD, PREPARE, PRE_SUB_DEPENDS, SUB_DEPENDS: added
-       * patches-clang/*, patches-libcxx/*, patches-lldb/*, patches-llvm/*: 
added
-       * 0001-Include-libunwind-from-source-directory.patch: added
+       * BUILD, CONFIGURE, DEPENDS, INSTALL, DETAILS, PRE_BUILD, PREPARE,
+         PRE_SUB_DEPENDS, SUB_DEPENDS,
+         patches-clang/clang-001-fix-unwind-chain-inclusion.patch,
+         patches-lld/0001-Include-libunwind-from-source-directory.patch,
+         patches-lld/{libcxxabi-dl,libcxx-musl}.patch,
+         patches-llvm/llvm-0001-musl.patch: new spell, version 14.0.6,
+         based on the llvm spell
 
diff --git a/devel/llvm14/INSTALL b/devel/llvm14/INSTALL
index d8b2084..464bdf9 100755
--- a/devel/llvm14/INSTALL
+++ b/devel/llvm14/INSTALL
@@ -1,36 +1,8 @@
 cmake_install &&
-#cmake -DCMAKE_INSTALL_PREFIX=/opt/llvm14 -P cmake_install.cmake &&
 
 ln -sfn /opt/llvm14/share/clang/run-clang-tidy.py 
/opt/llvm14/bin/run-clang-tidy &&
 
-if [[ "$LLVM_WITH_ANALYZER" == "y" ]]
-then
-  target="$INSTALL_ROOT/opt/llvm14/share/llvm" &&
-
-  cd $SOURCE_DIRECTORY/tools/clang/tools &&
-
-  install -v -m 0755 -o root -g root -d "$target/scan-build" &&
-  install -v -m 0755 -o root -g root -t "${INSTALL_ROOT}/opt/llvm14/bin/" 
scan-build/libexec/ccc-analyzer &&
-  install -v -m 0755 -o root -g root -t "${INSTALL_ROOT}/opt/llvm14/bin/" 
scan-build/libexec/c++-analyzer &&
-  install -v -m 0755 -o root -g root -t "${INSTALL_ROOT}/opt/llvm14/bin/" 
scan-build/bin/scan-build &&
-  ln -sf "/opt/llvm14/usr/bin/ccc-analyzer" 
"${INSTALL_ROOT}/opt/llvm14/bin/c++-analyzer" &&
-  install -v -m 0644 -o root -g root -t "$target/scan-build" 
scan-build/share/scan-build/scanview.css &&
-  install -v -m 0644 -o root -g root -t "$target/scan-build" 
scan-build/share/scan-build/sorttable.js &&
-  install -v -m 0755 -o root -g root -d "$target/scan-view" &&
-  install -v -m 0755 -o root -g root -t "${INSTALL_ROOT}/opt/llvm14/bin/" 
scan-view/bin/scan-view &&
-  install -v -m 0644 -o root -g root -t "$target/scan-view" 
scan-view/share/Reporter.py &&
-  install -v -m 0644 -o root -g root -t "$target/scan-view" 
scan-view/share/ScanView.py &&
-  install -v -m 0644 -o root -g root -t "$target/scan-view" 
scan-view/share/startfile.py
-
-  install -v -m 0644 -o root -g root -t 
"${INSTALL_ROOT}/opt/llvm14/share/man/man1/" scan-build/man/scan-build.1
-fi &&
-
-if [[ "$LLVM_WITH_CLANG" == y ]] && is_depends_enabled $SPELL python; then
+if [[ "$LLVM_WITH_CLANG" == y ]] && spell_ok python3; then
   cd "${SOURCE_DIRECTORY}" &&
-  if spell_installed python; then
-    cp -Rv "${SOURCE_DIRECTORY}/tools/clang/bindings/python/clang" 
"${INSTALL_ROOT}/opt/llvm14/lib/python$(installed_version python | cut -f1,2 
-d.)/"
-  fi &&
-  if spell_installed python3; then
-    cp -Rv "${SOURCE_DIRECTORY}/tools/clang/bindings/python/clang" 
"${INSTALL_ROOT}/opt/llvm14/lib/python$(installed_version python3 | cut -f1,2 
-d.)/"
-  fi
+  cp -Rv "${SOURCE_DIRECTORY}/tools/clang/bindings/python/clang" 
"${INSTALL_ROOT}/opt/llvm14/lib/python$(installed_version python3 | cut -f1,2 
-d.)/"
 fi
diff --git a/devel/llvm14/PREPARE b/devel/llvm14/PREPARE
index 53c46bb..0cfb539 100755
--- a/devel/llvm14/PREPARE
+++ b/devel/llvm14/PREPARE
@@ -1,5 +1,4 @@
 config_query LLVM_WITH_RTTI   "Enable RTTI? (recommended)" y &&
 config_query LLVM_WITH_CLANG  "Enable clang compiler frontend?"  n &&
-config_query LLVM_WITH_LLDB   "Enable lldb debugger?"            n &&
 config_query LLVM_WITH_POLLY  "Enable polihedral optimizer?"     n &&
 config_query LLVM_WITH_LLD    "Enable llvm's linker?"            n
diff --git a/devel/llvm14/PRE_BUILD b/devel/llvm14/PRE_BUILD
index cf8da9e..ff249a8 100755
--- a/devel/llvm14/PRE_BUILD
+++ b/devel/llvm14/PRE_BUILD
@@ -13,12 +13,6 @@ if [[ "$LLVM_WITH_CLANG" == y ]]; then
       tools/clang/tools/extra/clangd/quality/CompletionModel.cmake
 fi &&
 
-if [[ "$LLVM_WITH_LLDB" == y ]]; then
-  unpack_file 7                &&
-  mv lldb-${VERSION}.src tools/lldb &&
-  apply_patch_dir patches-lldb
-fi &&
-
 if [[ "$LLVM_WITH_POLLY" == y ]]; then
   unpack_file 11                &&
   mv polly-${VERSION}.src tools/polly
@@ -33,13 +27,8 @@ if [[ "$LLVM_WITH_LLD" == y ]]; then
   mv libcxx-${VERSION}.src runtimes/libcxx &&
   unpack_file 19                  &&
   mv libcxxabi-${VERSION}.src runtimes/libcxxabi &&
-  apply_patch_dir patches-libcxx &&
 
-  # Bugfix for llvm 12.0.0, cf. 
https://groups.google.com/g/llvm-dev/c/gIY5COm6V5E
-  # This will probably be fixed in llvm 12.0.1.
-  # As of 2021-07-10 this has not been fixed.
-  cd "$SOURCE_DIRECTORY/tools" &&
-  patch -p1 < 
"$SPELL_DIRECTORY/0001-Include-libunwind-from-source-directory.patch"
+  apply_patch_dir patches-lld
 fi &&
 
 cd "$SOURCE_DIRECTORY" &&
diff --git a/devel/llvm14/PRE_SUB_DEPENDS b/devel/llvm14/PRE_SUB_DEPENDS
index 0026e3f..8206f1b 100755
--- a/devel/llvm14/PRE_SUB_DEPENDS
+++ b/devel/llvm14/PRE_SUB_DEPENDS
@@ -2,7 +2,6 @@ case $THIS_SUB_DEPENDS in
 TARGET-*) list_find "$LLVM_TARGETS" "${THIS_SUB_DEPENDS#TARGET-}" ;;
 AMD)  list_find "${LLVM_TARGETS}" AMDGPU ;;
 CLANG) [[ "${LLVM_WITH_CLANG}" == "y" ]] ;;
-LLDB) [[ "${LLVM_WITH_LLDB}" == "y" ]] ;;
 POLLY) [[ "${LLVM_WITH_POLLY}" == "y" ]] ;;
 LLD) [[ "${LLVM_WITH_LLD}" == "y" ]] ;;
 RTTI) [ y = "$LLVM_WITH_RTTI" ] ;;
diff --git a/devel/llvm14/SUB_DEPENDS b/devel/llvm14/SUB_DEPENDS
index b9aee09..a5e2c96 100755
--- a/devel/llvm14/SUB_DEPENDS
+++ b/devel/llvm14/SUB_DEPENDS
@@ -12,10 +12,6 @@ CLANG)
   message "${MESSAGE_COLOR}Building clang enforced by 
sub-dependency.$DEFAULT_COLOR"
   LLVM_WITH_CLANG=y
 ;;
-LLDB)
-  message "${MESSAGE_COLOR}Building lldb enforced by 
sub-dependency.$DEFAULT_COLOR"
-  LLVM_WITH_LLDB=y
-;;
 POLLY)
   message "${MESSAGE_COLOR}Building polly enforced by 
sub-dependency.$DEFAULT_COLOR"
   LLVM_WITH_POLLY=y
diff --git a/devel/llvm14/patches-libcxx/libcxx-musl.patch 
b/devel/llvm14/patches-libcxx/libcxx-musl.patch
deleted file mode 100644
index 3600f40..0000000
--- a/devel/llvm14/patches-libcxx/libcxx-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Origin: Void Linux
-
---- a/runtimes/libcxx/include/locale
-+++ b/runtimes/libcxx/include/locale
-@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* 
__a_end,
-         typename remove_reference<decltype(errno)>::type __save_errno = 
errno;
-         errno = 0;
-         char *__p2;
-+#if defined(__linux__) && !defined(__GLIBC__)
-+        long long __ll = strtoll(__a, &__p2, __base);
-+#else
-         long long __ll = strtoll_l(__a, &__p2, __base, 
_LIBCPP_GET_C_LOCALE);
-+#endif
-         typename remove_reference<decltype(errno)>::type __current_errno = 
errno;
-         if (__current_errno == 0)
-             errno = __save_errno;
-@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const 
char* __a_end,
-         typename remove_reference<decltype(errno)>::type __save_errno = 
errno;
-         errno = 0;
-         char *__p2;
-+#if defined(__linux__) && !defined(__GLIBC__)
-+        unsigned long long __ll = strtoull(__a, &__p2, __base);
-+#else
-         unsigned long long __ll = strtoull_l(__a, &__p2, __base, 
_LIBCPP_GET_C_LOCALE);
-+#endif
-         typename remove_reference<decltype(errno)>::type __current_errno = 
errno;
-         if (__current_errno == 0)
-             errno = __save_errno;
diff --git a/devel/llvm14/patches-libcxx/libcxxabi-dl.patch 
b/devel/llvm14/patches-libcxx/libcxxabi-dl.patch
deleted file mode 100644
index d47a227..0000000
--- a/devel/llvm14/patches-libcxx/libcxxabi-dl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Also link to -ldl to prevent undefined references.
-
-Origin: Void Linux
-
---- a/runtimes/libcxxabi/src/CMakeLists.txt
-+++ b/runtimes/libcxxabi/src/CMakeLists.txt
-@@ -73,6 +73,7 @@
-   endif()
- 
-   add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
-+  add_library_flags_if(LIBCXXABI_HAS_C_LIB dl)
- endif()
- 
- if (LIBCXXABI_USE_LLVM_UNWINDER)
---- a/runtimes/libcxx/CMakeLists.txt
-+++ b/runtimes/libcxx/CMakeLists.txt
-@@ -745,6 +745,10 @@
-     target_link_libraries(${target} PRIVATE m)
-   endif()
- 
-+  if (LIBCXX_HAS_C_LIB)
-+    target_link_libraries(${target} PRIVATE dl)
-+  endif()
-+
-   if (LIBCXX_HAS_RT_LIB)
-     target_link_libraries(${target} PRIVATE rt)
-   endif()
diff --git 
a/devel/llvm14/patches-lld/0001-Include-libunwind-from-source-directory.patch 
b/devel/llvm14/patches-lld/0001-Include-libunwind-from-source-directory.patch
new file mode 100644
index 0000000..3c9ef7b
--- /dev/null
+++ 
b/devel/llvm14/patches-lld/0001-Include-libunwind-from-source-directory.patch
@@ -0,0 +1,25 @@
+From 2cf2b1af0f0be6431c1e239d482056ef4d4ac17f Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <Florian.Franzmann AT bandrate.org>
+Date: Sun, 2 May 2021 13:24:21 +0200
+Subject: [PATCH] Include libunwind from source directory
+
+---
+ tools/lld/MachO/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/lld/MachO/CMakeLists.txt b/tools/lld/MachO/CMakeLists.txt
+index b76f37dcc6e6..69ca3fc6de67 100644
+--- a/tools/lld/MachO/CMakeLists.txt
++++ b/tools/lld/MachO/CMakeLists.txt
+@@ -2,7 +2,7 @@ set(LLVM_TARGET_DEFINITIONS Options.td)
+ tablegen(LLVM Options.inc -gen-opt-parser-defs)
+ add_public_tablegen_target(MachOOptionsTableGen)
+ 
+-include_directories(${LLVM_MAIN_SRC_DIR}/../libunwind/include)
++include_directories(${LLVM_MAIN_SRC_DIR}/libunwind/include)
+ 
+ add_lld_library(lldMachO2
+   Arch/X86_64.cpp
+-- 
+2.31.1
+
diff --git a/devel/llvm14/patches-lld/libcxx-musl.patch 
b/devel/llvm14/patches-lld/libcxx-musl.patch
new file mode 100644
index 0000000..3600f40
--- /dev/null
+++ b/devel/llvm14/patches-lld/libcxx-musl.patch
@@ -0,0 +1,28 @@
+Origin: Void Linux
+
+--- a/runtimes/libcxx/include/locale
++++ b/runtimes/libcxx/include/locale
+@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* 
__a_end,
+         typename remove_reference<decltype(errno)>::type __save_errno = 
errno;
+         errno = 0;
+         char *__p2;
++#if defined(__linux__) && !defined(__GLIBC__)
++        long long __ll = strtoll(__a, &__p2, __base);
++#else
+         long long __ll = strtoll_l(__a, &__p2, __base, 
_LIBCPP_GET_C_LOCALE);
++#endif
+         typename remove_reference<decltype(errno)>::type __current_errno = 
errno;
+         if (__current_errno == 0)
+             errno = __save_errno;
+@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const 
char* __a_end,
+         typename remove_reference<decltype(errno)>::type __save_errno = 
errno;
+         errno = 0;
+         char *__p2;
++#if defined(__linux__) && !defined(__GLIBC__)
++        unsigned long long __ll = strtoull(__a, &__p2, __base);
++#else
+         unsigned long long __ll = strtoull_l(__a, &__p2, __base, 
_LIBCPP_GET_C_LOCALE);
++#endif
+         typename remove_reference<decltype(errno)>::type __current_errno = 
errno;
+         if (__current_errno == 0)
+             errno = __save_errno;
diff --git a/devel/llvm14/patches-lld/libcxxabi-dl.patch 
b/devel/llvm14/patches-lld/libcxxabi-dl.patch
new file mode 100644
index 0000000..d47a227
--- /dev/null
+++ b/devel/llvm14/patches-lld/libcxxabi-dl.patch
@@ -0,0 +1,27 @@
+Also link to -ldl to prevent undefined references.
+
+Origin: Void Linux
+
+--- a/runtimes/libcxxabi/src/CMakeLists.txt
++++ b/runtimes/libcxxabi/src/CMakeLists.txt
+@@ -73,6 +73,7 @@
+   endif()
+ 
+   add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
++  add_library_flags_if(LIBCXXABI_HAS_C_LIB dl)
+ endif()
+ 
+ if (LIBCXXABI_USE_LLVM_UNWINDER)
+--- a/runtimes/libcxx/CMakeLists.txt
++++ b/runtimes/libcxx/CMakeLists.txt
+@@ -745,6 +745,10 @@
+     target_link_libraries(${target} PRIVATE m)
+   endif()
+ 
++  if (LIBCXX_HAS_C_LIB)
++    target_link_libraries(${target} PRIVATE dl)
++  endif()
++
+   if (LIBCXX_HAS_RT_LIB)
+     target_link_libraries(${target} PRIVATE rt)
+   endif()
diff --git a/devel/llvm14/patches-lldb/lldb-musl.patch 
b/devel/llvm14/patches-lldb/lldb-musl.patch
deleted file mode 100644
index f2ba9cc..0000000
--- a/devel/llvm14/patches-lldb/lldb-musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Origin: Void Linux
-
---- a/tools/lldb/source/Plugins/Process/Linux/Procfs.h
-+++ b/tools/lldb/source/Plugins/Process/Linux/Procfs.h
-@@ -10,6 +10,7 @@
- // sys/procfs.h on Android/Linux for all supported architectures.
- 
- #include <sys/ptrace.h>
-+#include <asm/ptrace.h>
- 
- #ifdef __ANDROID__
- #if defined(__arm64__) || defined(__aarch64__)